Messages in this thread Patch in this message | | | Date | Wed, 22 Jul 2020 22:48:42 -0000 | From | "tip-bot2 for Masahiro Yamada" <> | Subject | [tip: efi/urgent] efi/libstub/arm64: link stub lib.a conditionally |
| |
The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: c1aac64ddc01112e137121a43645b96c3633c41b Gitweb: https://git.kernel.org/tip/c1aac64ddc01112e137121a43645b96c3633c41b Author: Masahiro Yamada <masahiroy@kernel.org> AuthorDate: Thu, 04 Jun 2020 11:20:30 +09:00 Committer: Ard Biesheuvel <ardb@kernel.org> CommitterDate: Thu, 09 Jul 2020 09:45:09 +03:00
efi/libstub/arm64: link stub lib.a conditionally
Since commit 799c43415442 ("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> --- arch/arm64/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 76359cf..4621fb6 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -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
| |