diff --git a/[refs] b/[refs]
index fb094b8a20ee..ff9c77f84f7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b42895d6fe66995ab101c15d9a59c78474dbf382
+refs/heads/master: b46522394dde7341a5253658096f354b65cbd90d
diff --git a/trunk/Makefile b/trunk/Makefile
index e6990e2cdafc..948fa09442f1 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -491,7 +491,7 @@ endif
 include $(srctree)/arch/$(ARCH)/Makefile
 
 ifdef CONFIG_FRAME_POINTER
-CFLAGS		+= -fno-omit-frame-pointer -fno-optimize-sibling-calls
+CFLAGS		+= -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
 else
 CFLAGS		+= -fomit-frame-pointer
 endif
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
index 6dc5e5d90fec..bd28f9f9b4b7 100644
--- a/trunk/arch/i386/Makefile
+++ b/trunk/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