mirror of
https://github.com/torvalds/linux
synced 2024-10-06 19:34:19 +00:00
kbuild: rebuild .vmlinux.export.o when its prerequisite is updated
When include/linux/export-internal.h is updated, .vmlinux.export.o must be rebuilt, but it does not happen because its rule is hidden behind scripts/link-vmlinux.sh. Move it out of the shell script, so that Make can see the dependency between vmlinux and .vmlinux.export.o. Move the vmlinux rule to scripts/Makefile.vmlinux. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
parent
7a342e6c77
commit
5d4aeffbf7
18
Makefile
18
Makefile
|
@ -502,7 +502,7 @@ AFLAGS_MODULE =
|
||||||
LDFLAGS_MODULE =
|
LDFLAGS_MODULE =
|
||||||
CFLAGS_KERNEL =
|
CFLAGS_KERNEL =
|
||||||
AFLAGS_KERNEL =
|
AFLAGS_KERNEL =
|
||||||
LDFLAGS_vmlinux =
|
export LDFLAGS_vmlinux =
|
||||||
|
|
||||||
# Use USERINCLUDE when you must reference the UAPI directories only.
|
# Use USERINCLUDE when you must reference the UAPI directories only.
|
||||||
USERINCLUDE := \
|
USERINCLUDE := \
|
||||||
|
@ -1160,17 +1160,9 @@ vmlinux_o: vmlinux.a $(KBUILD_VMLINUX_LIBS)
|
||||||
vmlinux.o modules.builtin.modinfo modules.builtin: vmlinux_o
|
vmlinux.o modules.builtin.modinfo modules.builtin: vmlinux_o
|
||||||
@:
|
@:
|
||||||
|
|
||||||
ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
|
PHONY += vmlinux
|
||||||
|
vmlinux: vmlinux.o $(KBUILD_LDS) modpost
|
||||||
# Final link of vmlinux with optional arch pass after final link
|
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux
|
||||||
cmd_link-vmlinux = \
|
|
||||||
$(CONFIG_SHELL) $< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)"; \
|
|
||||||
$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
|
|
||||||
|
|
||||||
vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) modpost FORCE
|
|
||||||
+$(call if_changed_dep,link-vmlinux)
|
|
||||||
|
|
||||||
targets += vmlinux
|
|
||||||
|
|
||||||
# The actual objects are generated when descending,
|
# The actual objects are generated when descending,
|
||||||
# make sure no implicit rule kicks in
|
# make sure no implicit rule kicks in
|
||||||
|
@ -1501,7 +1493,7 @@ endif # CONFIG_MODULES
|
||||||
# Directories & files removed with 'make clean'
|
# Directories & files removed with 'make clean'
|
||||||
CLEAN_FILES += include/ksym vmlinux.symvers modules-only.symvers \
|
CLEAN_FILES += include/ksym vmlinux.symvers modules-only.symvers \
|
||||||
modules.builtin modules.builtin.modinfo modules.nsdeps \
|
modules.builtin modules.builtin.modinfo modules.nsdeps \
|
||||||
compile_commands.json .thinlto-cache .vmlinux.objs
|
compile_commands.json .thinlto-cache .vmlinux.objs .vmlinux.export.c
|
||||||
|
|
||||||
# Directories & files removed with 'make mrproper'
|
# Directories & files removed with 'make mrproper'
|
||||||
MRPROPER_FILES += include/config include/generated \
|
MRPROPER_FILES += include/config include/generated \
|
||||||
|
|
|
@ -1,18 +1,37 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
|
|
||||||
|
PHONY := __default
|
||||||
|
__default: vmlinux
|
||||||
|
|
||||||
include include/config/auto.conf
|
include include/config/auto.conf
|
||||||
include $(srctree)/scripts/Kbuild.include
|
include $(srctree)/scripts/Kbuild.include
|
||||||
|
|
||||||
# for c_flags
|
# for c_flags
|
||||||
include $(srctree)/scripts/Makefile.lib
|
include $(srctree)/scripts/Makefile.lib
|
||||||
|
|
||||||
|
targets :=
|
||||||
|
|
||||||
quiet_cmd_cc_o_c = CC $@
|
quiet_cmd_cc_o_c = CC $@
|
||||||
cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
|
cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
|
||||||
|
|
||||||
%.o: %.c FORCE
|
%.o: %.c FORCE
|
||||||
$(call if_changed_dep,cc_o_c)
|
$(call if_changed_dep,cc_o_c)
|
||||||
|
|
||||||
targets := $(MAKECMDGOALS)
|
ifdef CONFIG_MODULES
|
||||||
|
targets += .vmlinux.export.o
|
||||||
|
vmlinux: .vmlinux.export.o
|
||||||
|
endif
|
||||||
|
|
||||||
|
ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
|
||||||
|
|
||||||
|
# Final link of vmlinux with optional arch pass after final link
|
||||||
|
cmd_link_vmlinux = \
|
||||||
|
$< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)"; \
|
||||||
|
$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
|
||||||
|
|
||||||
|
targets += vmlinux
|
||||||
|
vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE
|
||||||
|
+$(call if_changed_dep,link_vmlinux)
|
||||||
|
|
||||||
# Add FORCE to the prequisites of a target to force it to be always rebuilt.
|
# Add FORCE to the prequisites of a target to force it to be always rebuilt.
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
|
@ -199,7 +199,6 @@ cleanup()
|
||||||
rm -f System.map
|
rm -f System.map
|
||||||
rm -f vmlinux
|
rm -f vmlinux
|
||||||
rm -f vmlinux.map
|
rm -f vmlinux.map
|
||||||
rm -f .vmlinux.export.c
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Use "make V=1" to debug this script
|
# Use "make V=1" to debug this script
|
||||||
|
@ -214,10 +213,6 @@ if [ "$1" = "clean" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if is_enabled CONFIG_MODULES; then
|
|
||||||
${MAKE} -f "${srctree}/scripts/Makefile.vmlinux" .vmlinux.export.o
|
|
||||||
fi
|
|
||||||
|
|
||||||
${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init init/version-timestamp.o
|
${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init init/version-timestamp.o
|
||||||
|
|
||||||
btf_vmlinux_bin_o=""
|
btf_vmlinux_bin_o=""
|
||||||
|
|
Loading…
Reference in a new issue