[src/trunk]: src/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000 Because e...

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

details:   https://anonhg.NetBSD.org/src/rev/3a2e6cc84d7d
branches:  trunk
changeset: 848874:3a2e6cc84d7d
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Feb 12 18:11:30 2020 +0000

description:
Because everything goes into the same memory region at run-time in this
configuration *and* image data concatenated onto the end, the BSS segment
needs to be allocated in the file.

diffstat:

 sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 5506fc9143a2 -r 3a2e6cc84d7d sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript
--- a/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript       Wed Feb 12 17:36:41 2020 +0000
+++ b/sys/arch/evbarm/stand/gzboot/NSLU2_dram_0x01d00000/ldscript       Wed Feb 12 18:11:30 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldscript,v 1.1 2020/02/12 06:57:35 thorpej Exp $       */
+/*     $NetBSD: ldscript,v 1.2 2020/02/12 18:11:30 thorpej Exp $       */
 
 OUTPUT_FORMAT("elf32-bigarm", "elf32-bigarm",
              "elf32-littlearm")
@@ -55,7 +55,7 @@
   __bss_start = .;
   __bss_start__ = .;
   .sbss      :
-  AT (ADDR(.sbss))
+  AT (LOADADDR(.sdata) + SIZEOF(.sdata))
   {
     PROVIDE (__sbss_start = .);
     PROVIDE (___sbss_start = .);
@@ -67,7 +67,7 @@
     PROVIDE (___sbss_end = .);
   } > sdram
   .bss       :
-  AT (ADDR(.bss))
+  AT (LOADADDR(.sbss) + SIZEOF(.sbss))
   {
    *(.dynbss)
    *(.bss)
@@ -82,9 +82,9 @@
   _end = .;
   _bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
   PROVIDE (end = .);
-  .image   (SDRAM + SIZEOF(.text) + SIZEOF(.data) + SIZEOF(.sdata)) :
-  AT (LOADADDR(.sdata) + SIZEOF(.sdata))
+  .image     :
+  AT (LOADADDR(.bss) + SIZEOF(.bss))
   {
     *(.image)
-  }
+  } > sdram
 }