Module Name: src
Committed By: uebayasi
Date: Thu Aug 20 07:00:49 UTC 2015
Modified Files:
src/sys/arch/aarch64/conf: kern.ldscript
src/sys/arch/amd64/conf: kern.ldscript.2MB kern.ldscript.Xen
src/sys/arch/cats/conf: kern.ldscript ldscript.elf
src/sys/arch/epoc32/conf: ldscript.epoc32
src/sys/arch/evbarm/conf: ldscript.evbarm
src/sys/arch/i386/conf: kern.ldscript kern.ldscript.4MB
kern.ldscript.Xen stand.ldscript
src/sys/arch/ia64/conf: kern.ldscript
src/sys/arch/mips/conf: kern.ldscript stand.ldscript
src/sys/arch/mipsco/conf: stand.ldscript
src/sys/arch/netwinder/conf: kern.ldscript
src/sys/arch/powerpc/conf: kern-mb.ldscript kern.ldscript
kern64.ldscript
src/sys/arch/riscv/conf: kern.ldscript
src/sys/arch/shark/conf: kern.ldscript
src/sys/arch/sparc/conf: kern.ldscript
src/sys/arch/sparc64/conf: kern.ldscript kern32.ldscript
src/sys/arch/zaurus/conf: ldscript.zaurus
Log Message:
Indent with 2 spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/conf/kern.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/kern.ldscript.2MB
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/conf/kern.ldscript.Xen
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/cats/conf/kern.ldscript
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/cats/conf/ldscript.elf
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/conf/ldscript.epoc32
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/ldscript.evbarm
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/conf/kern.ldscript
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/conf/kern.ldscript.4MB
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/conf/kern.ldscript.Xen
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/conf/stand.ldscript
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/conf/kern.ldscript
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/conf/kern.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/conf/stand.ldscript
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mipsco/conf/stand.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/netwinder/conf/kern.ldscript
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/conf/kern-mb.ldscript \
src/sys/arch/powerpc/conf/kern64.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/conf/kern.ldscript
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/kern.ldscript
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/shark/conf/kern.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/conf/kern.ldscript
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/conf/kern.ldscript
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/conf/kern32.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/conf/ldscript.zaurus
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/aarch64/conf/kern.ldscript
diff -u src/sys/arch/aarch64/conf/kern.ldscript:1.1 src/sys/arch/aarch64/conf/kern.ldscript:1.2
--- src/sys/arch/aarch64/conf/kern.ldscript:1.1 Sun Aug 10 05:47:37 2014
+++ src/sys/arch/aarch64/conf/kern.ldscript Thu Aug 20 07:00:48 2015
@@ -55,15 +55,15 @@ SECTIONS
__bss_start__ = .;
.bss :
{
- *(.dynbss)
- *(.bss .bss.* .gnu.linkonce.b.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections.
- FIXME: Why do we need it? When there is no .bss section, we don't
- pad the .data section. */
- . = ALIGN(. != 0 ? 32 / 8 : 1);
+ *(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections.
+ FIXME: Why do we need it? When there is no .bss section, we don't
+ pad the .data section. */
+ . = ALIGN(. != 0 ? 32 / 8 : 1);
}
_bss_end__ = . ; __bss_end__ = . ;
. = ALIGN(32 / 8);
Index: src/sys/arch/amd64/conf/kern.ldscript.2MB
diff -u src/sys/arch/amd64/conf/kern.ldscript.2MB:1.6 src/sys/arch/amd64/conf/kern.ldscript.2MB:1.7
--- src/sys/arch/amd64/conf/kern.ldscript.2MB:1.6 Thu Aug 20 06:48:25 2015
+++ src/sys/arch/amd64/conf/kern.ldscript.2MB Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.2MB,v 1.6 2015/08/20 06:48:25 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.2MB,v 1.7 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
"elf64-x86-64")
@@ -6,59 +6,59 @@ OUTPUT_ARCH(i386:x86-64)
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- AT (ADDR(.text))
- {
- *(.text)
- *(.text.*)
- *(.stub)
- } =0
- _etext = . ;
- PROVIDE (etext = .) ;
+ /* Read-only sections, merged into text segment: */
+ .text :
+ AT (ADDR(.text))
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ } =0
+ _etext = . ;
+ PROVIDE (etext = .) ;
- .rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
- {
- *(.rodata)
- *(.rodata.*)
- }
+ .rodata :
+ AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
+ {
+ *(.rodata)
+ *(.rodata.*)
+ }
- /* Adjust the address for the data segment. We push the data segment
- up to the next 2MB boundary so that we can map the text with large
- pages. */
- . = ALIGN(0x200000);
- __data_start = . ;
- .data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
- {
- *(.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 = . ;
- .bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
- {
- *(.bss)
- *(.bss.*)
- *(COMMON)
- . = ALIGN(64 / 8);
- }
- . = ALIGN(64 / 8);
+ /* Adjust the address for the data segment. We push the data segment
+ up to the next 2MB boundary so that we can map the text with large
+ pages. */
+ . = ALIGN(0x200000);
+ __data_start = . ;
+ .data :
+ AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+ {
+ *(.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 = . ;
+ .bss :
+ AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(64 / 8);
+ }
+ . = ALIGN(64 / 8);
_end = . ;
PROVIDE (end = .) ;
.note.netbsd.ident :
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.5 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.6
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.5 Sun Nov 2 17:58:14 2014
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.5 2014/11/02 17:58:14 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.6 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
"elf64-x86-64")
@@ -6,52 +6,52 @@ OUTPUT_ARCH(i386:x86-64)
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- AT (ADDR(.text))
- {
- *(.text)
- *(.text.*)
- *(.stub)
- *(.rodata)
- } =0
- _etext = . ;
- PROVIDE (etext = .) ;
+ /* Read-only sections, merged into text segment: */
+ .text :
+ AT (ADDR(.text))
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ *(.rodata)
+ } =0
+ _etext = . ;
+ PROVIDE (etext = .) ;
- /* 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(0x100000) + (. & (0x100000 - 1));
- __data_start = . ;
- .data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
- {
- *(.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 = . ;
- .bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
- {
- *(.bss)
- *(.bss.*)
- *(COMMON)
- . = ALIGN(64 / 8);
- }
- . = ALIGN(64 / 8);
+ /* 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(0x100000) + (. & (0x100000 - 1));
+ __data_start = . ;
+ .data :
+ AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+ {
+ *(.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 = . ;
+ .bss :
+ AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(64 / 8);
+ }
+ . = ALIGN(64 / 8);
_end = . ;
PROVIDE (end = .) ;
.note.netbsd.ident :
Index: src/sys/arch/cats/conf/kern.ldscript
diff -u src/sys/arch/cats/conf/kern.ldscript:1.2 src/sys/arch/cats/conf/kern.ldscript:1.3
--- src/sys/arch/cats/conf/kern.ldscript:1.2 Thu Jan 30 15:36:43 2014
+++ src/sys/arch/cats/conf/kern.ldscript Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.2 2014/01/30 15:36:43 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.3 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -38,14 +38,14 @@ SECTIONS
__bss_start__ = .;
.bss :
{
- *(.dynbss)
- *(.bss)
- *(.bss.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ *(.dynbss)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections. */
+ . = ALIGN(32 / 8);
}
. = ALIGN(32 / 8);
_end = .;
Index: src/sys/arch/cats/conf/ldscript.elf
diff -u src/sys/arch/cats/conf/ldscript.elf:1.3 src/sys/arch/cats/conf/ldscript.elf:1.4
--- src/sys/arch/cats/conf/ldscript.elf:1.3 Thu Aug 20 06:48:25 2015
+++ src/sys/arch/cats/conf/ldscript.elf Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.elf,v 1.3 2015/08/20 06:48:25 uebayasi Exp $ */
+/* $NetBSD: ldscript.elf,v 1.4 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
@@ -59,14 +59,14 @@ SECTIONS
}
.bss :
{
- *(.dynbss)
- *(.bss)
- *(.bss.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ *(.dynbss)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections. */
+ . = ALIGN(32 / 8);
}
. = ALIGN(32 / 8);
_end = .;
Index: src/sys/arch/epoc32/conf/ldscript.epoc32
diff -u src/sys/arch/epoc32/conf/ldscript.epoc32:1.3 src/sys/arch/epoc32/conf/ldscript.epoc32:1.4
--- src/sys/arch/epoc32/conf/ldscript.epoc32:1.3 Thu Aug 20 06:48:25 2015
+++ src/sys/arch/epoc32/conf/ldscript.epoc32 Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.epoc32,v 1.3 2015/08/20 06:48:25 uebayasi Exp $ */
+/* $NetBSD: ldscript.epoc32,v 1.4 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
@@ -63,14 +63,14 @@ SECTIONS
}
.bss :
{
- *(.dynbss)
- *(.bss)
- *(.bss.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ *(.dynbss)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections. */
+ . = ALIGN(32 / 8);
}
. = ALIGN(32 / 8);
_end = .;
Index: src/sys/arch/evbarm/conf/ldscript.evbarm
diff -u src/sys/arch/evbarm/conf/ldscript.evbarm:1.8 src/sys/arch/evbarm/conf/ldscript.evbarm:1.9
--- src/sys/arch/evbarm/conf/ldscript.evbarm:1.8 Thu Jan 30 15:36:44 2014
+++ src/sys/arch/evbarm/conf/ldscript.evbarm Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.evbarm,v 1.8 2014/01/30 15:36:44 matt Exp $ */
+/* $NetBSD: ldscript.evbarm,v 1.9 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
@@ -66,14 +66,14 @@ SECTIONS
.bss :
AT (LOADADDR(.sbss) + (ADDR(.bss) - ADDR(.sbss)))
{
- *(.dynbss)
- *(.bss)
- *(.bss.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ *(.dynbss)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections. */
+ . = ALIGN(32 / 8);
}
. = ALIGN(32 / 8);
_end = .;
Index: src/sys/arch/i386/conf/kern.ldscript
diff -u src/sys/arch/i386/conf/kern.ldscript:1.11 src/sys/arch/i386/conf/kern.ldscript:1.12
--- src/sys/arch/i386/conf/kern.ldscript:1.11 Sun Nov 2 17:58:14 2014
+++ src/sys/arch/i386/conf/kern.ldscript Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.11 2014/11/02 17:58:14 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.12 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -6,58 +6,58 @@ OUTPUT_ARCH(i386)
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- AT (ADDR(.text) & 0x0fffffff)
- {
- *(.text)
- *(.text.*)
- *(.stub)
- } =0
- _etext = . ;
- PROVIDE (etext = .) ;
+ /* Read-only sections, merged into text segment: */
+ .text :
+ AT (ADDR(.text) & 0x0fffffff)
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ } =0
+ _etext = . ;
+ PROVIDE (etext = .) ;
- .rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
- {
- *(.rodata)
- *(.rodata.*)
- }
+ .rodata :
+ AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
+ {
+ *(.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));
- __data_start = . ;
- .data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
- {
- *(.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 = . ;
- .bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
- {
- *(.bss)
- *(.bss.*)
- *(COMMON)
- . = ALIGN(32 / 8);
- }
- . = ALIGN(32 / 8);
+ /* 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));
+ __data_start = . ;
+ .data :
+ AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+ {
+ *(.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 = . ;
+ .bss :
+ AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(32 / 8);
+ }
+ . = ALIGN(32 / 8);
_end = . ;
PROVIDE (end = .) ;
.note.netbsd.ident :
Index: src/sys/arch/i386/conf/kern.ldscript.4MB
diff -u src/sys/arch/i386/conf/kern.ldscript.4MB:1.12 src/sys/arch/i386/conf/kern.ldscript.4MB:1.13
--- src/sys/arch/i386/conf/kern.ldscript.4MB:1.12 Sun Nov 2 17:58:14 2014
+++ src/sys/arch/i386/conf/kern.ldscript.4MB Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.4MB,v 1.12 2014/11/02 17:58:14 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.4MB,v 1.13 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -6,59 +6,59 @@ OUTPUT_ARCH(i386)
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- AT (ADDR(.text) & 0x0fffffff)
- {
- *(.text)
- *(.text.*)
- *(.stub)
- } =0
- _etext = . ;
- PROVIDE (etext = .) ;
+ /* Read-only sections, merged into text segment: */
+ .text :
+ AT (ADDR(.text) & 0x0fffffff)
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ } =0
+ _etext = . ;
+ PROVIDE (etext = .) ;
- .rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
- {
- *(.rodata)
- *(.rodata.*)
- }
+ .rodata :
+ AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
+ {
+ *(.rodata)
+ *(.rodata.*)
+ }
- /* Adjust the address for the data segment. We push the data segment
- up to the next 4MB boundary so that we can map the text with large
- pages. */
- . = ALIGN(0x400000);
- __data_start = . ;
- .data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
- {
- *(.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 = . ;
- .bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
- {
- *(.bss)
- *(.bss.*)
- *(COMMON)
- . = ALIGN(32 / 8);
- }
- . = ALIGN(32 / 8);
+ /* Adjust the address for the data segment. We push the data segment
+ up to the next 4MB boundary so that we can map the text with large
+ pages. */
+ . = ALIGN(0x400000);
+ __data_start = . ;
+ .data :
+ AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+ {
+ *(.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 = . ;
+ .bss :
+ AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(32 / 8);
+ }
+ . = ALIGN(32 / 8);
_end = . ;
PROVIDE (end = .) ;
.note.netbsd.ident :
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.6 src/sys/arch/i386/conf/kern.ldscript.Xen:1.7
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.6 Sun Nov 2 17:58:14 2014
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Thu Aug 20 07:00:48 2015
@@ -1,58 +1,58 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.6 2014/11/02 17:58:14 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.7 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
OUTPUT_ARCH(i386)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- {
- *(.text)
- *(.text.*)
- *(.stub)
- } =0
- _etext = . ;
- PROVIDE (etext = .) ;
+ /* Read-only sections, merged into text segment: */
+ .text :
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ } =0
+ _etext = . ;
+ PROVIDE (etext = .) ;
- .rodata :
- {
- *(.rodata)
- *(.rodata.*)
- }
+ .rodata :
+ {
+ *(.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));
- __data_start = . ;
- .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 = . ;
- .bss :
- {
- *(.bss)
- *(.bss.*)
- *(COMMON)
- . = ALIGN(32 / 8);
- }
- . = ALIGN(32 / 8);
+ /* 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));
+ __data_start = . ;
+ .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 = . ;
+ .bss :
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(32 / 8);
+ }
+ . = ALIGN(32 / 8);
_end = . ;
PROVIDE (end = .) ;
.note.netbsd.ident :
Index: src/sys/arch/i386/conf/stand.ldscript
diff -u src/sys/arch/i386/conf/stand.ldscript:1.1 src/sys/arch/i386/conf/stand.ldscript:1.2
--- src/sys/arch/i386/conf/stand.ldscript:1.1 Fri Nov 1 00:19:04 2013
+++ src/sys/arch/i386/conf/stand.ldscript Thu Aug 20 07:00:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.1 2013/11/01 00:19:04 christos Exp $ */
+/* $NetBSD: stand.ldscript,v 1.2 2015/08/20 07:00:48 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386",
"elf32-i386")
@@ -6,52 +6,52 @@ OUTPUT_ARCH(i386)
ENTRY(_start)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- .text :
- AT (ADDR(.text) & 0x0fffffff)
- {
- *(.text)
- *(.text.*)
- *(.stub)
- } =0
- _etext = . ;
- PROVIDE (etext = .) ;
+ /* Read-only sections, merged into text segment: */
+ .text :
+ AT (ADDR(.text) & 0x0fffffff)
+ {
+ *(.text)
+ *(.text.*)
+ *(.stub)
+ } =0
+ _etext = . ;
+ PROVIDE (etext = .) ;
- .rodata :
- AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
- {
- *(.rodata)
- *(.rodata.*)
- }
+ .rodata :
+ AT (LOADADDR(.text) + (ADDR(.rodata) - ADDR(.text)))
+ {
+ *(.rodata)
+ *(.rodata.*)
+ }
- __data_start = . ;
- .data :
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
- {
- *(.data)
- }
- .data.cacheline_aligned :
- AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
- {
- *(.data.cacheline_aligned)
- }
- .data.read_mostly :
- AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
- {
- *(.data.read_mostly)
- }
- _edata = . ;
- PROVIDE (edata = .) ;
- __bss_start = . ;
- .bss :
- AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
- {
- *(.bss)
- *(.bss.*)
- *(COMMON)
- . = ALIGN(32 / 8);
- }
- . = ALIGN(32 / 8);
+ __data_start = . ;
+ .data :
+ AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
+ {
+ *(.data)
+ }
+ .data.cacheline_aligned :
+ AT (LOADADDR(.text) + (ADDR(.data.cacheline_aligned) - ADDR(.text)))
+ {
+ *(.data.cacheline_aligned)
+ }
+ .data.read_mostly :
+ AT (LOADADDR(.text) + (ADDR(.data.read_mostly) - ADDR(.text)))
+ {
+ *(.data.read_mostly)
+ }
+ _edata = . ;
+ PROVIDE (edata = .) ;
+ __bss_start = . ;
+ .bss :
+ AT (LOADADDR(.text) + (ADDR(.bss) - ADDR(.text)))
+ {
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ . = ALIGN(32 / 8);
+ }
+ . = ALIGN(32 / 8);
_end = . ;
PROVIDE (end = .) ;
/DISCARD/ : {
Index: src/sys/arch/ia64/conf/kern.ldscript
diff -u src/sys/arch/ia64/conf/kern.ldscript:1.1 src/sys/arch/ia64/conf/kern.ldscript:1.2
--- src/sys/arch/ia64/conf/kern.ldscript:1.1 Fri Apr 7 14:21:18 2006
+++ src/sys/arch/ia64/conf/kern.ldscript Thu Aug 20 07:00:49 2015
@@ -101,13 +101,13 @@ SECTIONS
}
.bss :
{
- *(.dynbss)
- *(.bss .bss.* .gnu.linkonce.b.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(64 / 8);
+ *(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections. */
+ . = ALIGN(64 / 8);
}
. = ALIGN(64 / 8);
_end = .;
Index: src/sys/arch/mips/conf/kern.ldscript
diff -u src/sys/arch/mips/conf/kern.ldscript:1.7 src/sys/arch/mips/conf/kern.ldscript:1.8
--- src/sys/arch/mips/conf/kern.ldscript:1.7 Sat Mar 5 15:19:44 2011
+++ src/sys/arch/mips/conf/kern.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.7 2011/03/05 15:19:44 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.8 2015/08/20 07:00:49 uebayasi Exp $ */
/* ldscript for NetBSD/mips kernels and LKMs */
OUTPUT_ARCH(mips)
@@ -30,11 +30,11 @@ SECTIONS
_fdata = . ;
*(.data)
CONSTRUCTORS
- . = ALIGN(32); /* COHERENCY_UNIT */
- *(.data.cacheline_aligned)
- . = ALIGN(32); /* COHERENCY_UNIT */
- *(.data.read_mostly)
- . = ALIGN(32); /* COHERENCY_UNIT */
+ . = ALIGN(32); /* COHERENCY_UNIT */
+ *(.data.cacheline_aligned)
+ . = ALIGN(32); /* COHERENCY_UNIT */
+ *(.data.read_mostly)
+ . = ALIGN(32); /* COHERENCY_UNIT */
}
_gp = ALIGN(16) + 0x7ff0;
.lit8 : { *(.lit8) }
@@ -47,8 +47,8 @@ SECTIONS
.sbss : { *(.sbss) *(.scommon) }
.bss :
{
- *(.bss)
- *(COMMON)
+ *(.bss)
+ *(COMMON)
}
_end = . ;
PROVIDE (end = .);
Index: src/sys/arch/mips/conf/stand.ldscript
diff -u src/sys/arch/mips/conf/stand.ldscript:1.5 src/sys/arch/mips/conf/stand.ldscript:1.6
--- src/sys/arch/mips/conf/stand.ldscript:1.5 Fri Oct 4 15:02:43 2013
+++ src/sys/arch/mips/conf/stand.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.5 2013/10/04 15:02:43 christos Exp $ */
+/* $NetBSD: stand.ldscript,v 1.6 2015/08/20 07:00:49 uebayasi Exp $ */
/* ldscript for NetBSD/mips stand-alone programs */
OUTPUT_ARCH(mips)
@@ -33,8 +33,8 @@ SECTIONS
.sbss : { *(.sbss) *(.scommon) }
.bss :
{
- *(.bss)
- *(COMMON)
+ *(.bss)
+ *(COMMON)
}
_end = . ;
PROVIDE (end = .);
Index: src/sys/arch/mipsco/conf/stand.ldscript
diff -u src/sys/arch/mipsco/conf/stand.ldscript:1.4 src/sys/arch/mipsco/conf/stand.ldscript:1.5
--- src/sys/arch/mipsco/conf/stand.ldscript:1.4 Sun Dec 11 12:18:13 2005
+++ src/sys/arch/mipsco/conf/stand.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.4 2005/12/11 12:18:13 christos Exp $ */
+/* $NetBSD: stand.ldscript,v 1.5 2015/08/20 07:00:49 uebayasi Exp $ */
/* ldscript for NetBSD/mipsco standalone bootstraps */
OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
@@ -33,10 +33,10 @@ SECTIONS
_fbss = .;
.bss :
{
- *(.bss)
- *(COMMON)
- *(.sbss)
- *(.scommon)
+ *(.bss)
+ *(COMMON)
+ *(.sbss)
+ *(.scommon)
}
_end = . ;
PROVIDE (end = .);
Index: src/sys/arch/netwinder/conf/kern.ldscript
diff -u src/sys/arch/netwinder/conf/kern.ldscript:1.5 src/sys/arch/netwinder/conf/kern.ldscript:1.6
--- src/sys/arch/netwinder/conf/kern.ldscript:1.5 Thu Aug 20 06:48:25 2015
+++ src/sys/arch/netwinder/conf/kern.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.5 2015/08/20 06:48:25 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.6 2015/08/20 07:00:49 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -65,14 +65,14 @@ SECTIONS
}
.bss :
{
- *(.dynbss)
- *(.bss)
- *(.bss.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ *(.dynbss)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections. */
+ . = ALIGN(32 / 8);
}
. = ALIGN(32 / 8);
_end = .;
Index: src/sys/arch/powerpc/conf/kern-mb.ldscript
diff -u src/sys/arch/powerpc/conf/kern-mb.ldscript:1.1 src/sys/arch/powerpc/conf/kern-mb.ldscript:1.2
--- src/sys/arch/powerpc/conf/kern-mb.ldscript:1.1 Thu Mar 29 15:42:15 2012
+++ src/sys/arch/powerpc/conf/kern-mb.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern-mb.ldscript,v 1.1 2012/03/29 15:42:15 matt Exp $ */
+/* $NetBSD: kern-mb.ldscript,v 1.2 2015/08/20 07:00:49 uebayasi Exp $ */
/* ldscript for NetBSD/powerpc kernels and LKMs */
OUTPUT_ARCH(powerpc)
@@ -51,8 +51,8 @@ SECTIONS
.sbss : { *(.sbss) *(.scommon) }
.bss :
{
- *(.bss)
- *(COMMON)
+ *(.bss)
+ *(COMMON)
}
_end = . ;
PROVIDE (end = .);
Index: src/sys/arch/powerpc/conf/kern64.ldscript
diff -u src/sys/arch/powerpc/conf/kern64.ldscript:1.1 src/sys/arch/powerpc/conf/kern64.ldscript:1.2
--- src/sys/arch/powerpc/conf/kern64.ldscript:1.1 Sat Apr 19 12:46:04 2014
+++ src/sys/arch/powerpc/conf/kern64.ldscript Thu Aug 20 07:00:49 2015
@@ -76,15 +76,15 @@ SECTIONS
.iplt : { *(.iplt) }
.bss :
{
- *(.dynbss)
- *(.bss .bss.* .gnu.linkonce.b.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections.
- FIXME: Why do we need it? When there is no .bss section, we don't
- pad the .data section. */
- . = ALIGN(. != 0 ? 64 / 8 : 1);
+ *(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections.
+ FIXME: Why do we need it? When there is no .bss section, we don't
+ pad the .data section. */
+ . = ALIGN(. != 0 ? 64 / 8 : 1);
}
. = ALIGN(64 / 8);
. = ALIGN(64 / 8);
Index: src/sys/arch/powerpc/conf/kern.ldscript
diff -u src/sys/arch/powerpc/conf/kern.ldscript:1.6 src/sys/arch/powerpc/conf/kern.ldscript:1.7
--- src/sys/arch/powerpc/conf/kern.ldscript:1.6 Sun Jan 19 02:32:21 2014
+++ src/sys/arch/powerpc/conf/kern.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.6 2014/01/19 02:32:21 mrg Exp $ */
+/* $NetBSD: kern.ldscript,v 1.7 2015/08/20 07:00:49 uebayasi Exp $ */
/* ldscript for NetBSD/powerpc kernels and LKMs, based on elf32ppc.x */
OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc",
@@ -82,15 +82,15 @@ SECTIONS
}
.bss :
{
- *(.dynbss)
- *(.bss .bss.* .gnu.linkonce.b.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections.
- FIXME: Why do we need it? When there is no .bss section, we don't
- pad the .data section. */
- . = ALIGN(. != 0 ? 32 / 8 : 1);
+ *(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections.
+ FIXME: Why do we need it? When there is no .bss section, we don't
+ pad the .data section. */
+ . = ALIGN(. != 0 ? 32 / 8 : 1);
}
. = ALIGN(32 / 8);
. = ALIGN(32 / 8);
Index: src/sys/arch/riscv/conf/kern.ldscript
diff -u src/sys/arch/riscv/conf/kern.ldscript:1.1 src/sys/arch/riscv/conf/kern.ldscript:1.2
--- src/sys/arch/riscv/conf/kern.ldscript:1.1 Sat Mar 28 16:13:56 2015
+++ src/sys/arch/riscv/conf/kern.ldscript Thu Aug 20 07:00:49 2015
@@ -88,15 +88,15 @@ SECTIONS
}
.bss :
{
- *(.dynbss)
- *(.bss .bss.* .gnu.linkonce.b.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections.
- FIXME: Why do we need it? When there is no .bss section, we don't
- pad the .data section. */
- . = ALIGN(. != 0 ? 64 / 8 : 1);
+ *(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections.
+ FIXME: Why do we need it? When there is no .bss section, we don't
+ pad the .data section. */
+ . = ALIGN(. != 0 ? 64 / 8 : 1);
}
. = ALIGN(64 / 8);
_end = .; PROVIDE (end = .);
Index: src/sys/arch/shark/conf/kern.ldscript
diff -u src/sys/arch/shark/conf/kern.ldscript:1.2 src/sys/arch/shark/conf/kern.ldscript:1.3
--- src/sys/arch/shark/conf/kern.ldscript:1.2 Thu Jan 30 15:36:44 2014
+++ src/sys/arch/shark/conf/kern.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.2 2014/01/30 15:36:44 matt Exp $ */
+/* $NetBSD: kern.ldscript,v 1.3 2015/08/20 07:00:49 uebayasi Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -38,14 +38,14 @@ SECTIONS
__bss_start__ = .;
.bss :
{
- *(.dynbss)
- *(.bss)
- *(.bss.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ *(.dynbss)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections. */
+ . = ALIGN(32 / 8);
}
. = ALIGN(32 / 8);
_end = .;
Index: src/sys/arch/sparc/conf/kern.ldscript
diff -u src/sys/arch/sparc/conf/kern.ldscript:1.5 src/sys/arch/sparc/conf/kern.ldscript:1.6
--- src/sys/arch/sparc/conf/kern.ldscript:1.5 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/sparc/conf/kern.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.5 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: kern.ldscript,v 1.6 2015/08/20 07:00:49 uebayasi Exp $ */
/*
* Kernel linker script for NetBSD/sparc. This script is based on
@@ -95,9 +95,9 @@ SECTIONS
.sbss : { *(.sbss) *(.scommon) }
.bss :
{
- *(.dynbss)
- *(.bss)
- *(COMMON)
+ *(.dynbss)
+ *(.bss)
+ *(COMMON)
}
. = ALIGN(32 / 8);
_end = . ;
Index: src/sys/arch/sparc64/conf/kern.ldscript
diff -u src/sys/arch/sparc64/conf/kern.ldscript:1.11 src/sys/arch/sparc64/conf/kern.ldscript:1.12
--- src/sys/arch/sparc64/conf/kern.ldscript:1.11 Tue Jun 1 22:13:30 2010
+++ src/sys/arch/sparc64/conf/kern.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.11 2010/06/01 22:13:30 mjf Exp $ */
+/* $NetBSD: kern.ldscript,v 1.12 2015/08/20 07:00:49 uebayasi Exp $ */
/*
* Kernel linker script for NetBSD/sparc64. This script is based on
@@ -100,9 +100,9 @@ SECTIONS
.sbss : { *(.sbss) *(.scommon) }
.bss :
{
- *(.dynbss)
- *(.bss)
- *(COMMON)
+ *(.dynbss)
+ *(.bss)
+ *(COMMON)
}
. = ALIGN(64 / 8);
_end = . ;
Index: src/sys/arch/sparc64/conf/kern32.ldscript
diff -u src/sys/arch/sparc64/conf/kern32.ldscript:1.10 src/sys/arch/sparc64/conf/kern32.ldscript:1.11
--- src/sys/arch/sparc64/conf/kern32.ldscript:1.10 Tue Jun 1 22:13:30 2010
+++ src/sys/arch/sparc64/conf/kern32.ldscript Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern32.ldscript,v 1.10 2010/06/01 22:13:30 mjf Exp $ */
+/* $NetBSD: kern32.ldscript,v 1.11 2015/08/20 07:00:49 uebayasi Exp $ */
/*
* Kernel linker script for NetBSD/sparc. This script is based on
@@ -101,9 +101,9 @@ SECTIONS
.sbss : { *(.sbss) *(.scommon) }
.bss :
{
- *(.dynbss)
- *(.bss)
- *(COMMON)
+ *(.dynbss)
+ *(.bss)
+ *(COMMON)
}
. = ALIGN(32 / 8);
_end = . ;
Index: src/sys/arch/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.6 src/sys/arch/zaurus/conf/ldscript.zaurus:1.7
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.6 Thu Aug 20 06:48:25 2015
+++ src/sys/arch/zaurus/conf/ldscript.zaurus Thu Aug 20 07:00:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.zaurus,v 1.6 2015/08/20 06:48:25 uebayasi Exp $ */
+/* $NetBSD: ldscript.zaurus,v 1.7 2015/08/20 07:00:49 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
@@ -63,14 +63,14 @@ SECTIONS
}
.bss :
{
- *(.dynbss)
- *(.bss)
- *(.bss.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(32 / 8);
+ *(.dynbss)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ /* Align here to ensure that the .bss section occupies space up to
+ _end. Align after .bss to ensure correct alignment even if the
+ .bss section disappears because there are no input sections. */
+ . = ALIGN(32 / 8);
}
. = ALIGN(32 / 8);
_end = .;
