:: commit 3a5954fd3a5aa19c57cf16dbd56fe5a9e72e5bcc

Mintsuki <mintsuki@protonmail.com> — 2025-07-27 21:56

parents: 7642297e18

Revert "build: Explicitly break ld.gold"

This reverts commit 75d7f372bf2b7723f832484ebd38100db035f948.
diff --git a/common/linker_bios.ld.in b/common/linker_bios.ld.in
index 85026566..4c90b986 100644
--- a/common/linker_bios.ld.in
+++ b/common/linker_bios.ld.in
@@ -3,12 +3,12 @@ ENTRY(_start)
 
 PHDRS
 {
-    text_s2   PT_LOAD    FLAGS((1 << 0) | (1 << 2)) ;
-    rodata_s2 PT_LOAD    FLAGS((1 << 2)) ;
-    data_s2   PT_LOAD    FLAGS((1 << 1) | (1 << 2)) ;
-    text_s3   PT_LOAD    FLAGS((1 << 0) | (1 << 2)) ;
-    rodata_s3 PT_LOAD    FLAGS((1 << 2)) ;
-    data_s3   PT_LOAD    FLAGS((1 << 1) | (1 << 2)) ;
+    text_s2   PT_LOAD    FLAGS(0x05);
+    rodata_s2 PT_LOAD    FLAGS(0x04);
+    data_s2   PT_LOAD    FLAGS(0x06);
+    text_s3   PT_LOAD    FLAGS(0x05);
+    rodata_s3 PT_LOAD    FLAGS(0x04);
+    data_s3   PT_LOAD    FLAGS(0x06);
 }
 
 SECTIONS
diff --git a/common/linker_uefi_aarch64.ld.in b/common/linker_uefi_aarch64.ld.in
index f5d1f886..e6bcb2ab 100644
--- a/common/linker_uefi_aarch64.ld.in
+++ b/common/linker_uefi_aarch64.ld.in
@@ -3,10 +3,10 @@ ENTRY(_start)
 
 PHDRS
 {
-    text    PT_LOAD    FLAGS((1 << 0) | (1 << 2)) ;
-    rodata  PT_LOAD    FLAGS((1 << 2)) ;
-    data    PT_LOAD    FLAGS((1 << 1) | (1 << 2)) ;
-    dynamic PT_DYNAMIC FLAGS((1 << 1) | (1 << 2)) ;
+    text    PT_LOAD    FLAGS(0x05);
+    rodata  PT_LOAD    FLAGS(0x04);
+    data    PT_LOAD    FLAGS(0x06);
+    dynamic PT_DYNAMIC FLAGS(0x06);
 }
 
 SECTIONS
diff --git a/common/linker_uefi_ia32.ld.in b/common/linker_uefi_ia32.ld.in
index f7b37c73..a1133359 100644
--- a/common/linker_uefi_ia32.ld.in
+++ b/common/linker_uefi_ia32.ld.in
@@ -3,10 +3,10 @@ ENTRY(_start)
 
 PHDRS
 {
-    text    PT_LOAD    FLAGS((1 << 0) | (1 << 2)) ;
-    rodata  PT_LOAD    FLAGS((1 << 2)) ;
-    data    PT_LOAD    FLAGS((1 << 1) | (1 << 2)) ;
-    dynamic PT_DYNAMIC FLAGS((1 << 1) | (1 << 2)) ;
+    text    PT_LOAD    FLAGS(0x05);
+    rodata  PT_LOAD    FLAGS(0x04);
+    data    PT_LOAD    FLAGS(0x06);
+    dynamic PT_DYNAMIC FLAGS(0x06);
 }
 
 SECTIONS
diff --git a/common/linker_uefi_riscv64.ld.in b/common/linker_uefi_riscv64.ld.in
index f9894cfa..55f2a9c6 100644
--- a/common/linker_uefi_riscv64.ld.in
+++ b/common/linker_uefi_riscv64.ld.in
@@ -3,10 +3,10 @@ ENTRY(_start)
 
 PHDRS
 {
-    text    PT_LOAD    FLAGS((1 << 0) | (1 << 2)) ;
-    rodata  PT_LOAD    FLAGS((1 << 2)) ;
-    data    PT_LOAD    FLAGS((1 << 1) | (1 << 2)) ;
-    dynamic PT_DYNAMIC FLAGS((1 << 1) | (1 << 2)) ;
+    text    PT_LOAD    FLAGS(0x05);
+    rodata  PT_LOAD    FLAGS(0x04);
+    data    PT_LOAD    FLAGS(0x06);
+    dynamic PT_DYNAMIC FLAGS(0x06);
 }
 
 SECTIONS
diff --git a/common/linker_uefi_x86_64.ld.in b/common/linker_uefi_x86_64.ld.in
index ead64518..0176a510 100644
--- a/common/linker_uefi_x86_64.ld.in
+++ b/common/linker_uefi_x86_64.ld.in
@@ -3,10 +3,10 @@ ENTRY(_start)
 
 PHDRS
 {
-    text    PT_LOAD    FLAGS((1 << 0) | (1 << 2)) ;
-    rodata  PT_LOAD    FLAGS((1 << 2)) ;
-    data    PT_LOAD    FLAGS((1 << 1) | (1 << 2)) ;
-    dynamic PT_DYNAMIC FLAGS((1 << 1) | (1 << 2)) ;
+    text    PT_LOAD    FLAGS(0x05);
+    rodata  PT_LOAD    FLAGS(0x04);
+    data    PT_LOAD    FLAGS(0x06);
+    dynamic PT_DYNAMIC FLAGS(0x06);
 }
 
 SECTIONS
diff --git a/decompressor/linker.ld b/decompressor/linker.ld
index 5dfa18e7..c6adcfac 100644
--- a/decompressor/linker.ld
+++ b/decompressor/linker.ld
@@ -3,9 +3,9 @@ ENTRY(_start)
 
 PHDRS
 {
-    text  PT_LOAD    FLAGS((1 << 0) | (1 << 2)) ;
-    rodata PT_LOAD   FLAGS((1 << 2)) ;
-    data  PT_LOAD    FLAGS((1 << 1) | (1 << 2)) ;
+    text  PT_LOAD    FLAGS(0x05);
+    rodata PT_LOAD   FLAGS(0x04);
+    data  PT_LOAD    FLAGS(0x06);
 }
 
 SECTIONS
tab: 248 wrap: offon