[src/trunk]: src/sys/arch/evbarm/conf Merge both SECTIONS declarations into one.

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1ae362e101bd
branches:  trunk
changeset: 373464:1ae362e101bd
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sat Feb 11 19:09:57 2023 +0000

description:
Merge both SECTIONS declarations into one.
Fixes PR 57223.

cats, epoc32 and zaurus need a similar fix.

diffstat:

 sys/arch/evbarm/conf/ldscript.evbarm |  26 +++++++-------------------
 1 files changed, 7 insertions(+), 19 deletions(-)

diffs (47 lines):

diff -r 60c5cd3d0203 -r 1ae362e101bd sys/arch/evbarm/conf/ldscript.evbarm
--- a/sys/arch/evbarm/conf/ldscript.evbarm      Sat Feb 11 18:30:45 2023 +0000
+++ b/sys/arch/evbarm/conf/ldscript.evbarm      Sat Feb 11 19:09:57 2023 +0000
@@ -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 @@
   _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
-}