efi/x86: Move x86 back to libstub
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 5 Nov 2014 16:00:56 +0000 (17:00 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 11 Nov 2014 22:23:11 +0000 (22:23 +0000)
commit243b6754cd17112bbf0724ed3c13446b48cf6a28
treed105e79e798f37fabc49ae2996534af800c77379
parentaf5a29aee4d1e5b5fbfbaf45cb097f9c6257c7b8
efi/x86: Move x86 back to libstub

This reverts commit 84be880560fb, which itself reverted my original
attempt to move x86 from #include'ing .c files from across the tree
to using the EFI stub built as a static library.

The issue that affected the original approach was that splitting
the implementation into several .o files resulted in the variable
'efi_early' becoming a global with external linkage, which under
-fPIC implies that references to it must go through the GOT. However,
dealing with this additional GOT entry turned out to be troublesome
on some EFI implementations. (GCC's visibility=hidden attribute is
supposed to lift this requirement, but it turned out not to work on
the 32-bit build.)

Instead, use a pure getter function to get a reference to efi_early.
This approach results in no additional GOT entries being generated,
so there is no need for any changes in the early GOT handling.

Tested-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
arch/x86/boot/compressed/Makefile
arch/x86/boot/compressed/eboot.c
arch/x86/boot/compressed/eboot.h
arch/x86/include/asm/efi.h
drivers/firmware/efi/Makefile