Commit c1aac64d authored Jun 04, 2020 by Masahiro Yamada Committed by Ard Biesheuvel Jul 09, 2020

efi/libstub/arm64: link stub lib.a conditionally



Since commit 799c4341 ("kbuild: thin archives make default for
all archs"), core-y is passed to the linker with --whole-archive.
Hence, the whole of stub library is linked to vmlinux.

Use libs-y so that lib.a is passed after --no-whole-archive for
conditional linking.

The unused drivers/firmware/efi/libstub/relocate.o will be dropped
for ARCH=arm64.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20200604022031.164207-1-masahiroy@kernel.org


Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

parent 59476f80

arch/arm64/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ export TEXT_OFFSET

		core-y += arch/arm64/
		libs-y := arch/arm64/lib/ $(libs-y)
		core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
		libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a

		# Default target when executing plain make
		boot := arch/arm64/boot

Admin message