Module Name: src
Committed By: mlelstv
Date: Sat Feb 11 22:42:21 UTC 2023
Modified Files:
src/sys/arch/cats/conf: ldscript.elf
src/sys/arch/epoc32/conf: ldscript.epoc32
src/sys/arch/zaurus/conf: ldscript.zaurus
Log Message:
Apply ldscript fixes for binutils-2.39. See PR 57223.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/cats/conf/ldscript.elf
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/epoc32/conf/ldscript.epoc32
cvs rdiff -u -r1.12 -r1.13 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/cats/conf/ldscript.elf
diff -u src/sys/arch/cats/conf/ldscript.elf:1.6 src/sys/arch/cats/conf/ldscript.elf:1.7
--- src/sys/arch/cats/conf/ldscript.elf:1.6 Sun Aug 23 08:57:25 2015
+++ src/sys/arch/cats/conf/ldscript.elf Sat Feb 11 22:42:20 2023
@@ -1,16 +1,20 @@
-/* $NetBSD: ldscript.elf,v 1.6 2015/08/23 08:57:25 uebayasi Exp $ */
+/* $NetBSD: ldscript.elf,v 1.7 2023/02/11 22:42:20 mlelstv Exp $ */
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
+ KERNEL_BASE_phys = 0xF0000000;
+ KERNEL_BASE_virt = 0xF0000000;
+
/* Kernel start: */
- .start :
+ .start (KERNEL_BASE_phys) :
{
*(.start)
}
/* Read-only sections, merged into text segment: */
- .text :
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
{
*(.text)
*(.text.*)
@@ -66,19 +70,3 @@ SECTIONS
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
}
-SECTIONS
-{
- KERNEL_BASE_phys = 0xF0000000;
- KERNEL_BASE_virt = 0xF0000000;
-
- .start (KERNEL_BASE_phys) :
- {
- *(.start)
- } =0
-
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
- {
- *(.text)
- } =0
-}
Index: src/sys/arch/epoc32/conf/ldscript.epoc32
diff -u src/sys/arch/epoc32/conf/ldscript.epoc32:1.7 src/sys/arch/epoc32/conf/ldscript.epoc32:1.8
--- src/sys/arch/epoc32/conf/ldscript.epoc32:1.7 Sun Aug 23 08:57:25 2015
+++ src/sys/arch/epoc32/conf/ldscript.epoc32 Sat Feb 11 22:42:20 2023
@@ -1,16 +1,20 @@
-/* $NetBSD: ldscript.epoc32,v 1.7 2015/08/23 08:57:25 uebayasi Exp $ */
+/* $NetBSD: ldscript.epoc32,v 1.8 2023/02/11 22:42:20 mlelstv Exp $ */
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
+ KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+ KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
/* Kernel start: */
- .start :
+ .start (KERNEL_BASE_phys) :
{
*(.start)
}
/* Read-only sections, merged into text segment: */
- .text :
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
{
*(.text)
*(.text.*)
@@ -70,19 +74,3 @@ SECTIONS
KEEP(*(.note.netbsd.ident));
}
}
-SECTIONS
-{
- KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
- KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
- .start (KERNEL_BASE_phys) :
- {
- *(.start)
- } =0
-
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
- {
- *(.text)
- } =0
-}
Index: src/sys/arch/zaurus/conf/ldscript.zaurus
diff -u src/sys/arch/zaurus/conf/ldscript.zaurus:1.12 src/sys/arch/zaurus/conf/ldscript.zaurus:1.13
--- src/sys/arch/zaurus/conf/ldscript.zaurus:1.12 Fri Jan 3 10:01:07 2020
+++ src/sys/arch/zaurus/conf/ldscript.zaurus Sat Feb 11 22:42:20 2023
@@ -1,16 +1,20 @@
-/* $NetBSD: ldscript.zaurus,v 1.12 2020/01/03 10:01:07 martin Exp $ */
+/* $NetBSD: ldscript.zaurus,v 1.13 2023/02/11 22:42:20 mlelstv Exp $ */
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
+ KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
+ KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
+
/* Kernel start: */
- .start :
+ .start (KERNEL_BASE_phys) :
{
*(.start)
}
/* Read-only sections, merged into text segment: */
- .text :
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
{
*(.text)
*(.text.*)
@@ -75,19 +79,3 @@ SECTIONS
*(.SUNW_ctf)
}
}
-SECTIONS
-{
- KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
- KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
- .start (KERNEL_BASE_phys) :
- {
- *(.start)
- } =0
-
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
- {
- *(.text)
- } =0
-}
