Workaround lld bug and ensure sections and symbols are aligned

rust-embedded · Aug 20, 2020 · 2c5077a · 2c5077a
1 parent 1fd84a8
commit 2c5077a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/link.x.in b/link.x.in
@@ -88,8 +88,9 @@ SECTIONS
     *(.text .text.*);
     *(.HardFaultTrampoline);
     *(.HardFault.*);
+    . = ALIGN(4); /* Pad .text to the alignment to workaround overlapping load section bug in old lld */
   } > FLASH
-  . = ALIGN(4);
+  . = ALIGN(4); /* Ensure __etext is aligned if something unaligned is inserted after .text */
   __etext = .; /* Define outside of .text to allow using INSERT AFTER .text */
 
   /* ### .rodata */
@@ -125,8 +126,9 @@ SECTIONS
   {
     *(.bss .bss.*);
     *(COMMON); /* Uninitialized C statics */
+    . = ALIGN(4); /* 4-byte align the end (VMA) of this section */
   } > RAM
-  . = ALIGN(4); /* 4-byte align the end (VMA) of this section */
+  . = ALIGN(4); /* Ensure __ebss is aligned if something unaligned is inserted after .bss */
   __ebss = .;
 
   /* ### .uninit */