Module Name: src
Committed By: simonb
Date: Fri Apr 23 08:42:26 UTC 2021
Modified Files:
src/sys/arch/mips/conf: kern.ldscript stand.ldscript
src/sys/arch/mipsco/conf: stand.ldscript
src/sys/arch/sparc/conf: kern.ldscript
src/sys/arch/sparc64/conf: kern.ldscript kern32.ldscript
Log Message:
Merge the .text.* sections into the .text section on MIPS, SPARC and
SPARC64 as is done on all other ports. Mostly costmetic, but does mean
that main() now appears before the _etext symbol instead of after it.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/conf/kern.ldscript
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/conf/stand.ldscript
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mipsco/conf/stand.ldscript
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/conf/kern.ldscript
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc64/conf/kern.ldscript \
src/sys/arch/sparc64/conf/kern32.ldscript
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/mips/conf/kern.ldscript
diff -u src/sys/arch/mips/conf/kern.ldscript:1.11 src/sys/arch/mips/conf/kern.ldscript:1.12
--- src/sys/arch/mips/conf/kern.ldscript:1.11 Tue Aug 25 08:08:12 2015
+++ src/sys/arch/mips/conf/kern.ldscript Fri Apr 23 08:42:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.11 2015/08/25 08:08:12 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.12 2021/04/23 08:42:25 simonb Exp $ */
#include "assym.h"
@@ -16,6 +16,7 @@ SECTIONS
{
_ftext = . ;
*(.text)
+ *(.text.*)
__stub_start = . ;
*(.stub*)
__stub_end = . ;
Index: src/sys/arch/mips/conf/stand.ldscript
diff -u src/sys/arch/mips/conf/stand.ldscript:1.7 src/sys/arch/mips/conf/stand.ldscript:1.8
--- src/sys/arch/mips/conf/stand.ldscript:1.7 Sat Aug 22 23:49:54 2015
+++ src/sys/arch/mips/conf/stand.ldscript Fri Apr 23 08:42:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.7 2015/08/22 23:49:54 uebayasi Exp $ */
+/* $NetBSD: stand.ldscript,v 1.8 2021/04/23 08:42:25 simonb Exp $ */
/* ldscript for NetBSD/mips stand-alone programs */
OUTPUT_ARCH(mips)
@@ -11,6 +11,7 @@ SECTIONS
{
_ftext = . ;
*(.text)
+ *(.text.*)
*(.gnu.warning)
} =0
_etext = .;
Index: src/sys/arch/mipsco/conf/stand.ldscript
diff -u src/sys/arch/mipsco/conf/stand.ldscript:1.5 src/sys/arch/mipsco/conf/stand.ldscript:1.6
--- src/sys/arch/mipsco/conf/stand.ldscript:1.5 Thu Aug 20 07:00:49 2015
+++ src/sys/arch/mipsco/conf/stand.ldscript Fri Apr 23 08:42:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: stand.ldscript,v 1.5 2015/08/20 07:00:49 uebayasi Exp $ */
+/* $NetBSD: stand.ldscript,v 1.6 2021/04/23 08:42:26 simonb Exp $ */
/* ldscript for NetBSD/mipsco standalone bootstraps */
OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
@@ -12,6 +12,7 @@ SECTIONS
{
_ftext = . ;
*(.text)
+ *(.text.*)
*(.gnu.warning)
} =0
_etext = .;
Index: src/sys/arch/sparc/conf/kern.ldscript
diff -u src/sys/arch/sparc/conf/kern.ldscript:1.12 src/sys/arch/sparc/conf/kern.ldscript:1.13
--- src/sys/arch/sparc/conf/kern.ldscript:1.12 Tue Aug 25 02:58:59 2015
+++ src/sys/arch/sparc/conf/kern.ldscript Fri Apr 23 08:42:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.12 2015/08/25 02:58:59 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.13 2021/04/23 08:42:26 simonb Exp $ */
#undef sparc
@@ -20,6 +20,7 @@ SECTIONS
.text :
{
*(.text)
+ *(.text.*)
*(.stub)
/* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
Index: src/sys/arch/sparc64/conf/kern.ldscript
diff -u src/sys/arch/sparc64/conf/kern.ldscript:1.17 src/sys/arch/sparc64/conf/kern.ldscript:1.18
--- src/sys/arch/sparc64/conf/kern.ldscript:1.17 Tue Aug 25 02:59:00 2015
+++ src/sys/arch/sparc64/conf/kern.ldscript Fri Apr 23 08:42:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.17 2015/08/25 02:59:00 uebayasi Exp $ */
+/* $NetBSD: kern.ldscript,v 1.18 2021/04/23 08:42:26 simonb Exp $ */
#undef sparc
@@ -19,6 +19,7 @@ SECTIONS
.text :
{
*(.text)
+ *(.text.*)
*(.stub)
/* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
Index: src/sys/arch/sparc64/conf/kern32.ldscript
diff -u src/sys/arch/sparc64/conf/kern32.ldscript:1.17 src/sys/arch/sparc64/conf/kern32.ldscript:1.18
--- src/sys/arch/sparc64/conf/kern32.ldscript:1.17 Fri Mar 25 14:58:53 2016
+++ src/sys/arch/sparc64/conf/kern32.ldscript Fri Apr 23 08:42:26 2021
@@ -1,5 +1,3 @@
-/* $NetBSD: kern32.ldscript,v 1.17 2016/03/25 14:58:53 nakayama Exp $ */
-
#undef sparc
/*
@@ -20,6 +18,7 @@ SECTIONS
.text :
{
*(.text)
+ *(.text.*)
*(.stub)
/* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
