diff options
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 36 | 3 | SUBLEVEL = 36 |
4 | EXTRAVERSION = -rc3 | 4 | EXTRAVERSION = -rc6 |
5 | NAME = Sheep on Meth | 5 | NAME = Sheep on Meth |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
@@ -554,8 +554,15 @@ endif | |||
554 | ifdef CONFIG_FRAME_POINTER | 554 | ifdef CONFIG_FRAME_POINTER |
555 | KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls | 555 | KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls |
556 | else | 556 | else |
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. | ||
562 | ifndef CONFIG_FUNCTION_TRACER | ||
557 | KBUILD_CFLAGS += -fomit-frame-pointer | 563 | KBUILD_CFLAGS += -fomit-frame-pointer |
558 | endif | 564 | endif |
565 | endif | ||
559 | 566 | ||
560 | ifdef CONFIG_DEBUG_INFO | 567 | ifdef CONFIG_DEBUG_INFO |
561 | KBUILD_CFLAGS += -g | 568 | KBUILD_CFLAGS += -g |