diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makeconfig | 15 | ||||
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 4 |
4 files changed, 8 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index 9ed39b4643..3657bab4b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * version.h (VERSION): Bump for 2.10 release. * include/features.h (__GLIBC_MINOR__): Bump to 10. + * Makeconfig: Undo last change. Add asflags-cpu to ASFLAGS in the + same place we add ASFLAGS-config. + 2009-05-05 Aurelien Jarno <aurelien@aurel32.net> [BZ #10128] diff --git a/Makeconfig b/Makeconfig index 985c683f6e..875fb679aa 100644 --- a/Makeconfig +++ b/Makeconfig @@ -649,17 +649,6 @@ endif # $(+cflags) == "" # Don't duplicate options if we inherited variables from the parent. +cflags := $(sort $(+cflags)) -# These are the flags given to the compiler to tell it what sort of -# optimization and/or debugging output to do for .S files. -ifndef +asflags -# If `ASFLAGS' was defined, use that. -ifdef ASFLAGS -+asflags := $(ASFLAGS) -endif #ASFLAGS -endif # +asflags - -+asflags += $(asflags-cpu) - # These are flags given to the C compiler to tell it to look for # include files (including ones given in angle brackets) in the parent # library source directory, in the include directory, and in the @@ -691,8 +680,6 @@ override CXXFLAGS = $(c++-sysincludes) \ $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) -override ASFLAGS = $(+asflags) - # If everything is compiled with -fPIC (implicitly) we must tell this by # defining the PIC symbol. ifeq (yes,$(build-pic-default)) @@ -782,7 +769,7 @@ else ASFLAGS := endif endif -ASFLAGS += $(ASFLAGS-config) +ASFLAGS += $(ASFLAGS-config) $(asflags-cpu) ifndef BUILD_CC BUILD_CC = $(CC) diff --git a/fedora/branch.mk b/fedora/branch.mk index 2390d52c2e..3ab16811f0 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-f8 -fedora-sync-date := 2009-05-09 18:28 UTC -fedora-sync-tag := fedora-glibc-20090509T1828 +fedora-sync-date := 2009-05-09 22:00 UTC +fedora-sync-tag := fedora-glibc-20090509T2200 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 64288dc60e..141082bb51 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -19,7 +19,7 @@ Summary: The GNU libc libraries Name: glibc Version: @glibcversion@ -Release: 1 +Release: 2 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -1009,7 +1009,7 @@ rm -f *.filelist* %endif %changelog -* Sat May 9 2009 Jakub Jelinek <jakub@redhat.com> 2.10-1 +* Sat May 9 2009 Jakub Jelinek <jakub@redhat.com> 2.10-2 - update from trunk - glibc 2.10 release - fix memchr on x86_64 (#499689) |