From b38298319411965cbb7e9ed1312b24ba36cc7c44 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Sun, 18 Jul 2021 14:27:45 +0200
Subject: move the kernel linker script to src/kernel/

---
 Makefile             |  4 ++--
 linker.ld            | 30 ------------------------------
 src/kernel/linker.ld | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 linker.ld
 create mode 100644 src/kernel/linker.ld

diff --git a/Makefile b/Makefile
index d40066f..5bb5dd4 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@ out/fs/boot/init: src/test_module
 	@mkdir -p $(@D)
 	cp $< $@
 
-out/fs/boot/kernel.bin: $(call from_sources, src/kernel/)
+out/fs/boot/kernel.bin: src/kernel/linker.ld $(call from_sources, src/kernel/)
 	@mkdir -p $(@D)
-	$(CC) $(LFLAGS) -T linker.ld $^ -o $@
+	$(CC) $(LFLAGS) -T $^ -o $@
 	grub-file --is-x86-multiboot $@
 
 out/obj/%.s.o: src/%.s
diff --git a/linker.ld b/linker.ld
deleted file mode 100644
index 650ecd7..0000000
--- a/linker.ld
+++ /dev/null
@@ -1,30 +0,0 @@
-ENTRY(_start)
-
-SECTIONS
-{
-	. = 1M;
-	.text BLOCK(4K) : ALIGN(4K)
-	{
-		*(.multiboot)
-		*(.text)
-	}
-	.rodata BLOCK(4K) : ALIGN(4K)
-	{
-		*(.rodata)
-	}
-	.data BLOCK(4K) : ALIGN(4K)
-	{
-		*(.data)
-	}
-	_data_end = .;
-	.bss BLOCK(4K) : ALIGN(4K)
-	{
-		*(COMMON)
-		*(.bss)
-
-		stack_bottom = .;
-		. += 16K;
-		stack_top    = .;
-	}
-	_bss_end = (. + 0xFFF) & ~0xFFF; /* aligned to 4K */
-}
diff --git a/src/kernel/linker.ld b/src/kernel/linker.ld
new file mode 100644
index 0000000..650ecd7
--- /dev/null
+++ b/src/kernel/linker.ld
@@ -0,0 +1,30 @@
+ENTRY(_start)
+
+SECTIONS
+{
+	. = 1M;
+	.text BLOCK(4K) : ALIGN(4K)
+	{
+		*(.multiboot)
+		*(.text)
+	}
+	.rodata BLOCK(4K) : ALIGN(4K)
+	{
+		*(.rodata)
+	}
+	.data BLOCK(4K) : ALIGN(4K)
+	{
+		*(.data)
+	}
+	_data_end = .;
+	.bss BLOCK(4K) : ALIGN(4K)
+	{
+		*(COMMON)
+		*(.bss)
+
+		stack_bottom = .;
+		. += 16K;
+		stack_top    = .;
+	}
+	_bss_end = (. + 0xFFF) & ~0xFFF; /* aligned to 4K */
+}
-- 
cgit v1.2.3