mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
objtool: Fix CONFIG_OBJTOOL_WERROR for vmlinux.o
With (!X86_KERNEL_IBT && !LTO_CLANG && NOINSTR_VALIDATION), objtool runs on both translation units and vmlinux.o. With CONFIG_OBJTOOL_WERROR, the TUs get --Werror but vmlinux.o doesn't. Fix that. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/4f71ab9b947ffc47b6a87dd3b9aff4bb32b36d0a.1742852846.git.jpoimboe@kernel.org
This commit is contained in:
committed by
Ingo Molnar
parent
1154bbd326
commit
4759670bc3
@@ -30,12 +30,20 @@ endif
|
||||
# objtool for vmlinux.o
|
||||
# ---------------------------------------------------------------------------
|
||||
#
|
||||
# For LTO and IBT, objtool doesn't run on individual translation units.
|
||||
# Run everything on vmlinux instead.
|
||||
# For delay-objtool (IBT or LTO), objtool doesn't run on individual translation
|
||||
# units. Instead it runs on vmlinux.o.
|
||||
#
|
||||
# For !delay-objtool + CONFIG_NOINSTR_VALIDATION, it runs on both translation
|
||||
# units and vmlinux.o, with the latter only used for noinstr/unret validation.
|
||||
|
||||
objtool-enabled := $(or $(delay-objtool),$(CONFIG_NOINSTR_VALIDATION))
|
||||
|
||||
vmlinux-objtool-args-$(delay-objtool) += $(objtool-args-y)
|
||||
ifeq ($(delay-objtool),y)
|
||||
vmlinux-objtool-args-y += $(objtool-args-y)
|
||||
else
|
||||
vmlinux-objtool-args-$(CONFIG_OBJTOOL_WERROR) += --Werror
|
||||
endif
|
||||
|
||||
vmlinux-objtool-args-$(CONFIG_GCOV_KERNEL) += --no-unreachable
|
||||
vmlinux-objtool-args-$(CONFIG_NOINSTR_VALIDATION) += --noinstr \
|
||||
$(if $(or $(CONFIG_MITIGATION_UNRET_ENTRY),$(CONFIG_MITIGATION_SRSO)), --unret)
|
||||
|
||||
Reference in New Issue
Block a user