diff options
| author | Greg Thelen <gthelen@google.com> | 2018-06-08 17:47:46 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-06-21 15:12:56 -0400 |
| commit | ed7d40bc67b8353c677b38c6cdddcdc310c0f452 (patch) | |
| tree | e21b8b8eea450180f1752432707262add73fed1e /scripts | |
| parent | 064f35a952246c60e956717dfc5782c48f174e74 (diff) | |
tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount
Non gcc-5 builds with CONFIG_STACK_VALIDATION=y and
SKIP_STACK_VALIDATION=1 fail.
Example output:
/bin/sh: init/.tmp_main.o: Permission denied
commit 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace"),
added a mismatched endif. This causes cmd_objtool to get mistakenly
set.
Relocate endif to balance the newly added -record-mcount check.
Link: http://lkml.kernel.org/r/20180608214746.136554-1-gthelen@google.com
Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace")
Acked-by: Andi Kleen <ak@linux.intel.com>
Tested-by: David Rientjes <rientjes@google.com>
Signed-off-by: Greg Thelen <gthelen@google.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 34d9e9ce97c2..e7889f486ca1 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
| @@ -239,6 +239,7 @@ cmd_record_mcount = \ | |||
| 239 | "$(CC_FLAGS_FTRACE)" ]; then \ | 239 | "$(CC_FLAGS_FTRACE)" ]; then \ |
| 240 | $(sub_cmd_record_mcount) \ | 240 | $(sub_cmd_record_mcount) \ |
| 241 | fi; | 241 | fi; |
| 242 | endif # -record-mcount | ||
| 242 | endif # CONFIG_FTRACE_MCOUNT_RECORD | 243 | endif # CONFIG_FTRACE_MCOUNT_RECORD |
| 243 | 244 | ||
| 244 | ifdef CONFIG_STACK_VALIDATION | 245 | ifdef CONFIG_STACK_VALIDATION |
| @@ -263,7 +264,6 @@ ifneq ($(RETPOLINE_CFLAGS),) | |||
| 263 | objtool_args += --retpoline | 264 | objtool_args += --retpoline |
| 264 | endif | 265 | endif |
| 265 | endif | 266 | endif |
| 266 | endif | ||
| 267 | 267 | ||
| 268 | 268 | ||
| 269 | ifdef CONFIG_MODVERSIONS | 269 | ifdef CONFIG_MODVERSIONS |
