Skip to content

Commit 0cfd900

Browse files
committed
kbuild: replace $(linked-object) with CONFIG options
*.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 <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Tested-by: Sedat Dilek <[email protected]> # LLVM-14
1 parent 0aa24a7 commit 0cfd900

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

scripts/Makefile.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ objtool_args = \
219219
$(if $(CONFIG_STACK_VALIDATION), --stackval) \
220220
$(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call) \
221221
--uaccess \
222-
$(if $(linked-object), --link) \
222+
$(if $($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT)), --link) \
223223
$(if $(part-of-module), --module) \
224224
$(if $(CONFIG_GCOV_KERNEL), --no-unreachable)
225225

@@ -284,7 +284,6 @@ quiet_cmd_cc_prelink_modules = LD [M] $@
284284
# modules into native code
285285
$(obj)/%.prelink.o: objtool-enabled = y
286286
$(obj)/%.prelink.o: part-of-module := y
287-
$(obj)/%.prelink.o: linked-object := y
288287

289288
$(obj)/%.prelink.o: $(obj)/%.o FORCE
290289
$(call if_changed,cc_prelink_modules)

0 commit comments

Comments
 (0)