Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch amd64, i386: Don't expose .data.{read_mostly, cachel...



details:   https://anonhg.NetBSD.org/src/rev/b23e2d971587
branches:  trunk
changeset: 333396:b23e2d971587
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Nov 01 11:58:55 2014 +0000

description:
amd64, i386: Don't expose .data.{read_mostly,cacheline_aligned} sections

diffstat:

 sys/arch/amd64/conf/kern.ldscript     |  19 +++++--------------
 sys/arch/amd64/conf/kern.ldscript.2MB |  15 ++++-----------
 sys/arch/amd64/conf/kern.ldscript.Xen |  15 ++++-----------
 sys/arch/i386/conf/kern.ldscript      |  15 ++++-----------
 sys/arch/i386/conf/kern.ldscript.4MB  |  15 ++++-----------
 sys/arch/i386/conf/kern.ldscript.Xen  |  15 ++++-----------
 6 files changed, 25 insertions(+), 69 deletions(-)

diffs (191 lines):

diff -r 447f7210b515 -r b23e2d971587 sys/arch/amd64/conf/kern.ldscript
--- a/sys/arch/amd64/conf/kern.ldscript Sat Nov 01 11:02:41 2014 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript Sat Nov 01 11:58:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript,v 1.6 2014/05/07 14:00:48 jakllsch Exp $ */
+/*     $NetBSD: kern.ldscript,v 1.7 2014/11/01 11:58:55 uebayasi Exp $ */
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
              "elf64-x86-64")
@@ -32,22 +32,13 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-   }
-
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.cacheline_aligned :
-   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.cacheline_aligned)
+     . = ALIGN(64);    /* COHERENCY_UNIT */
+     *(.data.read_mostly)
+     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = 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 447f7210b515 -r b23e2d971587 sys/arch/amd64/conf/kern.ldscript.2MB
--- a/sys/arch/amd64/conf/kern.ldscript.2MB     Sat Nov 01 11:02:41 2014 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.2MB     Sat Nov 01 11:58:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.2MB,v 1.3 2010/06/01 22:13:30 mjf Exp $  */
+/*     $NetBSD: kern.ldscript.2MB,v 1.4 2014/11/01 11:58:55 uebayasi Exp $     */
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
              "elf64-x86-64")
@@ -33,18 +33,11 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.cacheline_aligned :
-   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.cacheline_aligned)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.read_mostly :
-   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.read_mostly)
+     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
diff -r 447f7210b515 -r b23e2d971587 sys/arch/amd64/conf/kern.ldscript.Xen
--- a/sys/arch/amd64/conf/kern.ldscript.Xen     Sat Nov 01 11:02:41 2014 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.Xen     Sat Nov 01 11:58:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.Xen,v 1.3 2010/06/01 22:13:30 mjf Exp $  */
+/*     $NetBSD: kern.ldscript.Xen,v 1.4 2014/11/01 11:58:55 uebayasi Exp $     */
 
 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
              "elf64-x86-64")
@@ -26,18 +26,11 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.cacheline_aligned :
-   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.cacheline_aligned)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.read_mostly :
-   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.read_mostly)
+     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
diff -r 447f7210b515 -r b23e2d971587 sys/arch/i386/conf/kern.ldscript
--- a/sys/arch/i386/conf/kern.ldscript  Sat Nov 01 11:02:41 2014 +0000
+++ b/sys/arch/i386/conf/kern.ldscript  Sat Nov 01 11:58:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript,v 1.9 2012/09/23 01:01:17 chs Exp $      */
+/*     $NetBSD: kern.ldscript,v 1.10 2014/11/01 11:58:55 uebayasi Exp $        */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -32,18 +32,11 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.cacheline_aligned :
-   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.cacheline_aligned)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.read_mostly :
-   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.read_mostly)
+     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
diff -r 447f7210b515 -r b23e2d971587 sys/arch/i386/conf/kern.ldscript.4MB
--- a/sys/arch/i386/conf/kern.ldscript.4MB      Sat Nov 01 11:02:41 2014 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.4MB      Sat Nov 01 11:58:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.4MB,v 1.10 2012/09/23 01:01:17 chs Exp $ */
+/*     $NetBSD: kern.ldscript.4MB,v 1.11 2014/11/01 11:58:55 uebayasi Exp $    */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -33,18 +33,11 @@
    AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
    {
      *(.data)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.cacheline_aligned :
-   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.cacheline_aligned)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.read_mostly :
-   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.read_mostly)
+     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;
diff -r 447f7210b515 -r b23e2d971587 sys/arch/i386/conf/kern.ldscript.Xen
--- a/sys/arch/i386/conf/kern.ldscript.Xen      Sat Nov 01 11:02:41 2014 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.Xen      Sat Nov 01 11:58:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern.ldscript.Xen,v 1.4 2012/09/23 01:01:17 chs Exp $  */
+/*     $NetBSD: kern.ldscript.Xen,v 1.5 2014/11/01 11:58:55 uebayasi Exp $     */
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386",
              "elf32-i386")
@@ -28,18 +28,11 @@
    .data :
    {
      *(.data)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.cacheline_aligned :
-   AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.cacheline_aligned)
-   }
-   . = ALIGN(64);      /* COHERENCY_UNIT */
-   .data.read_mostly :
-   AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
-   {
+     . = ALIGN(64);    /* COHERENCY_UNIT */
      *(.data.read_mostly)
+     . = ALIGN(64);    /* COHERENCY_UNIT */
    }
    . = ALIGN(64);      /* COHERENCY_UNIT */
    _edata = . ;



Home | Main Index | Thread Index | Old Index