From 760ba43cf6946c6268893914c56967c7aa3eb994 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Sun, 3 Nov 2013 09:42:56 +0000
Subject: Even saner kernel layout, so that .rodata can be batc mapped by a
 read-only dbatc. Add batc mapping support for 88110 systems as well.

---
 sys/arch/luna88k/conf/ld.script | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'sys/arch/luna88k/conf')

diff --git a/sys/arch/luna88k/conf/ld.script b/sys/arch/luna88k/conf/ld.script
index 945ea663f55..468e22adba8 100644
--- a/sys/arch/luna88k/conf/ld.script
+++ b/sys/arch/luna88k/conf/ld.script
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ld.script,v 1.3 2013/11/02 23:42:12 miod Exp $	*/
+/*	$OpenBSD: ld.script,v 1.4 2013/11/03 09:42:55 miod Exp $	*/
 
 /*
  * Copyright (c) 2012 Miodrag Vallat.
@@ -16,11 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * This linker script is used to merge .rodata into .text and pad .text to
- * a page size. This allows objcopy to correctly be able to convert it to
- * an OMAGIC binary, suitable to be booted from the PROM.
- */
 OUTPUT_FORMAT("elf32-m88k")
 OUTPUT_ARCH(m88k)
 ENTRY(__start)
@@ -29,11 +24,15 @@ SECTIONS
 	.text :
 	{
 		*(.text)
-		*(.rodata*)
 		PROVIDE(etext = ABSOLUTE(.));
-		FILL(0)
-		. = ALIGN(0x80000);
 	}
+	. = ALIGN(0x80000);
+	.rodata :
+	{
+		*(.rodata*)
+		PROVIDE(erodata = ABSOLUTE(.));
+	}
+	. = ALIGN(0x80000);
 	.data :
 	{
 		*(.data)
-- 
cgit v1.2.3