Skip to content

Commit a5859c6

Browse files
jpoimboeIngo Molnar
authored andcommitted
x86/build: convert function graph '-Os' error to warning
For pre-4.6.0 versions of GCC, which don't have '-mfentry', the '-maccumulate-outgoing-args' option is required for function graph tracing in order to avoid GCC bug 42109. However, GCC ignores '-maccumulate-outgoing-args' when '-Os' is also set. Currently we force a build error to prevent that scenario, but that breaks randconfigs. So change the error to a warning which also disables CONFIG_CC_OPTIMIZE_FOR_SIZE. Reported-by: Andi Kleen <andi@firstfloor.org> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: kbuild test robot <fengguang.wu@intel.com> Cc: kbuild-all@01.org Link: http://lkml.kernel.org/r/20170418214429.o7fbwbmf4nqosezy@treble Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 34a477e commit a5859c6

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

arch/x86/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@ ifdef CONFIG_FUNCTION_GRAPH_TRACER
154154
else
155155
ifeq ($(call cc-option-yn, -mfentry), n)
156156
ACCUMULATE_OUTGOING_ARGS := 1
157+
158+
# GCC ignores '-maccumulate-outgoing-args' when used with '-Os'.
159+
# If '-Os' is enabled, disable it and print a warning.
160+
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
161+
undefine CONFIG_CC_OPTIMIZE_FOR_SIZE
162+
$(warning Disabling CONFIG_CC_OPTIMIZE_FOR_SIZE. Your compiler does not have -mfentry so you cannot optimize for size with CONFIG_FUNCTION_GRAPH_TRACER.)
163+
endif
164+
157165
endif
158166
endif
159167
endif

arch/x86/kernel/ftrace.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929
#include <asm/ftrace.h>
3030
#include <asm/nops.h>
3131

32-
#if defined(CONFIG_FUNCTION_GRAPH_TRACER) && \
33-
!defined(CC_USING_FENTRY) && \
34-
!defined(CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE)
35-
# error The following combination is not supported: ((compiler missing -mfentry) || (CONFIG_X86_32 and !CONFIG_DYNAMIC_FTRACE)) && CONFIG_FUNCTION_GRAPH_TRACER && CONFIG_CC_OPTIMIZE_FOR_SIZE
36-
#endif
37-
3832
#ifdef CONFIG_DYNAMIC_FTRACE
3933

4034
int ftrace_arch_code_modify_prepare(void)

0 commit comments

Comments
 (0)