Revert "backport the pre glibc 2.10 patch which added -mcpu=<CPU> to ASFLAGS to the...

This reverts commit fd178a794dcd98b27b074cef2d72b16cade6ed2d so that the
ASFLAGS patches can be applied in the correct order starting with a missing
patch from Roland McGrath.

diff --git a/Makeconfig b/Makeconfig
index ac381d4ed341c857dd36df93c761190c154c27a2..d269936f323001871a19b15b6d8d37c6a59c334c 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2003,2004,2005,2006,2007,2008,2009
+# Copyright (C) 1991-2003,2004,2005,2006,2007,2008
 #      Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -766,7 +766,7 @@ else
 ASFLAGS :=
 endif
 endif
-ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)
+ASFLAGS += $(ASFLAGS-config)
 
 ifndef BUILD_CC
 BUILD_CC = $(CC)

diff --git a/config.make.in b/config.make.in
index 7baec736440ad5a90ab00e6dc4075842a766f73b..3fd0abc65cf39cac6d967b1be512c7cefb278771 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -31,8 +31,7 @@ base-machine = @base_machine@
 config-vendor = @host_vendor@
 config-os = @host_os@
 config-sysdirs = @sysnames@
-cflags-cpu = @libc_cv_cc_submachine@
-asflags-cpu = @libc_cv_cc_submachine@
+with-cpu = @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
new file mode 100644 (file)
index 0000000..7e44cdf
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/setcontext.S
@@ -0,0 +1,2 @@
+#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
new file mode 100644 (file)
index 0000000..616e3db
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/swapcontext.S
@@ -0,0 +1,2 @@
+#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
new file mode 100644 (file)
index 0000000..7e44cdf
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/setcontext.S
@@ -0,0 +1,2 @@
+#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
new file mode 100644 (file)
index 0000000..616e3db
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S
@@ -0,0 +1,2 @@
+#define _ARCH_PWR6
+#include_next <swapcontext.S>