diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-19 17:00:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-19 17:00:51 -0400 |
| commit | ac1f16f916f3e3153f9a8ee76aebe0243c18ff86 (patch) | |
| tree | 212186e7a58496abd908981e720343edcf50d9b7 /arch/x86 | |
| parent | eed05148c261e3b5f00b11a7a14bf0222b80a0ac (diff) | |
| parent | 03ad526edce501b883ea6032a4782967b8b52e81 (diff) | |
| download | u-boot-WIP/19Apr2021.zip u-boot-WIP/19Apr2021.tar.gz u-boot-WIP/19Apr2021.tar.bz2 | |
Merge branch '2021-04-19-assorted-improvements'WIP/19Apr2021
- ARM64 GIC fix, CONFIG_IRQ now moved to Kconfig
- IDE, lz4 fixes
- octeontx cleanups / enhancements
- highbank DM migration
- sysinfo improvements
- psci updates
- Enable use of -fstack-protector
Diffstat (limited to 'arch/x86')
| -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 27d8412..7a82425 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 -fstack-protector-strong 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) |