Commit 93928d48 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'powerpc-6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:

 - Three fixes for various bogosity in our linker script, revealed
   by the recent commit which changed discard behaviour with some
   toolchains.

* tag 'powerpc-6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/vmlinux.lds: Don't discard .comment
  powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds
  powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT
parents e9ffbf16 be5f95c8
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#define BSS_FIRST_SECTIONS *(.bss.prominit) #define BSS_FIRST_SECTIONS *(.bss.prominit)
#define EMITS_PT_NOTE #define EMITS_PT_NOTE
#define RO_EXCEPTION_TABLE_ALIGN 0 #define RO_EXCEPTION_TABLE_ALIGN 0
#define RUNTIME_DISCARD_EXIT
#define SOFT_MASK_TABLE(align) \ #define SOFT_MASK_TABLE(align) \
. = ALIGN(align); \ . = ALIGN(align); \
...@@ -410,9 +411,12 @@ SECTIONS ...@@ -410,9 +411,12 @@ SECTIONS
DISCARDS DISCARDS
/DISCARD/ : { /DISCARD/ : {
*(*.EMB.apuinfo) *(*.EMB.apuinfo)
*(.glink .iplt .plt .rela* .comment) *(.glink .iplt .plt)
*(.gnu.version*) *(.gnu.version*)
*(.gnu.attributes) *(.gnu.attributes)
*(.eh_frame) *(.eh_frame)
#ifndef CONFIG_RELOCATABLE
*(.rela*)
#endif
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment