From a65f7fbf887ae9cac41d76e90604b73bad504c45 Mon Sep 17 00:00:00 2001
From: TuxSH <tuxsh@sfr.fr>
Date: Fri, 25 May 2018 23:59:17 +0200
Subject: [PATCH] Fix the linker scripts again

---
 arm11/linker.ld | 49 +++++++++++++++++++++++--------------------------
 arm9/linker.ld  | 35 +++++++++++++++++------------------
 2 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/arm11/linker.ld b/arm11/linker.ld
index c0612db..9bf4d26 100644
--- a/arm11/linker.ld
+++ b/arm11/linker.ld
@@ -4,6 +4,11 @@ ENTRY(_start)
 
 /* Mostly copied from https://github.com/devkitPro/buildscripts/blob/master/dkarm-eabi/crtls/3dsx.ld */
 
+PHDRS
+{
+    main PT_LOAD;
+}
+
 SECTIONS
 {
     PROVIDE(__start__           = 0x1FF80000);
@@ -11,19 +16,11 @@ SECTIONS
     PROVIDE(__stack_bottom__    = 0x1FFFD000);
 
     . = __start__;
-    . = ALIGN(32);
-
-    .crt0 :
-    {
-        . = ALIGN(32);
-        KEEP( *(.text.start) )
-        KEEP( *(.init) )
-        . = ALIGN(4);
-    }
 
     .text :
     {
-        . = ALIGN(4);
+        KEEP( *(.text.start) )
+        KEEP( *(.init) )
 
         /* .text */
         *(.text)
@@ -33,12 +30,11 @@ SECTIONS
         *(.stub)
         *(.gnu.warning)
         *(.gnu.linkonce.t*)
-        . = ALIGN(4);
 
         /* .fini */
         KEEP( *(.fini) )
-        . = ALIGN(4);
-    }
+        . = ALIGN(32);
+    } :main
 
     .rodata :
     {
@@ -48,17 +44,17 @@ SECTIONS
         *all.rodata*(*)
         *(.gnu.linkonce.r*)
         SORT(CONSTRUCTORS)
-        . = ALIGN(4);
+        . = ALIGN(8);
     }
 
-    .preinit_array ALIGN(4) :
+    .preinit_array :
     {
         PROVIDE (__preinit_array_start = .);
         KEEP (*(.preinit_array))
         PROVIDE (__preinit_array_end = .);
     }
 
-    .init_array ALIGN(4) :
+    .init_array :
     {
         PROVIDE (__init_array_start = .);
         KEEP (*(SORT(.init_array.*)))
@@ -66,7 +62,7 @@ SECTIONS
         PROVIDE (__init_array_end = .);
     }
 
-    .fini_array ALIGN(4) :
+    .fini_array :
     {
         PROVIDE (__fini_array_start = .);
         KEEP (*(.fini_array))
@@ -74,26 +70,26 @@ SECTIONS
         PROVIDE (__fini_array_end = .);
     }
 
-    .ctors ALIGN(4) :
+    .ctors :
     {
         KEEP (*crtbegin.o(.ctors)) /* MUST be first -- GCC requires it */
         KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
         KEEP (*(SORT(.ctors.*)))
         KEEP (*(.ctors))
+        . = ALIGN(4);   /* REQUIRED. LD is flaky without it. */
     }
 
-    .dtors ALIGN(4) :
+    .dtors :
     {
         KEEP (*crtbegin.o(.dtors))
         KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
         KEEP (*(SORT(.dtors.*)))
         KEEP (*(.dtors))
+        . = ALIGN(4);   /* REQUIRED. LD is flaky without it. */
     }
 
-    .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
-    __exidx_start = .;
-    ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
-    __exidx_end = .;
+    .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) __exidx_start = .;}
+    ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*)  __exidx_end = .;}
 
     .data :
     {
@@ -102,10 +98,10 @@ SECTIONS
         KEEP (*(.large_patch*))
         *(.gnu.linkonce.d*)
         CONSTRUCTORS
-        . = ALIGN(4);
+        . = ALIGN(32);
     }
 
-    .bss :
+    .bss (NOLOAD) :
     {
         . = ALIGN(32);
         PROVIDE (__bss_start__ = ABSOLUTE(.));
@@ -116,7 +112,8 @@ SECTIONS
         *(COMMON)
         . = ALIGN(8);
         PROVIDE (__bss_end__ = ABSOLUTE(.));
-    }
+    } :NONE
+
     PROVIDE (__end__ = ABSOLUTE(.));
 
     /* ==================
diff --git a/arm9/linker.ld b/arm9/linker.ld
index a4b9e9b..4365b8c 100644
--- a/arm9/linker.ld
+++ b/arm9/linker.ld
@@ -4,15 +4,14 @@ ENTRY(_start)
 
 PHDRS
 {
-	crt0 PT_LOAD;
-	itcm PT_LOAD;
-	main PT_LOAD;
+    crt0 PT_LOAD;
+    itcm PT_LOAD;
+    main PT_LOAD;
 }
 
 /* Mostly copied from https://github.com/devkitPro/buildscripts/blob/master/dkarm-eabi/crtls/3dsx.ld */
 MEMORY
 {
-    NULL                : ORIGIN = 0x00000000, LENGTH = 0x1000
     main                : ORIGIN = 0x08006000, LENGTH = 0x080F0000 - 0x08006000
     itcm                : ORIGIN = 0x01FF8000, LENGTH = 0x01FFB800 - 0x01FF8000 /* Unused ITCM slice. */
 }
@@ -57,19 +56,20 @@ SECTIONS
         chainloader.o(.data*)
         i2c.o(.data*)
         arm9_exception_handlers.o(.data*)
-
         . = ALIGN(32);
-        PROVIDE (__itcm_bss_start__ = ABSOLUTE(.));
     } >itcm AT>main :itcm
 
-    .itcm_bss __itcm_bss_start__ (NOLOAD) :
+    .itcm_bss (NOLOAD) :
     {
+        . = ALIGN(32);
+        PROVIDE (__itcm_bss_start__ = ABSOLUTE(.));
+
         *(.arm9_exception_handlers.bss*)
         chainloader.o(.bss* COMMON)
         i2c.o(.bss* COMMON)
         arm9_exception_handlers.o(.bss* COMMON)
-        . = ALIGN(8);
-        PROVIDE (__itcm_end__ = .);
+        . = ALIGN(32);
+        PROVIDE (__itcm_end__ = ABSOLUTE(.));
     } >itcm :NONE
 
     .text :
@@ -82,11 +82,10 @@ SECTIONS
         *(.stub)
         *(.gnu.warning)
         *(.gnu.linkonce.t*)
-        . = ALIGN(4);
 
         /* .fini */
         KEEP( *(.fini) )
-        . = ALIGN(4);
+        . = ALIGN(8);
     } >main :main
 
     .rodata :
@@ -97,10 +96,10 @@ SECTIONS
         *all.rodata*(*)
         *(.gnu.linkonce.r*)
         SORT(CONSTRUCTORS)
-        . = ALIGN(4);
+        . = ALIGN(8);
     } >main
 
-    .preinit_array ALIGN(4) :
+    .preinit_array :
     {
         PROVIDE (__preinit_array_start = .);
         KEEP (*(.preinit_array))
@@ -129,6 +128,7 @@ SECTIONS
         KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
         KEEP (*(SORT(.ctors.*)))
         KEEP (*(.ctors))
+        . = ALIGN(4);   /* REQUIRED. LD is flaky without it. */
     } >main
 
     .dtors ALIGN(4) :
@@ -137,12 +137,11 @@ SECTIONS
         KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
         KEEP (*(SORT(.dtors.*)))
         KEEP (*(.dtors))
+        . = ALIGN(4);   /* REQUIRED. LD is flaky without it. */
     } >main
 
-    .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >main
-    __exidx_start = .;
-    ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) } >main
-    __exidx_end = .;
+    .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) __exidx_start = ABSOLUTE(.);} >main
+    ARM.exidx : { *(.ARM.exidx* .gnu.linkonce.armexidx.*)  __exidx_end = ABSOLUTE(.);} >main
 
     .data :
     {
@@ -151,7 +150,7 @@ SECTIONS
         KEEP (*(.large_patch*))
         *(.gnu.linkonce.d*)
         CONSTRUCTORS
-        . = ALIGN(4);
+        . = ALIGN(32);
     } >main
 
     .bss (NOLOAD) :