From 1175179058fa809c57d724cd2043c67edc511695 Mon Sep 17 00:00:00 2001
From: Kimplul <kimi.h.kuparinen@gmail.com>
Date: Thu, 19 Aug 2021 22:58:57 +0300
Subject: New build system (WIP)

---
 arch/riscv/riscv-link.S | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'arch/riscv/riscv-link.S')

diff --git a/arch/riscv/riscv-link.S b/arch/riscv/riscv-link.S
index ffdf590..0950850 100644
--- a/arch/riscv/riscv-link.S
+++ b/arch/riscv/riscv-link.S
@@ -1,20 +1,22 @@
+#include <apos/link.lds.h>
 #include <vmap.h>
 
 OUTPUT_ARCH(riscv)
 ENTRY(_start)
 
 SECTIONS {
-	. = 0; /* no offset */
-	.init : {
+	. = ABSOLUTE(PM_KERN);
+	.init ALIGN(4K) : AT(0) {
 		*(.init.start);
 		*(.init.text);
 		*(.init.data);
 		. = ALIGN(4K);
 	}
 
-	.text ALIGN(VM_KERN) : AT(ADDR(.init) + SIZEOF(.init)) {
-		*(.init.start);
+	. = ABSOLUTE(VM_KERN);
+	.text ALIGN(4K) : AT(SIZEOF(.init)) {
 		*(.text.start);
-		*(.text);
+		*(.text.text);
+		*(.text.data);
 	}
 }
-- 
cgit v1.3