aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4df9873f83b2..cf7fcb3bf245 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1VERSION = 2 1VERSION = 2
2PATCHLEVEL = 6 2PATCHLEVEL = 6
3SUBLEVEL = 36 3SUBLEVEL = 36
4EXTRAVERSION = -rc3 4EXTRAVERSION = -rc6
5NAME = Sheep on Meth 5NAME = Sheep on Meth
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*
@@ -554,8 +554,15 @@ endif
554ifdef CONFIG_FRAME_POINTER 554ifdef CONFIG_FRAME_POINTER
555KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls 555KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
556else 556else
557# Some targets (ARM with Thumb2, for example), can't be built with frame
558# pointers. For those, we don't have FUNCTION_TRACER automatically
559# select FRAME_POINTER. However, FUNCTION_TRACER adds -pg, and this is
560# incompatible with -fomit-frame-pointer with current GCC, so we don't use
561# -fomit-frame-pointer with FUNCTION_TRACER.
562ifndef CONFIG_FUNCTION_TRACER
557KBUILD_CFLAGS += -fomit-frame-pointer 563KBUILD_CFLAGS += -fomit-frame-pointer
558endif 564endif
565endif
559 566
560ifdef CONFIG_DEBUG_INFO 567ifdef CONFIG_DEBUG_INFO
561KBUILD_CFLAGS += -g 568KBUILD_CFLAGS += -g