2018-06-09 6:47 GMT+09:00 Greg Thelen <gthelen@xxxxxxxxxx>: > 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. > > Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace") > Signed-off-by: Greg Thelen <gthelen@xxxxxxxxxx> > --- Applied to linux-kbuild/fixes. Thanks! > scripts/Makefile.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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 = \ > "$(CC_FLAGS_FTRACE)" ]; then \ > $(sub_cmd_record_mcount) \ > fi; > +endif # -record-mcount > endif # CONFIG_FTRACE_MCOUNT_RECORD > > ifdef CONFIG_STACK_VALIDATION > @@ -263,7 +264,6 @@ ifneq ($(RETPOLINE_CFLAGS),) > objtool_args += --retpoline > endif > endif > -endif > > > ifdef CONFIG_MODVERSIONS > -- > 2.18.0.rc1.242.g61856ae69a-goog > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Best Regards Masahiro Yamada -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html