diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2021-04-11 11:21:57 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-19 11:10:55 -0400 |
| commit | 38bc426a2cb6fc4716ee28d170edd4c717e1263f (patch) | |
| tree | 76d413ff98ad219255e9b2fbfb3da171fd918ee6 | |
| parent | 043c7548559d6e2d33af9ec9707fdea34cfb4442 (diff) | |
| download | u-boot-38bc426a2cb6fc4716ee28d170edd4c717e1263f.tar.gz | |
x86: correct usage of CFLAGS_NON_EFI
The current usage of the variable CFLAGS_NON_EFI on the x86 architecture
deviates from other architectures.
Variable CFLAGS_NON_EFI is the list of compiler flags to be removed when
building UEFI applications. It is not a list of flags to be added anywhere.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rw-r--r-- | arch/x86/config.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 27d8412661..3067702858 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -39,10 +39,10 @@ LDFLAGS_EFI_PAYLOAD := -Bsymbolic -Bsymbolic-functions -shared --no-undefined -s OBJCOPYFLAGS_EFI := -j .text -j .sdata -j .data -j .dynamic -j .dynsym \ -j .rel -j .rela -j .reloc -ifeq ($(IS_32BIT),y) -CFLAGS_NON_EFI := -mregparm=3 -endif +# Compiler flags to be added when building UEFI applications CFLAGS_EFI := -fpic -fshort-wchar +# Compiler flags to be removed when building UEFI applications +CFLAGS_NON_EFI := -mregparm=3 ifeq ($(CONFIG_EFI_STUB_64BIT),) CFLAGS_EFI += $(call cc-option, -mno-red-zone) @@ -70,7 +70,9 @@ LDSCRIPT := $(LDSCRIPT_EFI) else -PLATFORM_CPPFLAGS += $(CFLAGS_NON_EFI) +ifeq ($(IS_32BIT),y) +PLATFORM_CPPFLAGS += -mregparm=3 +endif KBUILD_LDFLAGS += --emit-relocs LDFLAGS_FINAL += --gc-sections $(if $(CONFIG_SPL_BUILD),,-pie) |