X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=c6307b6d069f8ec9a969ca6ad617245b95486d94;hb=31f7b6010bee013215eee2f4c13e715001684672;hp=1ab3ebfc909198065a5d0b10a6e3ee0f1e768b3c;hpb=c441c2971de52b7045acb708cc9959815f554f66;p=linux-2.6-omap-h63xx.git

diff --git a/Makefile b/Makefile
index 1ab3ebfc909..c6307b6d069 100644
--- 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