[src/trunk]: src/sys/arch/x68k/stand Check whether the text+data+bss doesn't ...

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

details:   https://anonhg.NetBSD.org/src/rev/75ef5f611104
branches:  trunk
changeset: 467243:75ef5f611104
user:      isaki <isaki%NetBSD.org@localhost>
date:      Sat Jan 18 07:25:11 2020 +0000

description:
Check whether the text+data+bss doesn't reach 0x6000 where secondary
bootloader should be.

diffstat:

 sys/arch/x68k/stand/boot_ufs/Makefile              |  3 ++-
 sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript     |  1 +
 sys/arch/x68k/stand/boot_ustar/Makefile            |  3 ++-
 sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript |  1 +
 sys/arch/x68k/stand/xxboot/Makefile.xxboot         |  3 ++-
 sys/arch/x68k/stand/xxboot/xxboot.ldscript         |  1 +
 6 files changed, 9 insertions(+), 3 deletions(-)

diffs (75 lines):

diff -r 36936bebe66a -r 75ef5f611104 sys/arch/x68k/stand/boot_ufs/Makefile
--- a/sys/arch/x68k/stand/boot_ufs/Makefile     Sat Jan 18 07:09:32 2020 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/Makefile     Sat Jan 18 07:25:11 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.35 2020/01/18 06:44:23 isaki Exp $
+#      $NetBSD: Makefile,v 1.36 2020/01/18 07:25:11 isaki Exp $
 
 NOMAN=         # defined
 
@@ -44,6 +44,7 @@
 AFLAGS=           ${CFLAGS:M-[ID]*}
 LINKFLAGS=   -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript
 LINKFLAGS+=  --defsym=TEXTADDR=$(TEXT)
+LINKFLAGS+=  --defsym=BOOT_TEXTADDR=$(BOOT_TEXT)
 
 .include "${.CURDIR}/../Makefile.booters"
 .include "${S}/../common/lib/libc/Makefile.inc"
diff -r 36936bebe66a -r 75ef5f611104 sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript
--- a/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript    Sat Jan 18 07:09:32 2020 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript    Sat Jan 18 07:25:11 2020 +0000
@@ -48,3 +48,4 @@
 
 ASSERT(first_kbyte - TEXTADDR <= 1024, "Error: first_kbyte exceeds 1KB");
 ASSERT(_edata - TEXTADDR <= 8192, "Error: text+data is too large to bootarea");
+ASSERT(_end <= BOOT_TEXTADDR, "Error: _end conflicts BOOT_TEXT");
diff -r 36936bebe66a -r 75ef5f611104 sys/arch/x68k/stand/boot_ustar/Makefile
--- a/sys/arch/x68k/stand/boot_ustar/Makefile   Sat Jan 18 07:09:32 2020 +0000
+++ b/sys/arch/x68k/stand/boot_ustar/Makefile   Sat Jan 18 07:25:11 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.29 2020/01/18 06:44:23 isaki Exp $
+#      $NetBSD: Makefile,v 1.30 2020/01/18 07:25:11 isaki Exp $
 
 NOMAN=         # defined
 
@@ -39,6 +39,7 @@
 AFLAGS+=   -Wa,-march=m68000 -Wa,-mcpu=m68000
 LINKFLAGS=   -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript
 LINKFLAGS+=  --defsym=TEXTADDR=$(TEXT)
+LINKFLAGS+=  --defsym=BOOT_TEXTADDR=$(BOOT_TEXT)
 
 .include "${.CURDIR}/../Makefile.booters"
 .include "${S}/../common/lib/libc/Makefile.inc"
diff -r 36936bebe66a -r 75ef5f611104 sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript
--- a/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript        Sat Jan 18 07:09:32 2020 +0000
+++ b/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript        Sat Jan 18 07:25:11 2020 +0000
@@ -48,3 +48,4 @@
 
 ASSERT(first_kbyte - TEXTADDR <= 1024, "Error: first_kbyte exceeds 1KB");
 ASSERT(_edata - TEXTADDR <= 8192, "Error: text+data is too large to bootarea");
+ASSERT(_end <= BOOT_TEXTADDR, "Error: _end conflicts BOOT_TEXT");
diff -r 36936bebe66a -r 75ef5f611104 sys/arch/x68k/stand/xxboot/Makefile.xxboot
--- a/sys/arch/x68k/stand/xxboot/Makefile.xxboot        Sat Jan 18 07:09:32 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/Makefile.xxboot        Sat Jan 18 07:25:11 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xxboot,v 1.10 2020/01/18 06:44:23 isaki Exp $
+#      $NetBSD: Makefile.xxboot,v 1.11 2020/01/18 07:25:12 isaki Exp $
 
 NOMAN=         # defined
 
@@ -41,6 +41,7 @@
 AFLAGS=           ${CFLAGS:M-[ID]*}
 LINKFLAGS=   -n -Bstatic -T ${.CURDIR}/../xxboot.ldscript
 LINKFLAGS+=  --defsym=TEXTADDR=$(TEXT)
+LINKFLAGS+=  --defsym=BOOT_TEXTADDR=$(BOOT_TEXT)
 LINKFLAGS+=  --defsym=TEXTDATASIZE=$(TEXTDATASIZE)
 LIBIOCS!= cd $M/stand/libiocs && ${PRINTOBJDIR}
 LIBSA!=          cd $M/stand/libsa && ${PRINTOBJDIR}
diff -r 36936bebe66a -r 75ef5f611104 sys/arch/x68k/stand/xxboot/xxboot.ldscript
--- a/sys/arch/x68k/stand/xxboot/xxboot.ldscript        Sat Jan 18 07:09:32 2020 +0000
+++ b/sys/arch/x68k/stand/xxboot/xxboot.ldscript        Sat Jan 18 07:25:11 2020 +0000
@@ -49,3 +49,4 @@
 ASSERT(first_kbyte - TEXTADDR <= 1024, "Error: first_kbyte exceeds 1KB");
 ASSERT(_edata - TEXTADDR <= TEXTDATASIZE,
     "Error: text+data is too large to bootarea");
+ASSERT(_end <= BOOT_TEXTADDR, "Error: _end conflicts BOOT_TEXT");