kbuild: minor improvement for thin archives build (abac4c89) · Commits · 戴 / test

The root built-in.o archive is currently generated before all object files are built for the final link, due to final build of init/ after version update. In practice it seems like it doesn't matter because the archive symbol table does not change, but it is more logical to create the final archive as the last step. Signed-off-by:

Nicholas Piggin <npiggin@gmail.com> Signed-off-by:

Michal Marek <mmarek@suse.com>

scripts/link-vmlinux.sh

+9 −9

Original line number	Diff line number	Diff line
		@@ -209,15 +209,6 @@ case "${KCONFIG_CONFIG}" in
		. "./${KCONFIG_CONFIG}"
		esac

		archive_builtin

		#link vmlinux.o
		info LD vmlinux.o
		modpost_link vmlinux.o

		# modpost vmlinux.o to check for section mismatches
		${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o

		# Update version
		info GEN .version
		if [ ! -r .version ]; then
		@@ -231,6 +222,15 @@ fi;
		# final build of init/
		${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}"

		archive_builtin

		#link vmlinux.o
		info LD vmlinux.o
		modpost_link vmlinux.o

		# modpost vmlinux.o to check for section mismatches
		${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o

		kallsymso=""
		kallsyms_vmlinux=""
		if [ -n "${CONFIG_KALLSYMS}" ]; then

Admin message