diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-05-09 21:58:12 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-05-09 21:58:12 +0000 |
| commit | eb29449a9a601f535cab50068e02aee0aa1ed379 (patch) | |
| tree | c468056f18f79d71e3676577d510af62e68e21fe | |
| parent | deb318c255ad2d4ac38d6288933926be13954b3e (diff) | |
| download | glibc-cvs/glibc-2_10.tar.gz glibc-cvs/glibc-2_10.tar.xz glibc-cvs/glibc-2_10.zip | |
* Makeconfig: Undo last change. Add asflags-cpu to ASFLAGS in the glibc-2.10 cvs/glibc-2_10-base cvs/glibc-2_10 cvs/fedora-glibc-20090509T2200
same place we add ASFLAGS-config.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makeconfig | 15 |
2 files changed, 4 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index 0429004986..2eb3c61f2a 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) |