Module Name: src
Committed By: isaki
Date: Sat Jan 18 05:41:49 UTC 2020
Modified Files:
src/sys/arch/x68k/stand/boot: Makefile boot.ldscript
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:
Pass address constants from Makefile to ldscript.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x68k/stand/boot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x68k/stand/boot/boot.ldscript
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x68k/stand/boot_ufs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x68k/stand/boot_ustar/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
cvs rdiff -u -r1.1 -r1.2 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/Makefile
diff -u src/sys/arch/x68k/stand/boot/Makefile:1.31 src/sys/arch/x68k/stand/boot/Makefile:1.32
--- src/sys/arch/x68k/stand/boot/Makefile:1.31 Fri Jun 14 14:15:53 2019
+++ src/sys/arch/x68k/stand/boot/Makefile Sat Jan 18 05:41:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/06/14 14:15:53 isaki Exp $
+# $NetBSD: Makefile,v 1.32 2020/01/18 05:41:48 isaki Exp $
NOMAN= # defined
@@ -42,6 +42,7 @@ CPPFLAGS+= -DSUPPORT_BOOTP -DSUPPORT_DHC
#CPPFLAGS+= -DDEBUG
CFLAGS= -Wno-main -Os -m68020-60
LINKFLAGS= -N -static -T ${.CURDIR}/../boot/boot.ldscript
+LINKFLAGS+= --defsym=TEXTADDR=0x$(TEXT)
ELF2AOUT_OPTS= -O
LIBIOCS!= cd $M/stand/libiocs && ${PRINTOBJDIR}
LIBSA!= cd $M/stand/libsa && ${PRINTOBJDIR}
Index: src/sys/arch/x68k/stand/boot/boot.ldscript
diff -u src/sys/arch/x68k/stand/boot/boot.ldscript:1.7 src/sys/arch/x68k/stand/boot/boot.ldscript:1.8
--- src/sys/arch/x68k/stand/boot/boot.ldscript:1.7 Mon Dec 31 19:25:46 2018
+++ src/sys/arch/x68k/stand/boot/boot.ldscript Sat Jan 18 05:41:48 2020
@@ -10,7 +10,7 @@ SEARCH_DIR(/usr/lib);
PROVIDE (__stack = 0);
SECTIONS
{
- . = 0x6000;
+ . = TEXTADDR;
.text :
{
CREATE_OBJECT_SYMBOLS
Index: src/sys/arch/x68k/stand/boot_ufs/Makefile
diff -u src/sys/arch/x68k/stand/boot_ufs/Makefile:1.31 src/sys/arch/x68k/stand/boot_ufs/Makefile:1.32
--- src/sys/arch/x68k/stand/boot_ufs/Makefile:1.31 Thu Jan 16 13:15:47 2020
+++ src/sys/arch/x68k/stand/boot_ufs/Makefile Sat Jan 18 05:41:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/01/16 13:15:47 isaki Exp $
+# $NetBSD: Makefile,v 1.32 2020/01/18 05:41:48 isaki Exp $
NOMAN= # defined
@@ -43,6 +43,7 @@ CPPFLAGS+= -DUSE_FFS -DUSE_LFS -DUSE_UFS
CPPFLAGS+= -I${COMMONDIR} -I${LIBIOCS} -I${S} -I. -D_STANDALONE
AFLAGS= ${CFLAGS:M-[ID]*}
LINKFLAGS= -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript -M
+LINKFLAGS+= --defsym=TEXTADDR=0x$(TEXT)
LINKFLAGS+= -noinhibit-exec # XXX
.include "${.CURDIR}/../Makefile.booters"
Index: src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript
diff -u src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.2 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.3
--- src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript:1.2 Sat Nov 24 16:18:44 2001
+++ src/sys/arch/x68k/stand/boot_ufs/boot_ufs.ldscript Sat Jan 18 05:41:48 2020
@@ -6,7 +6,7 @@ SEARCH_DIR(/usr/lib);
PROVIDE (__stack = 0);
SECTIONS
{
- . = 0x0f0000;
+ . = TEXTADDR;
.text :
{
CREATE_OBJECT_SYMBOLS
@@ -36,7 +36,7 @@ SECTIONS
edata = .;
_edata = .;
}
- . = 0x0f2000;
+ . = TEXTADDR + 0x2000;
.bss :
{
__bss_start = .;
Index: src/sys/arch/x68k/stand/boot_ustar/Makefile
diff -u src/sys/arch/x68k/stand/boot_ustar/Makefile:1.25 src/sys/arch/x68k/stand/boot_ustar/Makefile:1.26
--- src/sys/arch/x68k/stand/boot_ustar/Makefile:1.25 Thu Jan 16 13:15:47 2020
+++ src/sys/arch/x68k/stand/boot_ustar/Makefile Sat Jan 18 05:41:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/01/16 13:15:47 isaki Exp $
+# $NetBSD: Makefile,v 1.26 2020/01/18 05:41:48 isaki Exp $
NOMAN= # defined
@@ -38,6 +38,7 @@ CFLAGS+= -m68000
AFLAGS= ${CFLAGS:M-[ID]*}
AFLAGS+= -Wa,-march=m68000 -Wa,-mcpu=m68000
LINKFLAGS= -n -Bstatic -T ${.CURDIR}/${BOOT}.ldscript -M
+LINKFLAGS+= --defsym=TEXTADDR=0x$(TEXT)
LINKFLAGS+= -noinhibit-exec # XXX
.include "${.CURDIR}/../Makefile.booters"
Index: src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript
diff -u src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript:1.2 src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript:1.3
--- src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript:1.2 Sat Nov 24 16:18:45 2001
+++ src/sys/arch/x68k/stand/boot_ustar/boot_ustar.ldscript Sat Jan 18 05:41:48 2020
@@ -6,7 +6,7 @@ SEARCH_DIR(/usr/lib);
PROVIDE (__stack = 0);
SECTIONS
{
- . = 0x00002000;
+ . = TEXTADDR;
.text :
{
CREATE_OBJECT_SYMBOLS
Index: src/sys/arch/x68k/stand/xxboot/Makefile.xxboot
diff -u src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.6 src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.7
--- src/sys/arch/x68k/stand/xxboot/Makefile.xxboot:1.6 Thu Jan 16 13:15:47 2020
+++ src/sys/arch/x68k/stand/xxboot/Makefile.xxboot Sat Jan 18 05:41:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xxboot,v 1.6 2020/01/16 13:15:47 isaki Exp $
+# $NetBSD: Makefile.xxboot,v 1.7 2020/01/18 05:41:49 isaki Exp $
NOMAN= # defined
@@ -39,6 +39,8 @@ CPPFLAGS+= -nostdinc -I${.OBJDIR} -I${S}
CPPFLAGS+= -I$M/stand/libiocs -I$M/stand/libsa -I$M/stand/common
AFLAGS= ${CFLAGS:M-[ID]*}
LINKFLAGS= -n -Bstatic -T ${.CURDIR}/../xxboot.ldscript -M
+LINKFLAGS+= --defsym=TEXTADDR=0x$(TEXT)
+LINKFLAGS+= --defsym=TEXTDATASIZE=0x$(TEXTDATASIZE)
LINKFLAGS+= -noinhibit-exec # XXX
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.1 src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.2
--- src/sys/arch/x68k/stand/xxboot/xxboot.ldscript:1.1 Tue Mar 20 13:01:32 2012
+++ src/sys/arch/x68k/stand/xxboot/xxboot.ldscript Sat Jan 18 05:41:49 2020
@@ -6,7 +6,7 @@ SEARCH_DIR(/usr/lib);
PROVIDE (__stack = 0);
SECTIONS
{
- . = 0x000f0000;
+ . = TEXTADDR;
.text :
{
CREATE_OBJECT_SYMBOLS
@@ -36,7 +36,7 @@ SECTIONS
edata = .;
_edata = .;
}
- . = 0x0f2000;
+ . = TEXTADDR + TEXTDATASIZE;
.bss :
{
__bss_start = .;
