Commit 8f0c32c7 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: move objtool_args back to scripts/Makefile.build 



Commit b1a1a1a0 ("kbuild: lto: postpone objtool") moved objtool_args
to Makefile.lib, so the arguments can be used in Makefile.modfinal as
well as Makefile.build.

With commit 850ded46 ("kbuild: Fix TRIM_UNUSED_KSYMS with
LTO_CLANG"), module LTO linking came back to scripts/Makefile.build
again.

So, there is no more reason to keep objtool_args in a separate file.

Get it back to the original place, close to the objtool command.

Remove the stale comment too.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
parent 04e85bbf

scripts/Makefile.build

+10 −0
Original line number Diff line number Diff line
@@ -224,6 +224,16 @@ cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), 
endif # CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT



ifdef CONFIG_STACK_VALIDATION



objtool_args =								\

	$(if $(CONFIG_UNWINDER_ORC),orc generate,check)			\

	$(if $(part-of-module), --module)				\

	$(if $(CONFIG_FRAME_POINTER),, --no-fp)				\

	$(if $(CONFIG_GCOV_KERNEL)$(CONFIG_LTO_CLANG), --no-unreachable)\

	$(if $(CONFIG_RETPOLINE), --retpoline)				\

	$(if $(CONFIG_X86_SMAP), --uaccess)				\

	$(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount)



ifndef CONFIG_LTO_CLANG



__objtool_obj := $(objtree)/tools/objtool/objtool

scripts/Makefile.lib

+0 −11
Original line number Diff line number Diff line
@@ -232,17 +232,6 @@ ifeq ($(CONFIG_LTO_CLANG),y) 
mod-prelink-ext := .lto

endif



# Objtool arguments are also needed for modfinal with LTO, so we define

# then here to avoid duplication.

objtool_args =								\

	$(if $(CONFIG_UNWINDER_ORC),orc generate,check)			\

	$(if $(part-of-module), --module)				\

	$(if $(CONFIG_FRAME_POINTER),, --no-fp)				\

	$(if $(CONFIG_GCOV_KERNEL)$(CONFIG_LTO_CLANG), --no-unreachable)\

	$(if $(CONFIG_RETPOLINE), --retpoline)				\

	$(if $(CONFIG_X86_SMAP), --uaccess)				\

	$(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount)



# Useful for describing the dependency of composite objects

# Usage:

#   $(call multi_depend, multi_used_targets, suffix_to_remove, suffix_to_add)