summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-02-19 15:38:25 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-02-19 15:38:25 +0000
commitfcd256f002867126fe7d9168f634fd2c984d3911 (patch)
tree0468f30d89870919a5afa9c4e824810b3a41aadc
parent85250b6dfbb89291368bed4bf1c5fe8bdaa2e32a (diff)
link boot at a starting address 0x10000 higher than bootxx; avoids hypersparc cache aliasing
-rw-r--r--sys/arch/sparc/stand/Makefile.inc5
-rw-r--r--sys/arch/sparc/stand/boot/Makefile4
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/sparc/stand/Makefile.inc b/sys/arch/sparc/stand/Makefile.inc
index 80d0607783b..e7c4fc12ab8 100644
--- a/sys/arch/sparc/stand/Makefile.inc
+++ b/sys/arch/sparc/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 1999/06/22 15:30:02 jason Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2000/02/19 15:38:23 deraadt Exp $
# $NetBSD: Makefile.inc,v 1.5 1996/02/01 22:33:01 mycroft Exp $
BINDIR= /usr/mdec
@@ -7,8 +7,9 @@ RELOC_SUN4= 0x240000
RELOC_SUN4C= 0x380000
RELOC_SUN4M= 0x440000
-# Note: a `RELOC' value of 0x340000 seems to work on most machines
+# Note: a `RELOC' value of 0x380000 seems to work on most machines
RELOC?= ${RELOC_SUN4C}
+RELOC2!= perl -e 'printf "0x%x", ${RELOC_SUN4C} + 0x10000'
DEFS= -DSTANDALONE -DRELOC=${RELOC} -DSUN4 -DSUN4C -DSUN_BOOTPARAMS
diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile
index dbd73915a88..078cde65973 100644
--- a/sys/arch/sparc/stand/boot/Makefile
+++ b/sys/arch/sparc/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 1998/03/02 07:33:01 johns Exp $
+# $OpenBSD: Makefile,v 1.9 2000/02/19 15:38:24 deraadt Exp $
# $NetBSD: Makefile,v 1.2 1995/09/30 21:43:38 pk Exp $
.PATH: ${.CURDIR}/../common
@@ -14,7 +14,7 @@ CFLAGS= -O2 -I${.CURDIR}/../common -I${.CURDIR}/../../../../arch \
-I${.CURDIR}/../../../.. -I${.CURDIR}/../../../../lib/libsa ${DEFS}
${PROG}: ${OBJS} ${LIBS}
- ${LD} -N -T ${RELOC} -e start ${OBJS} ${LIBSA} ${LIBKERN} ${LIBZ} `cc -print-libgcc-file-name`
+ ${LD} -N -T ${RELOC2} -e start ${OBJS} ${LIBSA} ${LIBKERN} ${LIBZ} `cc -print-libgcc-file-name`
# convert to Sun magic
@size a.out
(echo -n 01 | tr 01 '\01\03'; tail +3c a.out) > ${.TARGET}