Module Name: src
Committed By: uebayasi
Date: Sat Nov 1 11:58:55 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript kern.ldscript.2MB
kern.ldscript.Xen
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen
Log Message:
amd64, i386: Don't expose .data.{read_mostly,cacheline_aligned} sections
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/kern.ldscript
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/conf/kern.ldscript.2MB \
src/sys/arch/amd64/conf/kern.ldscript.Xen
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/conf/kern.ldscript.Xen
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/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.6 src/sys/arch/amd64/conf/kern.ldscript:1.7
--- src/sys/arch/amd64/conf/kern.ldscript:1.6 Wed May 7 14:00:48 2014
+++ src/sys/arch/amd64/conf/kern.ldscript Sat Nov 1 11:58:55 2014
@@ -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 @@ SECTIONS
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 = . ;
PROVIDE (edata = .) ;
__bss_start = . ;
Index: src/sys/arch/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.3 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.4
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.3 Tue Jun 1 22:13:30 2010
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB Sat Nov 1 11:58:55 2014
@@ -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 @@ SECTIONS
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 = . ;
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.3 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.4
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.3 Tue Jun 1 22:13:30 2010
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Sat Nov 1 11:58:55 2014
@@ -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 @@ SECTIONS
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 = . ;
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.9 src/sys/arch/i386/conf/kern.ldscript:1.10
--- src/sys/arch/i386/conf/kern.ldscript:1.9 Sun Sep 23 01:01:17 2012
+++ src/sys/arch/i386/conf/kern.ldscript Sat Nov 1 11:58:55 2014
@@ -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 @@ SECTIONS
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 = . ;
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.10 src/sys/arch/i386/conf/kern.ldscript.4MB:1.11
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.10 Sun Sep 23 01:01:17 2012
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Sat Nov 1 11:58:55 2014
@@ -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 @@ SECTIONS
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 = . ;
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.4 src/sys/arch/i386/conf/kern.ldscript.Xen:1.5
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.4 Sun Sep 23 01:01:17 2012
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Sat Nov 1 11:58:55 2014
@@ -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 @@ SECTIONS
.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 = . ;
