From fe90ab4f392c1461d94d49bb5b82066fd094c8d2 Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Sat, 9 Jul 2022 20:08:53 +0200
Subject: [PATCH] Revert "linker.ld: Work around portability issue"

This reverts commit 1929fda490912abadca85055ccaa64228d604868.
---
 kernel/GNUmakefile                     | 7 ++++---
 kernel/{linker-x86_64.ld => linker.ld} | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)
 rename kernel/{linker-x86_64.ld => linker.ld} (91%)

diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile
index 1ac0c2f..0490512 100644
--- a/kernel/GNUmakefile
+++ b/kernel/GNUmakefile
@@ -42,7 +42,7 @@ override INTERNALLDFLAGS :=     \
     -nostdlib                   \
     -static                     \
     -Wl,-z,max-page-size=0x1000 \
-    -Wl,-T,linker-$(ARCH).ld
+    -Wl,-T,linker.ld
 
 # Set archtecture specific variables (and check that the architecture is supported).
 ifeq ($(ARCH),x86_64)
@@ -56,8 +56,9 @@ ifeq ($(ARCH),x86_64)
         -mno-sse2              \
         -mno-red-zone          \
         -mcmodel=kernel
-    override INTERNALLDFLAGS += \
-        -Wl,-m,elf_x86_64
+    override INTERNALLDFLAGS +=    \
+        -Wl,-m,elf_x86_64          \
+        -Wl,--oformat=elf64-x86-64
 else
     $(error Architecture $(ARCH) not supported)
 endif
diff --git a/kernel/linker-x86_64.ld b/kernel/linker.ld
similarity index 91%
rename from kernel/linker-x86_64.ld
rename to kernel/linker.ld
index 424088d..7989487 100644
--- a/kernel/linker-x86_64.ld
+++ b/kernel/linker.ld
@@ -1,7 +1,3 @@
-/* Tell the linker that we want an x86_64 ELF64 output file */
-OUTPUT_FORMAT(elf64-x86-64)
-OUTPUT_ARCH(i386:x86-64)
-
 /* We want the symbol _start to be our entry point */
 ENTRY(_start)