aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan S. Arnold <rsa@us.ibm.com>2009-07-24 12:55:45 -0500
committerRyan Arnold <ryanarn@etna.rchland.ibm.com>2009-07-24 15:10:55 -0500
commitfd178a794dcd98b27b074cef2d72b16cade6ed2d (patch)
treecf4e47a3771b33232781a0438bc01c4c13f0930e
parent11e1f64a3ed25433ff1e61ce361f4d26b262b9c3 (diff)
downloadglibc-fd178a794dcd98b27b074cef2d72b16cade6ed2d.zip
glibc-fd178a794dcd98b27b074cef2d72b16cade6ed2d.tar.gz
glibc-fd178a794dcd98b27b074cef2d72b16cade6ed2d.tar.bz2
backport the pre glibc 2.10 patch which added -mcpu=<CPU> to ASFLAGS to the IBM 2.8 branch. It includes two merged patch sets.
commit ed27dcf1bc22bb3b011bfefc392d6900c3bbeeb9 Author: Ryan S. Arnold <rsa@us.ibm.com> Date: Fri Jul 24 00:11:42 2009 -0500 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] * 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.
-rw-r--r--Makeconfig4
-rw-r--r--config.make.in3
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/setcontext.S2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/swapcontext.S2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/setcontext.S2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S2
6 files changed, 4 insertions, 11 deletions
diff --git a/Makeconfig b/Makeconfig
index d269936..ac381d4 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2003,2004,2005,2006,2007,2008
+# Copyright (C) 1991-2003,2004,2005,2006,2007,2008,2009
# 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 += $(ASFLAGS-config) $(asflags-cpu)
ifndef BUILD_CC
BUILD_CC = $(CC)
diff --git a/config.make.in b/config.make.in
index 3fd0abc..7baec73 100644
--- a/config.make.in
+++ b/config.make.in
@@ -31,7 +31,8 @@ base-machine = @base_machine@
config-vendor = @host_vendor@
config-os = @host_os@
config-sysdirs = @sysnames@
-with-cpu = @submachine@
+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 7e44cdf..0000000
--- 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 616e3db..0000000
--- 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 7e44cdf..0000000
--- 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 616e3db..0000000
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/swapcontext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#define _ARCH_PWR6
-#include_next <swapcontext.S>