Crank boot blocks version because of the compiler change.

10 files changed, 25 insertions, 21 deletions

diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile
index f739a0e7d30..a0061853be5 100644
--- a/sys/arch/mvme88k/stand/bootsd/Makefile
+++ b/sys/arch/mvme88k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.15 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.16 2012/12/01 21:08:48 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=
@@ -28,7 +28,7 @@ all: ${ALL}
 
 bootsd: ${OBJS} ${STAGE2_CRT} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${STAGE2_CRT} ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
+		${STAGE2_CRT} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
 
 install:
 	install ${INSTALL_STRIP} -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme88k/stand/bootsd/version.c b/sys/arch/mvme88k/stand/bootsd/version.c
index 95206d2b981..6e6d363e36f 100644
--- a/sys/arch/mvme88k/stand/bootsd/version.c
+++ b/sys/arch/mvme88k/stand/bootsd/version.c
@@ -1,9 +1,10 @@
-/*	$OpenBSD: version.c,v 1.6 2009/01/18 21:49:11 miod Exp $ */
+/*	$OpenBSD: version.c,v 1.7 2012/12/01 21:08:48 miod Exp $ */
 
 /*
+ *	1.7	compiled with gcc 3.3.5
  *	1.6	allocation area changed to fix netboot buffers overwriting stack
  *	1.5	rewritten crt code, self-relocatable
  *	1.4	kernel loaded with loadfile, a.out and ELF formats
  *	1.3	rewritten startup code and general cleanup
  */
-char *version = "1.6";
+char *version = "1.7";
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index b068fd58ad0..f58f7f4558e 100644
--- a/sys/arch/mvme88k/stand/bootst/Makefile
+++ b/sys/arch/mvme88k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.14 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.15 2012/12/01 21:08:50 miod Exp $
 
 SIZE?=	size
 
@@ -31,7 +31,7 @@ all: ${ALL}
 
 bootst.bug:	${OBJS} ${STAGE1_CRT} ${LIBS}
 	${LD} ${LDFLAGS} ${STAGE1_CRT} -o $@ \
-	    ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
+	    ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
 	@${SIZE} bootst.bug
 
 bootst stboot: bootst.bug ${WRTVID}
diff --git a/sys/arch/mvme88k/stand/bootst/version.c b/sys/arch/mvme88k/stand/bootst/version.c
index fc036572aa5..6d4f5e4e652 100644
--- a/sys/arch/mvme88k/stand/bootst/version.c
+++ b/sys/arch/mvme88k/stand/bootst/version.c
@@ -1,9 +1,10 @@
-/*	$OpenBSD: version.c,v 1.6 2009/01/18 21:49:11 miod Exp $ */
+/*	$OpenBSD: version.c,v 1.7 2012/12/01 21:08:50 miod Exp $ */
 
 /*
+ *	1.7	compiled with gcc 3.3.5
  *	1.6	allocation area changed to fix netboot buffers overwriting stack
  *	1.5	rewritten crt code
  *	1.4	kernel loaded with loadfile, a.out and ELF formats
  *	1.3	rewritten startup code and general cleanup
  */
-char *version = "1.6";
+char *version = "1.7";
diff --git a/sys/arch/mvme88k/stand/bootxx/Makefile b/sys/arch/mvme88k/stand/bootxx/Makefile
index ceecab48be1..c6a45552d8d 100644
--- a/sys/arch/mvme88k/stand/bootxx/Makefile
+++ b/sys/arch/mvme88k/stand/bootxx/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.14 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.15 2012/12/01 21:08:50 miod Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=-DSTAGE2_RELOC=${STAGE2_RELOC}
@@ -27,7 +27,7 @@ all: ${ALL}
 
 bootxx: ${OBJS} ${STAGE1_CRT} ${LIBS}
 	${LD} -S -N -T ${STAGE1_RELOC} ${STAGE1_CRT} -o $@ \
-	    ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
+	    ${OBJS} ${LIBS}
 
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index 32213d415e9..c831d4f0a1b 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.17 2012/12/01 21:08:50 miod Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -28,7 +28,7 @@ all:	netboot.bin
 
 netboot: ${OBJS} ${NETBOOT_CRT} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${NETBOOT_CRT} ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
+		${NETBOOT_CRT} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
 #	@${SIZE} $@
 
 netboot.bin: netboot
diff --git a/sys/arch/mvme88k/stand/netboot/version.c b/sys/arch/mvme88k/stand/netboot/version.c
index dcb0ec1241a..d2e62501a97 100644
--- a/sys/arch/mvme88k/stand/netboot/version.c
+++ b/sys/arch/mvme88k/stand/netboot/version.c
@@ -1,10 +1,11 @@
-/*	$OpenBSD: version.c,v 1.7 2009/01/18 21:49:11 miod Exp $ */
+/*	$OpenBSD: version.c,v 1.8 2012/12/01 21:08:50 miod Exp $ */
 
 /*
+ *	1.8	compiled with gcc 3.3.5
  *	1.7	allocation area changed to fix netboot buffers overwriting stack
  *	1.6	perform MVME197 busswitch initialization
  *	1.5	rewritten crt code, self-relocatable
  *	1.4	kernel loaded with loadfile, a.out and ELF formats
  *	1.3	rewritten startup code and general cleanup
  */
-char *version = "1.7";
+char *version = "1.8";
diff --git a/sys/arch/mvme88k/stand/sboot/Makefile b/sys/arch/mvme88k/stand/sboot/Makefile
index 76536e1f125..3ffbce8d6e7 100644
--- a/sys/arch/mvme88k/stand/sboot/Makefile
+++ b/sys/arch/mvme88k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.7 2012/12/01 21:08:50 miod Exp $
 
 S=	${.CURDIR}/../../../..
 INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -17,12 +17,12 @@ all:	sboot rboot
 
 sboot.tmp:	XSRT0.o oc_cksum.o ${OBJS} ${LIBSA}
 	ld -N -s -static -T 0x4000 XSRT0.o ${OBJS} oc_cksum.o \
-	    -o sboot.tmp ${LIBSA} `cc -print-libgcc-file-name`
+	    -o sboot.tmp ${LIBSA} # `cc -print-libgcc-file-name`
 
 rboot.tmp:	XBUG.o XSRT0.o oc_cksum.o ${OBJS} ${LIBSA}
 	ld -N -s -static -Ttext 0xffa00000 -Tdata 0x4000 \
 	    XBUG.o XSRT0.o ${OBJS} oc_cksum.o -o rboot.tmp ${LIBSA} \
-	    `cc -print-libgcc-file-name`
+	    # `cc -print-libgcc-file-name`
 
 srec:	srec.c
 	${CC} ${.CURDIR}/srec.c -o srec
diff --git a/sys/arch/mvme88k/stand/tftpboot/Makefile b/sys/arch/mvme88k/stand/tftpboot/Makefile
index 34ec6344faa..bc8f1b4d18f 100644
--- a/sys/arch/mvme88k/stand/tftpboot/Makefile
+++ b/sys/arch/mvme88k/stand/tftpboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2012/08/21 14:46:19 pascal Exp $
+#	$OpenBSD: Makefile,v 1.6 2012/12/01 21:08:50 miod Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -26,7 +26,7 @@ all:	tftpboot.bin
 
 tftpboot: ${OBJS} ${NETBOOT_CRT} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${NETBOOT_CRT} ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
+		${NETBOOT_CRT} ${OBJS} ${LIBS} `${CC} -print-libgcc-file-name`
 
 tftpboot.bin: tftpboot
 	${STRIP} tftpboot
diff --git a/sys/arch/mvme88k/stand/tftpboot/version.c b/sys/arch/mvme88k/stand/tftpboot/version.c
index 97248c0589e..28ced8636c1 100644
--- a/sys/arch/mvme88k/stand/tftpboot/version.c
+++ b/sys/arch/mvme88k/stand/tftpboot/version.c
@@ -1,6 +1,7 @@
-/*	$OpenBSD: version.c,v 1.7 2012/11/25 14:10:47 miod Exp $ */
+/*	$OpenBSD: version.c,v 1.8 2012/12/01 21:08:50 miod Exp $ */
 
 /*
+ *	1.8	compiled with gcc 3.3.5
  *	1.7	recognize non-working NIOT configuration and ask the user to
  *		correct it instead of failing to boot silently
  *		tftp server
@@ -11,4 +12,4 @@
  *	1.2	rewritten startup code and general cleanup
  *	1.1	initial revision
  */
-char *version = "1.7";
+char *version = "1.8";