aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-08 11:48:51 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-08 11:48:51 -0400
commitdba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch)
treeee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /Makefile
parent9de36825b321fe9fe9cf73260554251af579f4ca (diff)
parent78ff7fae04554b49d29226ed12536268c2500d1f (diff)
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d04ee0ad1dcc..c40d83aedebe 100644
--- a/Makefile
+++ b/Makefile
@@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
533endif 533endif
534 534
535# Force gcc to behave correct even for buggy distributions 535# Force gcc to behave correct even for buggy distributions
536# Arch Makefiles may override this setting 536ifndef CONFIG_CC_STACKPROTECTOR
537KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) 537KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
538endif
538 539
539ifdef CONFIG_FRAME_POINTER 540ifdef CONFIG_FRAME_POINTER
540KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls 541KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls