Module Name: src
Committed By: mlelstv
Date: Sat Feb 11 19:09:57 UTC 2023
Modified Files:
src/sys/arch/evbarm/conf: ldscript.evbarm
Log Message:
Merge both SECTIONS declarations into one.
Fixes PR 57223.
cats, epoc32 and zaurus need a similar fix.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/ldscript.evbarm
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/evbarm/conf/ldscript.evbarm
diff -u src/sys/arch/evbarm/conf/ldscript.evbarm:1.14 src/sys/arch/evbarm/conf/ldscript.evbarm:1.15
--- src/sys/arch/evbarm/conf/ldscript.evbarm:1.14 Fri Jul 10 12:25:10 2020
+++ src/sys/arch/evbarm/conf/ldscript.evbarm Sat Feb 11 19:09:57 2023
@@ -1,16 +1,20 @@
-/* $NetBSD: ldscript.evbarm,v 1.14 2020/07/10 12:25:10 skrll Exp $ */
+/* $NetBSD: ldscript.evbarm,v 1.15 2023/02/11 19:09:57 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 + ALIGN(SIZEOF(.start), ALIGNOF(.text))) :
+ AT (LOADADDR(.start) + ALIGN(SIZEOF(.start), ALIGNOF(.text)))
{
*(.text)
*(.text.*)
@@ -80,19 +84,3 @@ SECTIONS
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
}
-SECTIONS
-{
- KERNEL_BASE_phys = @KERNEL_BASE_PHYS@;
- KERNEL_BASE_virt = @KERNEL_BASE_VIRT@;
-
- .start (KERNEL_BASE_phys) :
- {
- *(.start)
- } =0
-
- .text (KERNEL_BASE_virt + ALIGN(SIZEOF(.start), ALIGNOF(.text))) :
- AT (LOADADDR(.start) + ALIGN(SIZEOF(.start), ALIGNOF(.text)))
- {
- *(.text)
- } =0
-}
