[commits] r8426 - in /trunk/libc: ChangeLog Makeconfig

[joseph@xxxxxxxxxx]

Author: joseph
Date: Sat May  9 15:13:16 2009
New Revision: 8426

Log:
Merge changes between r8419 and r8425 from /fsf/trunk.

Modified:
    trunk/libc/ChangeLog
    trunk/libc/Makeconfig

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Sat May  9 15:13:16 2009
@@ -2,6 +2,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@xxxxxxxxxxx>
 

Modified: trunk/libc/Makeconfig
==============================================================================
--- trunk/libc/Makeconfig (original)
+++ trunk/libc/Makeconfig Sat May  9 15:13:16 2009
@@ -657,17 +657,6 @@
 # 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
@@ -699,8 +688,6 @@
 		    $(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))
@@ -790,7 +777,7 @@
 ASFLAGS :=
 endif
 endif
-ASFLAGS += $(ASFLAGS-config)
+ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)
 
 ifndef BUILD_CC
 BUILD_CC = $(CC)