[src/trunk]: src/sys/arch/i386/conf Align the segments on i386. We're going t...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/de3a114f0890
branches:  trunk
changeset: 345237:de3a114f0890
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat May 14 08:19:42 2016 +0000

description:
Align the segments on i386. We're going to map them independently.

diffstat:

 sys/arch/i386/conf/kern.ldscript |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 0279437f8e45 -r de3a114f0890 sys/arch/i386/conf/kern.ldscript
--- a/sys/arch/i386/conf/kern.ldscript  Sat May 14 07:14:31 2016 +0000
+++ b/sys/arch/i386/conf/kern.ldscript  Sat May 14 08:19:42 2016 +0000
@@ -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 @@
        _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 @@
                *(.rodata.*)
        }
 
+       . = ALIGN(__PAGE_SIZE);
+
        __data_start = . ;
        .data :
        {
@@ -55,7 +53,7 @@
                *(.bss)
                *(.bss.*)
                *(COMMON)
-       . = ALIGN(32 / 8);
+               . = ALIGN(32 / 8);
        }
 
        . = ALIGN(__PAGE_SIZE);