aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2011-07-16 03:10:06 -0700
committerRoland McGrath <roland@hack.frob.com>2011-07-16 03:10:06 -0700
commitdb290cf59207aff09d1794e666e2854a93775f32 (patch)
tree958bfef6730db728842232b19b8875a0615e8a93
parentfd5e21c75d8e9221d766f4bc922a237265514ec2 (diff)
downloadglibc-db290cf59207aff09d1794e666e2854a93775f32.zip
glibc-db290cf59207aff09d1794e666e2854a93775f32.tar.gz
glibc-db290cf59207aff09d1794e666e2854a93775f32.tar.bz2
Never use -mpreferred-stack-boundary=2 on i386, now disallowed by GCC.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/i386/Makefile5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a440ae..06aae04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2011-07-02 Roland McGrath <roland@hack.frob.com>
+2011-07-16 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/i386/Makefile: Never use -mpreferred-stack-boundary=2,
+ now disallowed by GCC.
* configure.in (use-default-link): Default to yes if a test -shared
link meets our qualifications.
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index 3d9f3fc..661473e 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -30,13 +30,16 @@ endif
# than 4 bytes.
# Lots of routines in math will use FPU, so make math subdir an exception
# here.
+# In gcc 4.6 (and maybe earlier?) giving -mpreferred-stack-boundary=2 is
+# an error, so don't try to reduce it here like we used to. We still
+# explicit set -mpreferred-stack-boundary=4 the places where it matters,
+# in case an older compiler defaulted to 2.
ifeq ($(subdir),math)
sysdep-CFLAGS += -mpreferred-stack-boundary=4
else
ifeq ($(subdir),csu)
sysdep-CFLAGS += -mpreferred-stack-boundary=4
else
-sysdep-CFLAGS += -mpreferred-stack-boundary=2
# Likewise, any function which calls user callbacks
uses-callbacks += -mpreferred-stack-boundary=4
# Likewise, any stack alignment tests