From 52af5cde188c7cfc2f87de2b0f5c2e4734896d01 Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Sun, 8 Apr 2018 12:30:11 +0200
Subject: x86: slightly improve linker script

---
 arch/x86/x15.lds.S | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/arch/x86/x15.lds.S b/arch/x86/x15.lds.S
index 80b1e65..b896a5d 100644
--- a/arch/x86/x15.lds.S
+++ b/arch/x86/x15.lds.S
@@ -58,7 +58,7 @@ SECTIONS
     _percpu = .;
 
     .percpu 0 : AT(BOOT_VTOP(_percpu)) {
-        *(.percpu)
+        *(.percpu*)
     } : percpu
 
     . = _percpu + SIZEOF(.percpu);
@@ -67,18 +67,14 @@ SECTIONS
     _text = .;
 
     .text ALIGN(PAGE_SIZE) : AT(BOOT_VTOP(ADDR(.text))) {
-        *(.text)
+        *(.text*)
     } : text
 
     . = ALIGN(PAGE_SIZE);
     _rodata = .;
 
     .rodata ALIGN(PAGE_SIZE) : AT(BOOT_VTOP(ADDR(.rodata))) {
-        *(.rodata)
-    } : rodata
-
-    .notes ALIGN(CPU_DATA_ALIGN) : AT(BOOT_VTOP(ADDR(.notes))) {
-        *(.note.*)
+        *(.rodata*)
     } : rodata
 
     . = ALIGN(PAGE_SIZE);
@@ -88,21 +84,18 @@ SECTIONS
         . = ALIGN(CPU_L1_SIZE);
         *(.data.read_mostly)
         . = ALIGN(CPU_L1_SIZE);
-        *(.data)
+        *(.data*)
     } : data
 
     .bss ALIGN(CPU_DATA_ALIGN) : AT(BOOT_VTOP(ADDR(.bss))) {
-        *(.bss)
+        *(.bss*)
     } : data
 
     . = ALIGN(PAGE_SIZE);
     _end = .;
 
-    /*
-     * XXX A global offset section is created because of linking with libgcc.
-     * Is it safe to discard it ?
-     */
     /DISCARD/ : {
-        *(.eh_frame)
+        *(.eh_frame*)
+        *(.note*)
     }
 }
-- 
cgit v1.2.3