Merge branches 'x86/cleanups', 'x86/mm', 'x86/setup' and 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / Makefile

diff --git a/Makefile b/Makefile
index a2c2efe9e82edd7b9df112ce3aad7e76b8cb9501..828028d4a448094a36ee98f7e422177eed49a7f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
 endif
 
 # Force gcc to behave correct even for buggy distributions
-# Arch Makefiles may override this setting
+ifndef CONFIG_CC_STACKPROTECTOR
 KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
+endif
 
 ifdef CONFIG_FRAME_POINTER
 KBUILD_CFLAGS  += -fno-omit-frame-pointer -fno-optimize-sibling-calls