Hand merged ChangeLog and git cherry-pick of commit 23b6b4664622ba8efb728b1cd02c2992a4a1b717

[BZ #10118]

2009-05-06  Ryan S. Arnold  <rsa@us.ibm.com>
	[BZ #10118]
	* Makeconfig (+asflags): New variable based upon ASFLAG or
	asflags-cpu.
	(ASFLAGS): Add override to set ASFLAGS to +asflags.
	* config.make.in (asflags-cpu): Add variable based upon
	@libc_cv_cc_submachine@ to propagate -mcpu=CPU from --with-cpu=CPU to
	the assembler.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/setcontext.S:
	Remove unneeded file now that the assembler emits _ARCH_PWR6 and
	recognizes power6 instruction set due to passing -mcpu=power6 from
	--with-cpu=power6 when compiling .S files.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/swapcontext.S:
	Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/setcontext.S:
	Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S:
	Likewise.

7 files changed, 33 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 9af51910c3..5f35971cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2009-05-06  Ryan S. Arnold  <rsa@us.ibm.com>
+
+	[BZ #10118]
+	* Makeconfig (+asflags): New variable based upon ASFLAG or
+	asflags-cpu.
+	(ASFLAGS): Add override to set ASFLAGS to +asflags.
+	* config.make.in (asflags-cpu): Add variable based upon
+	@libc_cv_cc_submachine@ to propagate -mcpu=CPU from --with-cpu=CPU to
+	the assembler.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/setcontext.S:
+	Remove unneeded file now that the assembler emits _ARCH_PWR6 and
+	recognizes power6 instruction set due to passing -mcpu=power6 from
+	--with-cpu=power6 when compiling .S files.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/swapcontext.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/setcontext.S:
+	Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S:
+	Likewise.
+
 2008-04-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/dl-osinfo.h: Include fcntl.h.
diff --git a/Makeconfig b/Makeconfig
index 977bbd7d9a..6c0918a828 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -649,6 +649,16 @@ 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
@@ -681,6 +691,8 @@ 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))
diff --git a/config.make.in b/config.make.in
index aa73466713..7baec73644 100644
--- a/config.make.in
+++ b/config.make.in
@@ -32,6 +32,7 @@ config-vendor = @host_vendor@
 config-os = @host_os@
 config-sysdirs = @sysnames@
 cflags-cpu = @libc_cv_cc_submachine@
+asflags-cpu = @libc_cv_cc_submachine@
 
 defines = @DEFINES@
 sysincludes = @SYSINCLUDES@
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/setcontext.S
deleted file mode 100644
index 7e44cdf0a1..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/setcontext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#define _ARCH_PWR6
-#include_next <setcontext.S>
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/swapcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/swapcontext.S
deleted file mode 100644
index 616e3db872..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/swapcontext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#define _ARCH_PWR6
-#include_next <swapcontext.S>
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/setcontext.S
deleted file mode 100644
index 7e44cdf0a1..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/setcontext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#define _ARCH_PWR6
-#include_next <setcontext.S>
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S
deleted file mode 100644
index 616e3db872..0000000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#define _ARCH_PWR6
-#include_next <swapcontext.S>