Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kbuild,objtool: Defer objtool validation step for CONFIG_KLP_BUILD
In preparation for klp-build, defer objtool validation for
CONFIG_KLP_BUILD kernels until the final pre-link archive (e.g.,
vmlinux.o, module-foo.o) is built. This will simplify the process of
generating livepatch modules.
Delayed objtool is generally preferred anyway, and is already standard
for IBT and LTO. Eventually the per-translation-unit mode will be
phased out.
Acked-by: Petr Mladek <pmladek@suse.com>
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
+3
-2
+1
-1
scripts/Makefile.lib
+1
-1
scripts/Makefile.lib
···
197
197
$(if $(delay-objtool), --link) \
198
198
$(if $(part-of-module), --module)
199
199
200
-
delay-objtool := $(or $(CONFIG_LTO_CLANG),$(CONFIG_X86_KERNEL_IBT))
200
+
delay-objtool := $(or $(CONFIG_LTO_CLANG),$(CONFIG_X86_KERNEL_IBT),$(CONFIG_KLP_BUILD))
201
201
202
202
cmd_objtool = $(if $(objtool-enabled), ; $(objtool) $(objtool-args) $@)
203
203
cmd_gen_objtooldep = $(if $(objtool-enabled), { echo ; echo '$@: $$(wildcard $(objtool))' ; } >> $(dot-target).cmd)
+2
-1
scripts/link-vmlinux.sh
+2
-1
scripts/link-vmlinux.sh
···
60
60
# skip output file argument
61
61
shift
62
62
63
-
if is_enabled CONFIG_LTO_CLANG || is_enabled CONFIG_X86_KERNEL_IBT; then
63
+
if is_enabled CONFIG_LTO_CLANG || is_enabled CONFIG_X86_KERNEL_IBT ||
64
+
is_enabled CONFIG_KLP_BUILD; then
64
65
# Use vmlinux.o instead of performing the slow LTO link again.
65
66
objs=vmlinux.o
66
67
libs=