Module Name: src
Committed By: isaki
Date: Sat Jan 18 07:09:32 UTC 2020
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: boot_ufs.ldscript
src/sys/arch/x68k/stand/xxboot: xxboot.ldscript
Log Message:
Make .bss follows .data to detect size restriction easier.
Previously, if text+data exceeds the restricted size, it will conflict
with manually fixed .bss area and ldscript makes it an error.
By this change, ASSERT() can detect it.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript
cvs rdiff -u -r1.4 -r1.5 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/boot_ufs.ldscript
diff -u src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.5 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.6
--- src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.5 Sat Jan 18 06:44:23 2020
+++ src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript Sat Jan 18 07:09:32 2020
@@ -35,7 +35,6 @@ SECTIONS
edata = .;
_edata = .;
}
- . = TEXTADDR + 0x2000;
.bss :
{
__bss_start = .;
@@ -48,3 +47,4 @@ SECTIONS
}
ASSERT(first_kbyte - TEXTADDR <= 1024, "Error: first_kbyte exceeds 1KB");
+ASSERT(_edata - TEXTADDR <= 8192, "Error: text+data is too large to bootarea");
Index: src/sys/arch/x68k/stand/xxboot/xxboot.ldscript
diff -u src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.4 src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.5
--- src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.4 Sat Jan 18 06:44:23 2020
+++ src/sys/arch/x68k/stand/xxboot/xxboot.ldscript Sat Jan 18 07:09:32 2020
@@ -35,7 +35,6 @@ SECTIONS
edata = .;
_edata = .;
}
- . = TEXTADDR + TEXTDATASIZE;
.bss :
{
__bss_start = .;
@@ -48,3 +47,5 @@ SECTIONS
}
ASSERT(first_kbyte - TEXTADDR <= 1024, "Error: first_kbyte exceeds 1KB");
+ASSERT(_edata - TEXTADDR <= TEXTDATASIZE,
+ "Error: text+data is too large to bootarea");
