android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kbuild: rename __objtool_obj and reuse it for cmd_cc_lto_link_modules

Browse Source 
Rename __objtool_obj to objtool, and move it out of the
'ifndef CONFIG_LTO_CLANG' conditional, so it can be used for
cmd_cc_lto_link_modules as well.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
This commit is contained in:
Masahiro Yamada 2021-08-31 16:39:53 +09:00
parent 8f0c32c788
commit 5c4859e77a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/Makefile.build
View File

@ -225,6 +225,8 @@ endif # CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
ifdef CONFIG_STACK_VALIDATION ifdef CONFIG_STACK_VALIDATION
objtool := $(objtree)/tools/objtool/objtool
objtool_args = \ objtool_args = \
$(if $(CONFIG_UNWINDER_ORC),orc generate,check) \ $(if $(CONFIG_UNWINDER_ORC),orc generate,check) \
$(if $(part-of-module), --module) \ $(if $(part-of-module), --module) \
@ -236,17 +238,15 @@ objtool_args = \
ifndef CONFIG_LTO_CLANG ifndef CONFIG_LTO_CLANG
__objtool_obj := $(objtree)/tools/objtool/objtool
# 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory # 'OBJECT_FILES_NON_STANDARD := y': skip objtool checking for a directory
# 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file # 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file
# 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file # 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file
cmd_objtool = $(if $(patsubst y%,, \ cmd_objtool = $(if $(patsubst y%,, \
$(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \ $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
$(__objtool_obj) $(objtool_args) $@) $(objtool) $(objtool_args) $@)
objtool_obj = $(if $(patsubst y%,, \ objtool_obj = $(if $(patsubst y%,, \
$(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \ $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n), \
$(__objtool_obj)) $(objtool))
endif # CONFIG_LTO_CLANG endif # CONFIG_LTO_CLANG
endif # CONFIG_STACK_VALIDATION endif # CONFIG_STACK_VALIDATION
@ -300,8 +300,7 @@ cmd_cc_lto_link_modules = \
ifdef CONFIG_STACK_VALIDATION ifdef CONFIG_STACK_VALIDATION
# objtool was skipped for LLVM bitcode, run it now that we have compiled # objtool was skipped for LLVM bitcode, run it now that we have compiled
# modules into native code # modules into native code
cmd_cc_lto_link_modules += ; \ cmd_cc_lto_link_modules += ; $(objtool) $(objtool_args) --module $@
$(objtree)/tools/objtool/objtool $(objtool_args) --module $@
endif endif
$(obj)/%.lto.o: $(obj)/%.o FORCE $(obj)/%.lto.o: $(obj)/%.o FORCE