Never use -mpreferred-stack-boundary=2 on i386, now disallowed by GCC.

diff --git a/ChangeLog b/ChangeLog
index 5a440ae..06aae04 100644 (file)
--- 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 (file)
--- 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