summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-09-24 09:12:05 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-24 09:12:05 +0200
commita5a2bad55de89a0adf7d6f783cb87ab7eb1a894f (patch)
tree452cb8addc26f5c79fdd4e2fea92c78dc17fc8e8 /Makefile
parentd0303d71c2fb9bcb90a8d48e6462c78c86f70ce6 (diff)
parent46eb3b64dddd20f44e76b08676fa642dd374bf1d (diff)
downloadkernel-a5a2bad55de89a0adf7d6f783cb87ab7eb1a894f.tar.gz
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3133a5772eeb..865126614a33 100644
--- a/Makefile
+++ b/Makefile
@@ -591,6 +591,11 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow)
# conserve stack if available
KBUILD_CFLAGS += $(call cc-option,-fconserve-stack)
+# check for 'asm goto'
+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)
+ KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
+endif
+
# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
# But warn user when we do so
warn-assign = \