diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 11:04:28 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 11:04:28 +1000 |
| commit | 61cfefbde2b92bdf974bf4afa2b85c1c64578cd6 (patch) | |
| tree | 1fb77369bc5c7ce783f6c9818aa0145ef7a7373c /Makefile | |
| parent | 4c1efd89cf75e0449bdc0c3075401f6d6af7708d (diff) | |
| parent | 3c347a468e3566b18dac67d438791de28aa97562 (diff) | |
Merge remote branch 'arm/devel'
Conflicts:
arch/arm/mm/mmu.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -554,8 +554,15 @@ endif ifdef CONFIG_FRAME_POINTER KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls else +# Some targets (ARM with Thumb2, for example), can't be built with frame +# pointers. For those, we don't have FUNCTION_TRACER automatically +# select FRAME_POINTER. However, FUNCTION_TRACER adds -pg, and this is +# incompatible with -fomit-frame-pointer with current GCC, so we don't use +# -fomit-frame-pointer with FUNCTION_TRACER. +ifndef CONFIG_FUNCTION_TRACER KBUILD_CFLAGS += -fomit-frame-pointer endif +endif ifdef CONFIG_DEBUG_INFO KBUILD_CFLAGS += -g |