diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2023-01-11 09:52:42 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-01-11 09:52:42 +1100 |
| commit | 53ab112a95086d10dc353ea4f979abb01644bbb6 (patch) | |
| tree | 2502b32729aed57bd6724c08f7a0295ab521ee68 | |
| parent | 88603b6dc419445847923fcb7fe5080067a30f98 (diff) | |
| parent | be5f95c8779e19779dd81927c8574fec5aaba36c (diff) | |
Merge branch 'fixes' into next
Merge our fixes branch to bring in the linker script fixes for older
toolchains.
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 8c3862b4c259..958e77a24f85 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -8,6 +8,7 @@ #define BSS_FIRST_SECTIONS *(.bss.prominit) #define EMITS_PT_NOTE #define RO_EXCEPTION_TABLE_ALIGN 0 +#define RUNTIME_DISCARD_EXIT #define SOFT_MASK_TABLE(align) \ . = ALIGN(align); \ @@ -410,9 +411,12 @@ SECTIONS DISCARDS /DISCARD/ : { *(*.EMB.apuinfo) - *(.glink .iplt .plt .rela* .comment) + *(.glink .iplt .plt) *(.gnu.version*) *(.gnu.attributes) *(.eh_frame) +#ifndef CONFIG_RELOCATABLE + *(.rela*) +#endif } } |