[U-Boot] [PATCH v3 04/28] x86: Set up toolchain flags for running as EFI application

[Bin Meng]

On Wed, Aug 5, 2015 at 2:33 AM, Simon Glass <sjg at chromium.org> wrote:
> From: Ben Stoltz <stoltz at google.com>
>
> Adjust the toolchain flags to build U-Boot as a relocatable shared library,
> as required by EFI.
>
> Signed-off-by: Ben Stoltz <stoltz at google.com>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> Changes in v3:
> - Add spaces around EFIARCH=
> - Drop LDFLAGS_EFI from this patch
> - Move '-m elf_i386' into the common PLATFORM_LDFLAGS
>
> Changes in v2:
> - Add a comment as to where LDFLAGS_EFI is used
> - Drop duplicate OBJCOPYFLAGS_EFI
> - Drop no-red-zone as it is not needed for i386
> - Rename CONFIG_ARCH_EFI to CONFIG_EFI_APP
> - Use toolchain instead of tool chain
>
>  arch/x86/config.mk | 30 +++++++++++++++++++++++++++---
>  1 file changed, 27 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/config.mk b/arch/x86/config.mk
> index 999143e..e27f84a 100644
> --- a/arch/x86/config.mk
> +++ b/arch/x86/config.mk
> @@ -8,19 +8,43 @@
>  CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
>
>  PLATFORM_CPPFLAGS += -fno-strict-aliasing
> -PLATFORM_CPPFLAGS += -mregparm=3
>  PLATFORM_CPPFLAGS += -fomit-frame-pointer
>  PF_CPPFLAGS_X86   := $(call cc-option, -fno-toplevel-reorder, \
>                        $(call cc-option, -fno-unit-at-a-time)) \
>                      $(call cc-option, -mpreferred-stack-boundary=2)
> +
>  PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_X86)
>  PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm
>  PLATFORM_CPPFLAGS += -march=i386 -m32
>
>  PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
>
> -PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions -m elf_i386
> +PLATFORM_LDFLAGS += -Bsymbolic -Bsymbolic-functions -m elf_i386
>
> -LDFLAGS_FINAL += --gc-sections -pie
>  LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3
>  LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3
> +
> +OBJCOPYFLAGS_EFI := -j .text -j .sdata -j .data -j .dynamic -j .dynsym \
> +       -j .rel -j .rela -j .reloc
> +
> +CFLAGS_NON_EFI := -mregparm=3
> +CFLAGS_EFI := -fpic -fshort-wchar
> +
> +EFIARCH = ia32
> +
> +LDSCRIPT_EFI := $(srctree)/$(CPUDIR)/efi/elf_$(EFIARCH)_efi.lds
> +OBJCOPYFLAGS_EFI += --target=efi-app-$(EFIARCH)
> +
> +ifeq ($(CONFIG_EFI_APP),y)
> +
> +PLATFORM_CPPFLAGS += $(CFLAGS_EFI)
> +LDFLAGS_FINAL += -znocombreloc -shared
> +LDSCRIPT := $(LDSCRIPT_EFI)
> +
> +else
> +
> +PLATFORM_CPPFLAGS += $(CFLAGS_NON_EFI)
> +PLATFORM_LDFLAGS += --emit-relocs
> +LDFLAGS_FINAL += --gc-sections -pie
> +
> +endif
> --

Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
Tested-by: Bin Meng <bmeng.cn at gmail.com>