From f365a4661785ee355695a57b6005b4a62c80abdb Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Sat, 15 Jul 2023 01:10:06 +0200
Subject: [PATCH] misc: Minor updates to linker scripts

---
 common/linker_bios.ld.in | 2 +-
 decompressor/linker.ld   | 4 ++--
 test/linker.ld           | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/linker_bios.ld.in b/common/linker_bios.ld.in
index 10854b83..cb6ceddb 100644
--- a/common/linker_bios.ld.in
+++ b/common/linker_bios.ld.in
@@ -85,8 +85,8 @@ SECTIONS
 
     .bss : {
         bss_begin = .;
-        *(COMMON)
         *(.bss .bss.*)
+        *(COMMON)
         bss_end = .;
         data_end = .;
     } :data_s3
diff --git a/decompressor/linker.ld b/decompressor/linker.ld
index 169de6e2..3968e535 100644
--- a/decompressor/linker.ld
+++ b/decompressor/linker.ld
@@ -18,14 +18,14 @@ SECTIONS
     } :text
 
     .data : {
-        *(.rodata .rodata.*)
         *(.data .data.*)
+        *(.rodata .rodata.*)
     } :data
 
     .bss : {
         bss_begin = .;
-        *(COMMON)
         *(.bss .bss.*)
+        *(COMMON)
         bss_end = .;
     } :data
 
diff --git a/test/linker.ld b/test/linker.ld
index 17806d98..ce95d7f3 100644
--- a/test/linker.ld
+++ b/test/linker.ld
@@ -32,8 +32,6 @@ SECTIONS
 
     .data : {
         *(.data .data.*)
-        __global_pointer$ = . + 0x800;
-        *(.sdata .sdata.*)
     } :data
 
     .dynamic : {
@@ -41,8 +39,7 @@ SECTIONS
     } :data :dynamic
 
     .bss : {
-        *(COMMON)
-        *(.sbss .sbss.*)
         *(.bss .bss.*)
+        *(COMMON)
     } :data
 }