X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=Makefile;h=3e438055a92c503d48858761d56e00bcd9848276;hb=309f77ad9bea057d55b04580b5a711e9e3727e83;hp=d3c10719bbbd5b311c51f9a407184fd30847e6ea;hpb=5fe8321b8886d814e65952d74b207fe59e1096ea;p=net-next-2.6.git

diff --git a/Makefile b/Makefile
index d3c10719bbb..3e438055a92 100644
--- a/Makefile
+++ b/Makefile
@@ -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