X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=blobdiff_plain;f=Makefile;h=c40d83aedebef6cddffa500c6c97271340a79a21;hp=d04ee0ad1dccce7ea2503637ffbe6d8753074ffe;hb=6d2e91bf80e4410207f01edb0962aec9213f3533;hpb=dd39ecf522ba86c70809715af46e6557f6491131

diff --git a/Makefile b/Makefile
index d04ee0ad1dc..c40d83aedeb 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