Fix INSERT AFTER for .text and .bss

Additionally, include COMMON symbols (uninitialized statics from C) in bss.
rust-embedded · Aug 20, 2020 · 1fd84a8 · 1fd84a8
1 parent 2c56bfd
commit 1fd84a8
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/link.x.in b/link.x.in
@@ -88,9 +88,9 @@ SECTIONS
     *(.text .text.*);
     *(.HardFaultTrampoline);
     *(.HardFault.*);
-    . = ALIGN(4);
-    __etext = .;
   } > FLASH
+  . = ALIGN(4);
+  __etext = .; /* Define outside of .text to allow using INSERT AFTER .text */
 
   /* ### .rodata */
   .rodata __etext : ALIGN(4)
@@ -119,14 +119,15 @@ SECTIONS
   __sidata = LOADADDR(.data);
 
   /* ### .bss */
+  . = ALIGN(4);
+  __sbss = .; /* Define outside of section to include INSERT BEFORE/AFTER symbols */
   .bss (NOLOAD) : ALIGN(4)
   {
-    . = ALIGN(4);
-    __sbss = .;
     *(.bss .bss.*);
-    . = ALIGN(4); /* 4-byte align the end (VMA) of this section */
-    __ebss = .;
+    *(COMMON); /* Uninitialized C statics */
   } > RAM
+  . = ALIGN(4); /* 4-byte align the end (VMA) of this section */
+  __ebss = .;
 
   /* ### .uninit */
   .uninit (NOLOAD) : ALIGN(4)