diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-06-04 11:20:30 +0900 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2020-07-09 09:45:09 +0300 |
| commit | c1aac64ddc01112e137121a43645b96c3633c41b (patch) | |
| tree | 1039b8e5f5b8f071c45a94e0836d6c0941d35e24 /arch/arm64/Makefile | |
| parent | 59476f80d8781a84e25f0cbcf378ccab1ad7abf8 (diff) | |
| download | lwn-c1aac64ddc01112e137121a43645b96c3633c41b.tar.gz lwn-c1aac64ddc01112e137121a43645b96c3633c41b.zip | |
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>
Diffstat (limited to 'arch/arm64/Makefile')
| -rw-r--r-- | arch/arm64/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 76359cfb328a..4621fb690d9c 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 |