Link with -lgcc like hp300 to pull in the gcc functions that zlib needs.

OK deraadt@

5 files changed, 14 insertions, 12 deletions

diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile
index bb4bd848608..446433c9e4e 100644
--- a/sys/arch/mvme68k/stand/bootsd/Makefile
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.13 2002/04/16 15:37:00 miod Exp $
+#	$OpenBSD: Makefile,v 1.14 2005/08/03 00:16:01 millert Exp $
 
 RELOC=0x6F0000 
 
@@ -19,7 +19,6 @@ CLEANFILES+=bootsd
 SRCS=   boot.c conf.c version.c
 
 LIBS=	${LIBSA} ${LIBBUG} ${LIBZ} 
-#libgcc.a
 
 OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 
@@ -30,7 +29,7 @@ all: ${ALL}
 
 bootsd: ${OBJS} ${BUGCRT} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${BUGCRT} ${OBJS} ${LIBS}
+		${BUGCRT} ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
 #${SRTOBJ}
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile
index 8e58d3cc27b..62d7c1bceb4 100644
--- a/sys/arch/mvme68k/stand/bootst/Makefile
+++ b/sys/arch/mvme68k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.10 2002/04/16 15:37:04 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2005/08/03 00:16:01 millert Exp $
 
 RELOC=0x6F0000 
 SIZE?=	size
@@ -29,7 +29,8 @@ ALL=	${BOOTS}
 all: ${ALL}
 
 bootst.bug:	${OBJS} ${BUGCRT} ${LIBS}
-	${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o $@
+	${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} \
+	    `cc -print-libgcc-file-name` -o $@
 	@${SIZE} bootst.bug
 
 bootst stboot: bootst.bug ${WRTVID}
diff --git a/sys/arch/mvme68k/stand/bootxx/Makefile b/sys/arch/mvme68k/stand/bootxx/Makefile
index 2f0ec26980d..042275f2bac 100644
--- a/sys/arch/mvme68k/stand/bootxx/Makefile
+++ b/sys/arch/mvme68k/stand/bootxx/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.6 2001/08/05 20:37:37 miod Exp $
+#	$OpenBSD: Makefile,v 1.7 2005/08/03 00:16:01 millert Exp $
 
 RELOC=0x10000 
 
@@ -27,7 +27,8 @@ ALL=	${BOOTS}
 all: ${ALL}
 
 bootxx: ${OBJS} ${BUGCRT} ${LIBS}
-	${LD} -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o $@
+	${LD} -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} \
+	    `cc -print-libgcc-file-name` -o $@
 
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile
index c4350a29a9c..638a9a8d03e 100644
--- a/sys/arch/mvme68k/stand/netboot/Makefile
+++ b/sys/arch/mvme68k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2005/02/20 15:34:08 miod Exp $
+#	$OpenBSD: Makefile,v 1.13 2005/08/03 00:16:02 millert Exp $
 
 RELOC=0x6F0000
 SIZE?=	size
@@ -25,7 +25,7 @@ all:	netboot.bin
 
 netboot: ${OBJS} ${BUGCRT} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBS}
+		${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
 	@${SIZE} $@
 
 netboot.bin: netboot
diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile
index 674b04540cd..e606ec8161e 100644
--- a/sys/arch/mvme68k/stand/sboot/Makefile
+++ b/sys/arch/mvme68k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2003/08/19 10:22:30 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2005/08/03 00:16:02 millert Exp $
 
 S=	${.CURDIR}/../../../..
 INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -19,11 +19,12 @@ MDEC_DIR?=/usr/mdec
 all:	sboot rboot
 
 sboot.tmp:	XSRT0.o oc_cksum.o ${OBJS} ${LIBS}
-	${LD} ${LDFLAGS} -T 0x4000 XSRT0.o ${OBJS} oc_cksum.o -o $@ ${LIBS}
+	${LD} ${LDFLAGS} -T 0x4000 XSRT0.o ${OBJS} oc_cksum.o -o $@ \
+	    ${LIBS} `cc -print-libgcc-file-name`
 
 rboot.tmp:	XBUG.o XSRT0.o oc_cksum.o ${OBJS} ${LIBS}
 	${LD} ${LDFLAGS} -T 0xffa00000 -Tdata 0x4000 XBUG.o XSRT0.o \
-	    ${OBJS} oc_cksum.o -o $@ ${LIBS}
+	    ${OBJS} oc_cksum.o -o $@ ${LIBS} `cc -print-libgcc-file-name`
 
 srec:	srec.c
 	${HOSTCC} -o $@ ${.CURDIR}/srec.c