Really pass -fno-stack-protector in CFLAGS as intended, and define the

load addresses in one single place; from mvme88k

5 files changed, 18 insertions, 20 deletions

diff --git a/sys/arch/mvme68k/stand/Makefile.inc b/sys/arch/mvme68k/stand/Makefile.inc
index 74e40359210..a05b612bd09 100644
--- a/sys/arch/mvme68k/stand/Makefile.inc
+++ b/sys/arch/mvme68k/stand/Makefile.inc
@@ -1,4 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2005/12/30 02:03:49 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.7 2006/01/10 07:36:29 miod Exp $
 
 MDEC_DIR?=/usr/mdec
 CFLAGS+=	-fno-stack-protector
+
+# Load addresses for first and second stage bootstraps
+STAGE1_RELOC=0x10000 
+STAGE2_RELOC=0x6F0000 
diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile
index 6c62f43e883..379d95b01ba 100644
--- a/sys/arch/mvme68k/stand/bootsd/Makefile
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile
@@ -1,14 +1,12 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.15 2006/01/10 07:20:08 deraadt Exp $
-
-RELOC=0x6F0000 
+#	$OpenBSD: Makefile,v 1.16 2006/01/10 07:36:31 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS= 
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
-CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
-LDFLAGS=-N -T ${RELOC}
+CFLAGS+=-O2 ${INCPATH} ${DEFS} ${COPTS}
+LDFLAGS=-N -T ${STAGE2_RELOC}
 CLEANFILES+=bootsd
 
 .include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile
index 62d7c1bceb4..3167ba77f01 100644
--- a/sys/arch/mvme68k/stand/bootst/Makefile
+++ b/sys/arch/mvme68k/stand/bootst/Makefile
@@ -1,14 +1,13 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.11 2005/08/03 00:16:01 millert Exp $
+#	$OpenBSD: Makefile,v 1.12 2006/01/10 07:36:32 miod Exp $
 
-RELOC=0x6F0000 
 SIZE?=	size
 
 S=	${.CURDIR}/../../../..
 DEFS= 
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
-CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
+CFLAGS+=-O2 ${INCPATH} ${DEFS} ${COPTS}
 CLEANFILES+=stboot bootst bootst.bug
 
 .include "${S}/arch/mvme68k/stand/wrtvid/Makefile.inc"
@@ -29,7 +28,7 @@ ALL=	${BOOTS}
 all: ${ALL}
 
 bootst.bug:	${OBJS} ${BUGCRT} ${LIBS}
-	${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} \
+	${LD} -s -N -T ${STAGE2_RELOC} ${BUGCRT} ${OBJS} ${LIBS} \
 	    `cc -print-libgcc-file-name` -o $@
 	@${SIZE} bootst.bug
 
diff --git a/sys/arch/mvme68k/stand/bootxx/Makefile b/sys/arch/mvme68k/stand/bootxx/Makefile
index 042275f2bac..59d34eba02a 100644
--- a/sys/arch/mvme68k/stand/bootxx/Makefile
+++ b/sys/arch/mvme68k/stand/bootxx/Makefile
@@ -1,13 +1,11 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.7 2005/08/03 00:16:01 millert Exp $
-
-RELOC=0x10000 
+#	$OpenBSD: Makefile,v 1.8 2006/01/10 07:36:32 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS= 
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
-CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
+CFLAGS+=-O2 ${INCPATH} ${DEFS} ${COPTS}
 CLEANFILES+=bootxx
 
 .include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
@@ -27,7 +25,7 @@ ALL=	${BOOTS}
 all: ${ALL}
 
 bootxx: ${OBJS} ${BUGCRT} ${LIBS}
-	${LD} -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} \
+	${LD} -N -T ${STAGE1_RELOC} ${BUGCRT} ${OBJS} ${LIBS} \
 	    `cc -print-libgcc-file-name` -o $@
 
 install:
diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile
index 638a9a8d03e..967c9eb97b3 100644
--- a/sys/arch/mvme68k/stand/netboot/Makefile
+++ b/sys/arch/mvme68k/stand/netboot/Makefile
@@ -1,13 +1,12 @@
-#	$OpenBSD: Makefile,v 1.13 2005/08/03 00:16:02 millert Exp $
+#	$OpenBSD: Makefile,v 1.14 2006/01/10 07:36:32 miod Exp $
 
-RELOC=0x6F0000
 SIZE?=	size
 
 S=	${.CURDIR}/../../../..
-DEFS= -DSUN_BOOTPARAMS -DRELOC=${RELOC}
+DEFS= -DSUN_BOOTPARAMS -DRELOC=${STAGE2_RELOC}
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${S} -I${S}/lib/libsa
-CFLAGS=	-O2 ${DEFS} ${INCPATH} ${COPTS}
+CFLAGS+=	-O2 ${DEFS} ${INCPATH} ${COPTS}
 CLEANFILES+=netboot netboot.bin
 
 .include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
@@ -19,7 +18,7 @@ SRCS=   boot.c conf.c version.c devopen.c dev_net.c
 SRCS+=	if_ie.c if_le.c
 OBJS=  ${SRCS:S/.c/.o/g}
 LIBS= ${LIBSA} ${LIBBUG} ${LIBZ}
-LDFLAGS+= -nostdlib -s -N -T ${RELOC}
+LDFLAGS+= -nostdlib -s -N -T ${STAGE2_RELOC}
 
 all:	netboot.bin