]> git.ipfire.org Git - people/ms/linux.git/commitdiff
kbuild: replace $(linked-object) with CONFIG options
authorMasahiro Yamada <masahiroy@kernel.org>
Fri, 27 May 2022 10:01:48 +0000 (19:01 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Sun, 29 May 2022 09:39:35 +0000 (18:39 +0900)
*.prelink.o is created when CONFIG_LTO_CLANG or CONFIG_X86_KERNEL_IBT
is enabled.

Replace $(linked-object) with $(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT)
so you will get a quick idea of when the --link option is passed.

No functional change is intended.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com> # LLVM-14
scripts/Makefile.build

index 06400504150b3ce795a780b96439b591ed639aa6..f80196eef03a53d14dd5fb8f835d64502fc53d64 100644 (file)
@@ -219,7 +219,7 @@ objtool_args =                                                              \
        $(if $(CONFIG_STACK_VALIDATION), --stackval)                    \
        $(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call)          \
        --uaccess                                                       \
-       $(if $(linked-object), --link)                                  \
+       $(if $($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT)), --link)    \
        $(if $(part-of-module), --module)                               \
        $(if $(CONFIG_GCOV_KERNEL), --no-unreachable)
 
@@ -284,7 +284,6 @@ quiet_cmd_cc_prelink_modules = LD [M]  $@
 # modules into native code
 $(obj)/%.prelink.o: objtool-enabled = y
 $(obj)/%.prelink.o: part-of-module := y
-$(obj)/%.prelink.o: linked-object := y
 
 $(obj)/%.prelink.o: $(obj)/%.o FORCE
        $(call if_changed,cc_prelink_modules)