:: commit 3a51368db6e1dddde388dc1aec9bad596a7a7738

mintsuki <mintsuki@protonmail.com> — 2024-05-31 19:38

parents: 1e85ce85fd

misc/build: Update limine-efi commit and fixes for linker portability

diff --git a/bootstrap b/bootstrap
index 64b9faed..673fbfbe 100755
--- a/bootstrap
+++ b/bootstrap
@@ -13,7 +13,7 @@ cd "$srcdir"
 FREESTANDING_TOOLCHAIN_COMMIT_HASH=18a5e52483344e117d45738c9afb2b34792cbced
 FREESTANDING_HEADERS_COMMIT_HASH=dd3abd2d7147efc4170dff478d3b7730bed14147
 CC_RUNTIME_COMMIT_HASH=38942e9a0d11af77c5d9fb45794850f7a1565d2b
-LIMINE_EFI_COMMIT_HASH=0559deafcbfe62f291ca1e1f359c282e86bd99d6
+LIMINE_EFI_COMMIT_HASH=c6ae0cb1dfaad810a1406b096fa107f83b4d84be
 TINF_COMMIT_HASH=57ffa1f1d5e3dde19011b2127bd26d01689b694b
 FLANTERM_COMMIT_HASH=347d9cf1e3fced64aa20ab278e2fdcc834086035
 STB_COMMIT_HASH=f4a71b13373436a2866c5d68f8f80ac6f0bc1ffe
diff --git a/common/GNUmakefile b/common/GNUmakefile
index 5c038b7d..54e30e7a 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -166,27 +166,21 @@ endif
 ifeq ($(TARGET),uefi-x86-64)
     override LDFLAGS_FOR_TARGET += \
         -m elf_x86_64 \
-        -static \
         -pie \
-        --no-dynamic-linker \
         -z text
 endif
 
 ifeq ($(TARGET),uefi-ia32)
     override LDFLAGS_FOR_TARGET += \
         -m elf_i386 \
-        -static \
         -pie \
-        --no-dynamic-linker \
         -z text
 endif
 
 ifeq ($(TARGET),uefi-aarch64)
     override LDFLAGS_FOR_TARGET += \
         -m aarch64elf \
-        -static \
         -pie \
-        --no-dynamic-linker \
         -z text
 endif
 
@@ -194,9 +188,7 @@ ifeq ($(TARGET),uefi-riscv64)
     override LDFLAGS_FOR_TARGET += \
         -m elf64lriscv \
         --no-relax \
-        -static \
         -pie \
-        --no-dynamic-linker \
         -z text
 endif
 
diff --git a/common/linker_uefi_aarch64.ld.in b/common/linker_uefi_aarch64.ld.in
index 0bc0ce84..3a1497f5 100644
--- a/common/linker_uefi_aarch64.ld.in
+++ b/common/linker_uefi_aarch64.ld.in
@@ -75,5 +75,6 @@ SECTIONS
     /DISCARD/ : {
         *(.eh_frame)
         *(.note .note.*)
+        *(.interp)
     }
 }
diff --git a/common/linker_uefi_ia32.ld.in b/common/linker_uefi_ia32.ld.in
index 58daeaa9..02d59bc9 100644
--- a/common/linker_uefi_ia32.ld.in
+++ b/common/linker_uefi_ia32.ld.in
@@ -75,5 +75,6 @@ SECTIONS
     /DISCARD/ : {
         *(.eh_frame)
         *(.note .note.*)
+        *(.interp)
     }
 }
diff --git a/common/linker_uefi_riscv64.ld.in b/common/linker_uefi_riscv64.ld.in
index c3726eae..4a1160be 100644
--- a/common/linker_uefi_riscv64.ld.in
+++ b/common/linker_uefi_riscv64.ld.in
@@ -77,5 +77,6 @@ SECTIONS
     /DISCARD/ : {
         *(.eh_frame)
         *(.note .note.*)
+        *(.interp)
     }
 }
diff --git a/common/linker_uefi_x86_64.ld.in b/common/linker_uefi_x86_64.ld.in
index 7df7fe3c..912595d5 100644
--- a/common/linker_uefi_x86_64.ld.in
+++ b/common/linker_uefi_x86_64.ld.in
@@ -75,5 +75,6 @@ SECTIONS
     /DISCARD/ : {
         *(.eh_frame)
         *(.note .note.*)
+        *(.interp)
     }
 }
diff --git a/test/GNUmakefile b/test/GNUmakefile
index 788b5b78..6fcfe782 100644
--- a/test/GNUmakefile
+++ b/test/GNUmakefile
@@ -29,9 +29,7 @@ override LDFLAGS += \
     -Tlinker.ld \
     -nostdlib \
     -zmax-page-size=0x1000 \
-    -static \
     -pie \
-    --no-dynamic-linker \
     -ztext
 
 override LDFLAGS_MB2 := \
tab: 248 wrap: offon