From 29cff52c84430b121c8c45e68907d34cb46f545a Mon Sep 17 00:00:00 2001
From: Tianhao Wang <shrik3@riseup.net>
Date: Sat, 11 Mar 2023 19:32:09 +0100
Subject: clean up

---
 Makefile  |  2 +-
 readme.md |  1 +
 sections  | 74 ---------------------------------------------------------------
 3 files changed, 2 insertions(+), 75 deletions(-)
 delete mode 100644 sections

diff --git a/Makefile b/Makefile
index 5efd1a2..552c0e7 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ bootdisk.iso : kernel
 # Link the rust library against the objects from asm code (currently only the startup.o),
 # later we'll use wildcards
 kernel : rust_kernel startup.o
-	ld -static -e startup -T sections -o ./kernel startup.o target/x86_64-rustubs/debug/librustubs.a
+	ld -static -e startup -T ./src/arch/x86_64/linker.ld -o ./kernel startup.o target/x86_64-rustubs/debug/librustubs.a
 
 # install xbuild first. (cargo install xbuild)
 # Compile the rust part: note that the the cargo crate is of type [staticlib], if you don't 
diff --git a/readme.md b/readme.md
index 1addfa1..f066bf4 100644
--- a/readme.md
+++ b/readme.md
@@ -13,6 +13,7 @@ Universities. This one in perticular, is based on the TU Dresden version
 [X] - Build minimal iso image
 [X] - bootable using grub
 [X] - Setting up CGA display, print something (hello world)
+[ ] - Provide "printf" support
 [ ] - Keyboard controller and input handler
 [ ] - Interrupt handler
 [ ] - Timer Interrupt
diff --git a/sections b/sections
deleted file mode 100644
index 7a03770..0000000
--- a/sections
+++ /dev/null
@@ -1,74 +0,0 @@
-SECTIONS
-{
-   . = 0x100000;     /* system's start address */
-
-   .text :
-   {
-      *(".text")
-      *(".text.*")
-      *(".text$")
-      *(".init")
-      *(".fini")
-      *(".gnu.linkonce.*")
-   }
-
-   .init_array :
-   {
-      PROVIDE_HIDDEN (__init_array_start = .);
-      KEEP (*(SORT(.init_array.*)))
-      KEEP (*(.init_array))
-      KEEP (*(".ctors"))
-      KEEP (*(".ctor"))
-      PROVIDE_HIDDEN (__init_array_end = .);
-   }
-
-   .fini_array :
-   {
-      PROVIDE_HIDDEN (__fini_array_start = .);
-      KEEP (*(SORT(.fini_array.*)))
-      KEEP (*(.fini_array))
-      KEEP (*(".dtors"))
-      KEEP (*(".dtor"))
-      PROVIDE_HIDDEN (__fini_array_end = .);
-   }
-
-   .data :
-   {
-      *(".data")
-      *(".data$")
-      *(".rodata")
-      *(".rodata.*")
-      *(".got")
-      *(".got.plt")
-      *(".eh_frame")
-      *(".eh_fram")
-      *(".jcr")
-      *(".note.*")
-   }
-
-   .bss : 
-   {
-      ___BSS_START__ = .;
-      *(".bss")
-      *(".bss.*")
-      ___BSS_END__ = .;
-   }
-
-   /* global page table for 64-bit long mode */
-   .global_pagetable ALIGN(4096) (NOLOAD) :
-   {
-      *(".global_pagetable")
-   }
-
-/*
-   /DISCARD/ :
-   {
-      *(".note")
-      *(".comment")
-      *(".debug_line")
-      *(".debug_info")
-      *(".debug_abbrev")
-      *(".debug_aranges")
-   }
-*/
-}
-- 
cgit v1.2.3-70-g09d2