cope with the ___moddi3 issue, same as mvme68k

6 files changed, 16 insertions, 14 deletions

diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile
index 798e6fb424b..34000605cb5 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.10 2003/10/01 20:39:41 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2005/09/11 13:36:00 deraadt Exp $
 
       
 S=	${.CURDIR}/../../../..
@@ -28,7 +28,7 @@ all: ${ALL}
 
 bootsd: ${OBJS} ${STAGE2} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${STAGE2} ${OBJS} ${LIBS}
+		${STAGE2} ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
 
 install:
 	install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index 6fc4d43b668..44e4fe2867c 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.10 2003/10/01 20:39:41 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2005/09/11 13:36:00 deraadt Exp $
 
 SIZE?=	size
 
@@ -30,7 +30,7 @@ all: ${ALL}
 
 bootst.bug:	${OBJS} ${SINGLE} ${LIBS}
 	${LD} ${LDFLAGS} ${SINGLE} -o $@ \
-	    ${OBJS} ${LIBS}
+	    ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
 	@${SIZE} bootst.bug
 
 bootst stboot: bootst.bug ${WRTVID}
diff --git a/sys/arch/mvme88k/stand/bootxx/Makefile b/sys/arch/mvme88k/stand/bootxx/Makefile
index a3a2b369bbb..234439b4656 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.9 2003/10/01 20:39:41 miod Exp $
+#	$OpenBSD: Makefile,v 1.10 2005/09/11 13:36:00 deraadt Exp $
 
 S=	${.CURDIR}/../../../..
 DEFS=-DSTAGE2_RELOC=${STAGE2_RELOC} 
@@ -26,7 +26,7 @@ all: ${ALL}
 
 bootxx: ${OBJS} ${STAGE1} ${LIBS}
 	${LD} -N -T ${STAGE1_RELOC} ${STAGE1} -o $@ \
-	    ${OBJS} ${LIBS}
+	    ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
 
 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 138c4786dba..f1329bb8ad2 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2003/10/01 22:50:29 miod Exp $
+#	$OpenBSD: Makefile,v 1.13 2005/09/11 13:36:00 deraadt Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -28,7 +28,7 @@ all:	netboot.bin
 
 netboot: ${OBJS} ${SINGLE} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${SINGLE} ${OBJS} ${LIBS}
+		${SINGLE} ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
 #	@${SIZE} $@
 
 netboot.bin: netboot
diff --git a/sys/arch/mvme88k/stand/sboot/Makefile b/sys/arch/mvme88k/stand/sboot/Makefile
index aaf1eec8a88..20554c2a17c 100644
--- a/sys/arch/mvme88k/stand/sboot/Makefile
+++ b/sys/arch/mvme88k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2000/03/03 00:54:54 todd Exp $
+#	$OpenBSD: Makefile,v 1.5 2005/09/11 13:36:00 deraadt Exp $
 
 S=	${.CURDIR}/../../../..
 INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -15,11 +15,13 @@ MDEC_DIR?=/usr/mdec
 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}
+	ld -N -s -static -T 0x4000 XSRT0.o ${OBJS} oc_cksum.o \
+	    -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}
+	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`
 
 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 5ee68e2aed2..bba1949c4b8 100644
--- a/sys/arch/mvme88k/stand/tftpboot/Makefile
+++ b/sys/arch/mvme88k/stand/tftpboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2004/01/26 19:48:34 miod Exp $
+#	$OpenBSD: Makefile,v 1.2 2005/09/11 13:36:00 deraadt Exp $
 
 SIZE?=	size
 STRIP?= strip
@@ -26,7 +26,7 @@ all:	tftpboot.bin
 
 tftpboot: ${OBJS} ${SINGLE} ${LIBS}
 	${LD} ${LDFLAGS} -o $@ \
-		${SINGLE} ${OBJS} ${LIBS}
+		${SINGLE} ${OBJS} ${LIBS} `cc -print-libgcc-file-name`
 #	@${SIZE} $@
 
 tftpboot.bin: tftpboot