Commit 90220daf authored Jun 08, 2018 by Greg Thelen Committed by Greg Kroah-Hartman Feb 23, 2021

tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount

commit ed7d40bc67b8353c677b38c6cdddcdc310c0f452 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6b6810c2

scripts/Makefile.build

+1 −1

Original line number	Diff line number	Diff line
		@@ -255,6 +255,7 @@ cmd_record_mcount = \
		"$(CC_FLAGS_FTRACE)" ]; then \
		$(sub_cmd_record_mcount) \
		fi;
		endif # -record-mcount
		endif

		ifdef CONFIG_STACK_VALIDATION
		@@ -269,7 +270,6 @@ endif
		ifdef CONFIG_GCOV_KERNEL
		objtool_args += --no-unreachable
		endif
		endif

		# 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory
		# 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file