Module Name: src
Committed By: maxv
Date: Sat May 14 08:19:42 UTC 2016
Modified Files:
src/sys/arch/i386/conf: kern.ldscript
Log Message:
Align the segments on i386. We're going to map them independently.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/kern.ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.18 src/sys/arch/i386/conf/kern.ldscript:1.19
--- src/sys/arch/i386/conf/kern.ldscript:1.18 Fri May 13 10:18:01 2016
+++ src/sys/arch/i386/conf/kern.ldscript Sat May 14 08:19:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.18 2016/05/13 10:18:01 maxv Exp $ */
+/* $NetBSD: kern.ldscript,v 1.19 2016/05/14 08:19:42 maxv Exp $ */
#include "assym.h"
@@ -16,11 +16,7 @@ SECTIONS
_etext = . ;
PROVIDE (etext = .) ;
- /*
- * Adjust the address for the rodata segment. We want to adjust up to
- * the same address within the page on the next page up.
- */
- . = ALIGN(0x1000) + (. & (0x1000 - 1));
+ . = ALIGN(__PAGE_SIZE);
__rodata_start = . ;
.rodata :
@@ -29,6 +25,8 @@ SECTIONS
*(.rodata.*)
}
+ . = ALIGN(__PAGE_SIZE);
+
__data_start = . ;
.data :
{
@@ -55,7 +53,7 @@ SECTIONS
*(.bss)
*(.bss.*)
*(COMMON)
- . = ALIGN(32 / 8);
+ . = ALIGN(32 / 8);
}
. = ALIGN(__PAGE_SIZE);
