diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-05-09 21:58:12 +0000 |
|---|---|---|
| committer | Ryan Arnold <ryanarn@etna.rchland.ibm.com> | 2009-07-29 09:58:52 -0500 |
| commit | 928cf31e4b020b23169ec5d750c8fd736f5f26a6 (patch) | |
| tree | 53cd8a7067881667065dbcf8d860a5c69b15c7e4 | |
| parent | ffde8ce0c34b71c845ee0435b8a89dbab2020750 (diff) | |
| download | glibc-928cf31e4b020b23169ec5d750c8fd736f5f26a6.tar.gz glibc-928cf31e4b020b23169ec5d750c8fd736f5f26a6.tar.xz glibc-928cf31e4b020b23169ec5d750c8fd736f5f26a6.zip | |
Hand merged ChangeLog and git cherry-pick of commit eb29449a9a601f535cab50068e02aee0aa1ed379
2009-05-09 Ulrich Drepper <drepper@redhat.com>
* Makeconfig: Undo last change. Add asflags-cpu to ASFLAGS in the
same place we add ASFLAGS-config.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makeconfig | 15 |
2 files changed, 6 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index 5f35971cae..d3ecef9b7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-05-09 Ulrich Drepper <drepper@redhat.com> + + * Makeconfig: Undo last change. Add asflags-cpu to ASFLAGS in the + same place we add ASFLAGS-config. + 2009-05-06 Ryan S. Arnold <rsa@us.ibm.com> [BZ #10118] diff --git a/Makeconfig b/Makeconfig index 6c0918a828..4f6fe5ceb3 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)) @@ -778,7 +765,7 @@ else ASFLAGS := endif endif -ASFLAGS += $(ASFLAGS-config) +ASFLAGS += $(ASFLAGS-config) $(asflags-cpu) ifndef BUILD_CC BUILD_CC = $(CC) |