summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-01-26 20:49:10 +0100
committerAdrian Bunk <bunk@stusta.de>2007-01-26 20:49:10 +0100
commit1189f487af2e660c5b4ad530eae73f69a1d54f96 (patch)
tree31f9bc42e1372c4dd138c9a02dbb586e3197b458 /Makefile
parenta248193aae90d51be4981fec07bb97dd289bd534 (diff)
kbuild: explicitly turn off gcc stack-protector
Ubuntu has enabled -fstack-protector per default in gcc breaking kernel build. Explicit turn it off for now. Backported based on several patches by Sam Ravnborg <sam@ravnborg.org>. Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 64bee0502eb0..088914c8311e 100644
--- a/Makefile
+++ b/Makefile
@@ -511,6 +511,8 @@ CFLAGS += $(call add-align,CONFIG_CC_ALIGN_LABELS,-labels)
CFLAGS += $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops)
CFLAGS += $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps)
+include $(srctree)/arch/$(ARCH)/Makefile
+
ifdef CONFIG_FRAME_POINTER
CFLAGS += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
else
@@ -521,7 +523,8 @@ ifdef CONFIG_DEBUG_INFO
CFLAGS += -g
endif
-include $(srctree)/arch/$(ARCH)/Makefile
+# Force gcc to behave correct even for buggy distributions
+CFLAGS += $(call cc-option, -fno-stack-protector)
# arch Makefile may override CC so keep this after arch Makefile is included
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)