Module Name: src
Committed By: isaki
Date: Sat Jan 18 07:25:12 UTC 2020
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: Makefile boot_ufs.ldscript
src/sys/arch/x68k/stand/boot_ustar: Makefile boot_ustar.ldscript
src/sys/arch/x68k/stand/xxboot: Makefile.xxboot xxboot.ldscript
Log Message:
Check whether the text+data+bss doesn't reach 0x6000 where secondary
bootloader should be.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x68k/stand/boot_ufs/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x68k/stand/boot_ustar/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/xxboot/xxboot.ldscript
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/x68k/stand/boot_ufs/Makefile
diff -u src/sys/arch/x68k/stand/boot_ufs/Makefile:1.35 src/sys/arch/x68k/stand/boot_ufs/Makefile:1.36
--- src/sys/arch/x68k/stand/boot_ufs/Makefile:1.35 Sat Jan 18 06:44:23 2020
+++ src/sys/arch/x68k/stand/boot_ufs/Makefile Sat Jan 18 07:25:11 2020
@@ -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 @@ CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS} -
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"
Index: src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript
diff -u src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.6 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.7
--- src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.6 Sat Jan 18 07:09:32 2020
+++ src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript Sat Jan 18 07:25:11 2020
@@ -48,3 +48,4 @@ SECTIONS
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");
Index: src/sys/arch/x68k/stand/boot_ustar/Makefile
diff -u src/sys/arch/x68k/stand/boot_ustar/Makefile:1.29 src/sys/arch/x68k/stand/boot_ustar/Makefile:1.30
--- src/sys/arch/x68k/stand/boot_ustar/Makefile:1.29 Sat Jan 18 06:44:23 2020
+++ src/sys/arch/x68k/stand/boot_ustar/Makefile Sat Jan 18 07:25:11 2020
@@ -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= ${CFLAGS:M-[ID]*}
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"
Index: src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript
diff -u src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript:1.5 src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript:1.6
--- src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript:1.5 Sat Jan 18 06:44:23 2020
+++ src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript Sat Jan 18 07:25:11 2020
@@ -48,3 +48,4 @@ SECTIONS
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");
Index: src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
diff -u src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.10 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.11
--- src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.10 Sat Jan 18 06:44:23 2020
+++ src/sys/arch/x68k/stand/xxboot/Makefile.xxboot Sat Jan 18 07:25:12 2020
@@ -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 @@ CPPFLAGS+= -I$M/stand/libiocs -I$M/stand
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}
Index: src/sys/arch/x68k/stand/xxboot/xxboot.ldscript
diff -u src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.5 src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.6
--- src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.5 Sat Jan 18 07:09:32 2020
+++ src/sys/arch/x68k/stand/xxboot/xxboot.ldscript Sat Jan 18 07:25:12 2020
@@ -49,3 +49,4 @@ SECTIONS
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");
