Merge branch 'devel' into for-linus

[sfrench/cifs-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index 1ab3ebfc909198065a5d0b10a6e3ee0f1e768b3c..c6307b6d069f8ec9a969ca6ad617245b95486d94 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