Module Name: src
Committed By: uebayasi
Date: Sat Aug 22 23:49:54 UTC 2015
Modified Files:
src/sys/arch/i386/conf: stand.ldscript
src/sys/arch/ia64/conf: kern.ldscript
src/sys/arch/mips/conf: stand.ldscript
src/sys/arch/riscv/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:
.rel/.rela should not be generated in kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/conf/stand.ldscript
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/conf/kern.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/conf/stand.ldscript
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/conf/kern.ldscript
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/conf/kern.ldscript
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc64/conf/kern.ldscript
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc64/conf/kern32.ldscript
cvs rdiff -u -r1.9 -r1.10 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/i386/conf/stand.ldscript
diff -u src/sys/arch/i386/conf/stand.ldscript:1.4 src/sys/arch/i386/conf/stand.ldscript:1.5
--- src/sys/arch/i386/conf/stand.ldscript:1.4 Sat Aug 22 02:23:58 2015
+++ src/sys/arch/i386/conf/stand.ldscript Sat Aug 22 23:49:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.4 2015/08/22 02:23:58 uebayasi Exp $ */
+/* $NetBSD: stand.ldscript,v 1.5 2015/08/22 23:49:54 uebayasi Exp $ */
ENTRY(_start)
SECTIONS
@@ -48,8 +48,6 @@ SECTIONS
/DISCARD/ : {
*(.eh_frame_hdr)
*(.eh_frame)
- *(.rel.eh_frame)
- *(.rela.eh_frame)
*(.note.netbsd.ident)
}
}
Index: src/sys/arch/ia64/conf/kern.ldscript
diff -u src/sys/arch/ia64/conf/kern.ldscript:1.4 src/sys/arch/ia64/conf/kern.ldscript:1.5
--- src/sys/arch/ia64/conf/kern.ldscript:1.4 Sat Aug 22 23:47:34 2015
+++ src/sys/arch/ia64/conf/kern.ldscript Sat Aug 22 23:49:54 2015
@@ -7,24 +7,6 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
. = kernel_text + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym : { *(.dynsym) }
- .dynstr : { *(.dynstr) }
- .gnu.version : { *(.gnu.version) }
- .gnu.version_d : { *(.gnu.version_d) }
- .gnu.version_r : { *(.gnu.version_r) }
- .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
- .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
- .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
- .rela.got : { *(.rela.got) }
- .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
- .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
- .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
- .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
- .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
- .rela.plt : { *(.rela.plt) }
- .rela.IA_64.pltoff : { *(.rela.IA_64.pltoff) }
PROVIDE (btext = .);
.plt : { *(.plt) }
.text :
Index: src/sys/arch/mips/conf/stand.ldscript
diff -u src/sys/arch/mips/conf/stand.ldscript:1.6 src/sys/arch/mips/conf/stand.ldscript:1.7
--- src/sys/arch/mips/conf/stand.ldscript:1.6 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/mips/conf/stand.ldscript Sat Aug 22 23:49:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.6 2015/08/20 07:00:49 uebayasi Exp $ */
+/* $NetBSD: stand.ldscript,v 1.7 2015/08/22 23:49:54 uebayasi Exp $ */
/* ldscript for NetBSD/mips stand-alone programs */
OUTPUT_ARCH(mips)
@@ -41,7 +41,5 @@ SECTIONS
/DISCARD/ : {
*(.eh_frame_hdr)
*(.eh_frame)
- *(.rel.eh_frame)
- *(.rela.eh_frame)
}
}
Index: src/sys/arch/riscv/conf/kern.ldscript
diff -u src/sys/arch/riscv/conf/kern.ldscript:1.3 src/sys/arch/riscv/conf/kern.ldscript:1.4
--- src/sys/arch/riscv/conf/kern.ldscript:1.3 Fri Aug 21 02:35:52 2015
+++ src/sys/arch/riscv/conf/kern.ldscript Sat Aug 22 23:49:54 2015
@@ -6,26 +6,6 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
PROVIDE (__executable_start = SEGMENT_START("text-segment", 0xffffffff80000000)); . = SEGMENT_START("text-segment", 0xffffffff80000000) + SIZEOF_HEADERS;
- .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
- .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
- .rel.data.rel.ro : { *(.rel.data.rel.ro .rel.data.rel.ro.* .rel.gnu.linkonce.d.rel.ro.*) }
- .rela.data.rel.ro : { *(.rela.data.rel.ro .rela.data.rel.ro.* .rela.gnu.linkonce.d.rel.ro.*) }
- .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
- .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
- .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
- .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
- .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
- .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
- .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
- .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
- .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
- .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
- .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
- .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
- .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
- .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
- .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
- .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
.text :
{
_ftext = . ;
@@ -57,7 +37,6 @@ SECTIONS
/* Exception handling */
.eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) }
.exception_ranges : ONLY_IF_RW { *(.exception_ranges .exception_ranges*) }
- .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) }
. = DATA_SEGMENT_RELRO_END (0, .);
.data :
{
Index: src/sys/arch/sparc/conf/kern.ldscript
diff -u src/sys/arch/sparc/conf/kern.ldscript:1.8 src/sys/arch/sparc/conf/kern.ldscript:1.9
--- src/sys/arch/sparc/conf/kern.ldscript:1.8 Sat Aug 22 23:47:34 2015
+++ src/sys/arch/sparc/conf/kern.ldscript Sat Aug 22 23:49:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.8 2015/08/22 23:47:34 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.9 2015/08/22 23:49:54 uebayasi Exp $ */
/*
* Kernel linker script for NetBSD/sparc. This script is based on
@@ -22,24 +22,6 @@ SECTIONS
.gnu.version : { *(.gnu.version) }
.gnu.version_d : { *(.gnu.version_d) }
.gnu.version_r : { *(.gnu.version_r) }
- .rel.text :
- { *(.rel.text) *(.rel.gnu.linkonce.t*) }
- .rela.text :
- { *(.rela.text) *(.rela.gnu.linkonce.t*) }
- .rel.data :
- { *(.rel.data) *(.rel.gnu.linkonce.d*) }
- .rela.data :
- { *(.rela.data) *(.rela.gnu.linkonce.d*) }
- .rel.rodata :
- { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
- .rela.rodata :
- { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
.text :
{
*(.text)
Index: src/sys/arch/sparc64/conf/kern.ldscript
diff -u src/sys/arch/sparc64/conf/kern.ldscript:1.14 src/sys/arch/sparc64/conf/kern.ldscript:1.15
--- src/sys/arch/sparc64/conf/kern.ldscript:1.14 Sat Aug 22 23:47:34 2015
+++ src/sys/arch/sparc64/conf/kern.ldscript Sat Aug 22 23:49:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.14 2015/08/22 23:47:34 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.15 2015/08/22 23:49:54 uebayasi Exp $ */
/*
* Kernel linker script for NetBSD/sparc64. This script is based on
@@ -14,31 +14,6 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
. = 0x100000 + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym : { *(.dynsym) }
- .dynstr : { *(.dynstr) }
- .gnu.version : { *(.gnu.version) }
- .gnu.version_d : { *(.gnu.version_d) }
- .gnu.version_r : { *(.gnu.version_r) }
- .rel.text :
- { *(.rel.text) *(.rel.gnu.linkonce.t*) }
- .rela.text :
- { *(.rela.text) *(.rela.gnu.linkonce.t*) }
- .rel.data :
- { *(.rel.data) *(.rel.gnu.linkonce.d*) }
- .rela.data :
- { *(.rela.data) *(.rela.gnu.linkonce.d*) }
- .rel.rodata :
- { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
- .rela.rodata :
- { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
.text :
{
*(.text)
Index: src/sys/arch/sparc64/conf/kern32.ldscript
diff -u src/sys/arch/sparc64/conf/kern32.ldscript:1.13 src/sys/arch/sparc64/conf/kern32.ldscript:1.14
--- src/sys/arch/sparc64/conf/kern32.ldscript:1.13 Sat Aug 22 23:47:34 2015
+++ src/sys/arch/sparc64/conf/kern32.ldscript Sat Aug 22 23:49:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern32.ldscript,v 1.13 2015/08/22 23:47:34 uebayasi Exp $ */
+/* $NetBSD: kern32.ldscript,v 1.14 2015/08/22 23:49:54 uebayasi Exp $ */
/*
* Kernel linker script for NetBSD/sparc. This script is based on
@@ -15,31 +15,6 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
. = 0x10000 + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym : { *(.dynsym) }
- .dynstr : { *(.dynstr) }
- .gnu.version : { *(.gnu.version) }
- .gnu.version_d : { *(.gnu.version_d) }
- .gnu.version_r : { *(.gnu.version_r) }
- .rel.text :
- { *(.rel.text) *(.rel.gnu.linkonce.t*) }
- .rela.text :
- { *(.rela.text) *(.rela.gnu.linkonce.t*) }
- .rel.data :
- { *(.rel.data) *(.rel.gnu.linkonce.d*) }
- .rela.data :
- { *(.rela.data) *(.rela.gnu.linkonce.d*) }
- .rel.rodata :
- { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
- .rela.rodata :
- { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
.text :
{
*(.text)
Index: src/sys/arch/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.9 src/sys/arch/zaurus/conf/ldscript.zaurus:1.10
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.9 Sat Aug 22 23:19:55 2015
+++ src/sys/arch/zaurus/conf/ldscript.zaurus Sat Aug 22 23:49:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldscript.zaurus,v 1.9 2015/08/22 23:19:55 uebayasi Exp $ */
+/* $NetBSD: ldscript.zaurus,v 1.10 2015/08/22 23:49:54 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
@@ -73,8 +73,6 @@ SECTIONS
/DISCARD/ : {
*(.eh_frame_hdr)
*(.eh_frame)
- *(.rel.eh_frame)
- *(.rela.eh_frame)
}
}
SECTIONS
