sw/link: Avoid incorrect .bss delimiters

Under some conditions, `__bss_start` and `__bss_end would not correctly delimit `.bss`.
pulp-platform · Nov 14, 2024 · 8dd9b79 · 8dd9b79
1 parent 816de68
commit 8dd9b79
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/sw/link/dram.ld b/sw/link/dram.ld
@@ -28,16 +28,14 @@ SECTIONS {
     *(.sdata.*)
   } > dram
 
-  . = ALIGN(32);
-  __bss_start = .;
-  .bss : {
+  .bss : ALIGN(16) {
+    __bss_start = .;
     *(.bss)
     *(.bss.*)
     *(.sbss)
     *(.sbss.*)
+    __bss_end = .;
   } > dram
-  . = ALIGN(32);
-  __bss_end = .;
 
   .bulk : ALIGN(16) {
     *(.bulk)

diff --git a/sw/link/rom.ld b/sw/link/rom.ld
@@ -27,14 +27,12 @@ SECTIONS {
   } > spm AT>extrom
 
   /* BSS is not loaded, but initialized by CRT0 */
-  . = ALIGN(32);
-  __bss_start = .;
-  .bss : {
+  .bss : ALIGN(16) {
+    __bss_start = .;
     *(.bss)
     *(.bss.*)
     *(.sbss)
     *(.sbss.*)
+    __bss_end = .;
   } > spm
-  . = ALIGN(32);
-  __bss_end = .;
 }
diff --git a/sw/link/spm.ld b/sw/link/spm.ld
@@ -26,16 +26,14 @@ SECTIONS {
     *(.sdata.*)
   } > spm
 
-  . = ALIGN(32);
-  __bss_start = .;
-  .bss : {
+  .bss : ALIGN(16) {
+    __bss_start = .;
     *(.bss)
     *(.bss.*)
     *(.sbss)
     *(.sbss.*)
+    __bss_end = .;
   } > spm
-  . = ALIGN(32);
-  __bss_end = .;
 
   .bulk : ALIGN(16) {
     *(.bulk)