Commit:     b46522394dde7341a5253658096f354b65cbd90d
Parent:     b42895d6fe66995ab101c15d9a59c78474dbf382
Author:     Linus Torvalds <[EMAIL PROTECTED]>
AuthorDate: Thu May 17 20:18:11 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu May 17 20:18:11 2007 -0700

    Revert "[PATCH] x86: Drop cc-options call for all options supported in gcc 
    This reverts commit c8fdd247255a3a027cd9f66dcf93e6847d1d2f85.
    It turns out the kernel was correct, and the gcc complaint was a gcc
    bug.  The preferred stack boundary is expressed not in bytes, but in the
    the log2() of the preferred boundary, so "-mpreferred-stack-boundary=2"
    is in fact exactly what we want, but a gcc that is compiled for x86-64
    will consider it an error (because the 64-bit calling sequence says that
    the stack should be 16-byte aligned) even if we are then using "-m32" to
    generate 32-bit code.
    Noted-by: Mikulas Patocka <[EMAIL PROTECTED]>
    Cc: Jan Hubicka <[EMAIL PROTECTED]>
    Acked-by: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 Makefile           |    2 +-
 arch/i386/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e6990e2..948fa09 100644
--- a/Makefile
+++ b/Makefile
@@ -491,7 +491,7 @@ endif
 include $(srctree)/arch/$(ARCH)/Makefile
-CFLAGS         += -fno-omit-frame-pointer -fno-optimize-sibling-calls
+CFLAGS         += -fno-omit-frame-pointer $(call 
 CFLAGS         += -fomit-frame-pointer
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 6dc5e5d..bd28f9f 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -34,7 +34,7 @@ CHECKFLAGS    += -D__i386__
 CFLAGS += -pipe -msoft-float -mregparm=3 -freg-struct-return
 # prevent gcc from keeping the stack 16 byte aligned
-CFLAGS += -mpreferred-stack-boundary=4
+CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)
 # CPU-specific tuning. Anything which can be shared with UML should go here.
 include $(srctree)/arch/i386/Makefile.cpu
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to