:: commit 9d6121038d4cec526bd439ecb7a42e2cd8030234

mintsuki <mintsuki@protonmail.com> — 2021-12-21 23:10

parents: 438a38c7e1

lds: Move build-id inside limine.sys size area

diff --git a/stage23/linker.ld b/stage23/linker.ld
index 63fc7179..13cdb61e 100644
--- a/stage23/linker.ld
+++ b/stage23/linker.ld
@@ -48,11 +48,11 @@ SECTIONS
         *(.no_unwind)
         data_begin = .;
         *(.data .data.*)
-        limine_sys_size = . - 0x8000;
     }
 
     .note.gnu.build-id : {
         *(.note.gnu.build-id)
+        limine_sys_size = . - 0x8000;
     }
 
     .bss : {
diff --git a/stage23/linker_dbg.ld b/stage23/linker_dbg.ld
index 3d57d417..fc34d273 100644
--- a/stage23/linker_dbg.ld
+++ b/stage23/linker_dbg.ld
@@ -48,11 +48,11 @@ SECTIONS
         *(.no_unwind)
         data_begin = .;
         *(.data .data.*)
-        limine_sys_size = . - 0x8000;
     }
 
     .note.gnu.build-id : {
         *(.note.gnu.build-id)
+        limine_sys_size = . - 0x8000;
     }
 
     .bss : {
diff --git a/stage23/linker_nomap.ld b/stage23/linker_nomap.ld
index 7c1dad41..1b170d70 100644
--- a/stage23/linker_nomap.ld
+++ b/stage23/linker_nomap.ld
@@ -48,11 +48,11 @@ SECTIONS
         *(.no_unwind)
         data_begin = .;
         *(.data .data.*)
-        limine_sys_size = . - 0x8000;
     }
 
     .note.gnu.build-id : {
         *(.note.gnu.build-id)
+        limine_sys_size = . - 0x8000;
     }
 
     .bss : {
diff --git a/stage23/linker_stage2only.ld b/stage23/linker_stage2only.ld
index 6cc725f7..60ad1431 100644
--- a/stage23/linker_stage2only.ld
+++ b/stage23/linker_stage2only.ld
@@ -31,8 +31,8 @@ SECTIONS
         *.s2.o(.rodata .rodata.*)
         stage2_map = .;
         stage3_common = .;
+        build_id_s3 = .;
         full_map = .;
-        limine_sys_size = .;
         getchar_internal = .;
         getchar = .;
         menu = .;
@@ -40,13 +40,9 @@ SECTIONS
         data_begin = .;
     }
 
-    .stage3.build-id : {
-        build_id_s3 = .;
-        *build-id.s3.o(*)
-    }
-
     .note.gnu.build-id : {
         *(.note.gnu.build-id)
+        limine_sys_size = . - 0x8000;
     }
 
     .bss : {
tab: 248 wrap: offon