[src/netbsd-6]: src/sys/arch/i386/conf Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/16793d00fa0e
branches:  netbsd-6
changeset: 775484:16793d00fa0e
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Nov 22 00:40:51 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #684):
        sys/arch/i386/conf/kern.ldscript.Xen: revision 1.4
        sys/arch/i386/conf/kern.ldscript: revision 1.9
        sys/arch/i386/conf/kern.ldscript.4MB: revision 1.10
sync ldscripts; add cacheline_aligned and read_mostly handling
to the non-default ones.

diffstat:

 sys/arch/i386/conf/kern.ldscript     |   5 ++---
 sys/arch/i386/conf/kern.ldscript.4MB |  16 ++++++++++++++--
 sys/arch/i386/conf/kern.ldscript.Xen |  16 ++++++++++++++--
 3 files changed, 30 insertions(+), 7 deletions(-)

diffs (88 lines):

diff -r 6156ae328bdd -r 16793d00fa0e sys/arch/i386/conf/kern.ldscript
--- a/sys/arch/i386/conf/kern.ldscript  Thu Nov 22 00:39:00 2012 +0000
+++ b/sys/arch/i386/conf/kern.ldscript  Thu Nov 22 00:40:51 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript,v 1.8 2010/06/01 22:13:30 mjf Exp $      */
+/*     $NetBSD: kern.ldscript,v 1.8.14.1 2012/11/22 00:40:51 riz Exp $ */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -23,7 +23,7 @@
      *(.rodata)
      *(.rodata.*)
    }
- 
+
    /* Adjust the address for the data segment.  We want to adjust up to
       the same address within the page on the next page up.  */
    . = ALIGN(0x1000) + (. & (0x1000 - 1));
@@ -39,7 +39,6 @@
    {
      *(.data.cacheline_aligned)
    }
-
    . = ALIGN(64);      /* COHERENCY_UNIT */
    .data.read_mostly :
    AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
diff -r 6156ae328bdd -r 16793d00fa0e sys/arch/i386/conf/kern.ldscript.4MB
--- a/sys/arch/i386/conf/kern.ldscript.4MB      Thu Nov 22 00:39:00 2012 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.4MB      Thu Nov 22 00:40:51 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.4MB,v 1.9 2007/10/18 15:28:34 yamt Exp $ */
+/*     $NetBSD: kern.ldscript.4MB,v 1.9.60.1 2012/11/22 00:40:51 riz Exp $     */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -33,8 +33,20 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-     *(.data.*)
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
+     *(.data.cacheline_aligned)
    }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
+     *(.data.read_mostly)
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
    PROVIDE (edata = .) ;
    __bss_start = . ;
diff -r 6156ae328bdd -r 16793d00fa0e sys/arch/i386/conf/kern.ldscript.Xen
--- a/sys/arch/i386/conf/kern.ldscript.Xen      Thu Nov 22 00:39:00 2012 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.Xen      Thu Nov 22 00:40:51 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.Xen,v 1.3 2007/10/18 15:28:34 yamt Exp $ */
+/*     $NetBSD: kern.ldscript.Xen,v 1.3.60.1 2012/11/22 00:40:51 riz Exp $     */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -28,8 +28,20 @@
    .data :
    {
      *(.data)
-     *(.data.*)
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.cacheline_aligned :
+   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+   {
+     *(.data.cacheline_aligned)
    }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
+   .data.read_mostly :
+   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+   {
+     *(.data.read_mostly)
+   }
+   . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
    PROVIDE (edata = .) ;
    __bss_start = . ;