diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
| commit | 891483186052b259852f3f48926ff307763f4eb0 (patch) | |
| tree | 019e4a490e40ad5459f7dd3d4129021be696c495 /arch/x86/config.mk | |
| parent | 36fec02b1f90b92cf51ec531564f9284eae27ab4 (diff) | |
| parent | 67bbc1ecd311c78b06e845a3fd4e333806782367 (diff) | |
Merge branch 'next'
Pull in changes that have been pending in our 'next' branch. This
includes:
- A large number of CI improvements including moving to gcc-9.2 for all
platforms.
- amlogic, xilinx, stm32, TI SoC updates
- USB and i2c subsystem updtaes
- Re-sync Kbuild/etc logic with v4.19 of the Linux kernel.
- RSA key handling improvements
Diffstat (limited to 'arch/x86/config.mk')
| -rw-r--r-- | arch/x86/config.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/config.mk b/arch/x86/config.mk index b5e8f46297..27d8412661 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -29,11 +29,11 @@ endif PLATFORM_RELFLAGS += -fdata-sections -ffunction-sections -fvisibility=hidden -PLATFORM_LDFLAGS += -Bsymbolic -Bsymbolic-functions -PLATFORM_LDFLAGS += -m $(if $(IS_32BIT),elf_i386,elf_x86_64) +KBUILD_LDFLAGS += -Bsymbolic -Bsymbolic-functions +KBUILD_LDFLAGS += -m $(if $(IS_32BIT),elf_i386,elf_x86_64) # This is used in the top-level Makefile which does not include -# PLATFORM_LDFLAGS +# KBUILD_LDFLAGS LDFLAGS_EFI_PAYLOAD := -Bsymbolic -Bsymbolic-functions -shared --no-undefined -s OBJCOPYFLAGS_EFI := -j .text -j .sdata -j .data -j .dynamic -j .dynsym \ @@ -71,7 +71,7 @@ LDSCRIPT := $(LDSCRIPT_EFI) else PLATFORM_CPPFLAGS += $(CFLAGS_NON_EFI) -PLATFORM_LDFLAGS += --emit-relocs +KBUILD_LDFLAGS += --emit-relocs LDFLAGS_FINAL += --gc-sections $(if $(CONFIG_SPL_BUILD),,-pie) endif |