Commit 9c5a0ac3 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: move vmlinux.o rule to the top Makefile 



Move the build rules of vmlinux.o out of scripts/link-vmlinux.sh to
clearly separate 1) pre-modpost, 2) modpost, 3) post-modpost stages.
This will make further refactoring possible.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Tested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: default avatarNicolas Schier <nicolas@fjasle.eu>
parent 26ef40de

Makefile

+5 −4
Original line number Diff line number Diff line
@@ -1118,8 +1118,6 @@ endif 
export KBUILD_VMLINUX_OBJS KBUILD_VMLINUX_LIBS

export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds



vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)



# Recurse until adjust_autoksyms.sh is satisfied

PHONY += autoksyms_recursive

ifdef CONFIG_TRIM_UNUSED_KSYMS
@@ -1142,6 +1140,9 @@ quiet_cmd_autoksyms_h = GEN $@ 
$(autoksyms_h):

	$(call cmd,autoksyms_h)



vmlinux.o: autoksyms_recursive $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) FORCE

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux_o



ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)



# Final link of vmlinux with optional arch pass after final link
@@ -1149,14 +1150,14 @@ cmd_link-vmlinux = \ 
	$(CONFIG_SHELL) $< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)";    \

	$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)



vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE

vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE

	+$(call if_changed_dep,link-vmlinux)



targets := vmlinux



# The actual objects are generated when descending,

# make sure no implicit rule kicks in

$(sort $(vmlinux-deps)): . ;

$(sort $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)): . ;



filechk_kernel.release = \

	echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"

scripts/link-vmlinux.sh

+0 −3
Original line number Diff line number Diff line
@@ -214,9 +214,6 @@ if [ "$1" = "clean" ]; then 
	exit 0

fi



#link vmlinux.o

${MAKE} -f "${srctree}/scripts/Makefile.vmlinux_o"



# modpost vmlinux.o to check for section mismatches

${MAKE} -f "${srctree}/scripts/Makefile.modpost" MODPOST_VMLINUX=1