1 files changed, 6 insertions, 11 deletions

diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 7a7ab1b01423..617cb658a8c4 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-#	$Id: Makefile,v 1.30 1997/04/02 16:49:18 jdp Exp $
+#	$Id: Makefile,v 1.31 1997/04/30 03:12:09 msmith Exp $
 
 CFLAGS+=        -DLIBC_SCCS -fno-omit-frame-pointer -I${.CURDIR}
 OBJS=		crt0.o c++rt0.o gcrt0.o scrt0.o sgcrt0.o
@@ -13,13 +13,11 @@ all: ${OBJS}
 
 crt0.o: crt0.c
 	${CC} ${CFLAGS} -c -DCRT0 -DDYNAMIC ${.CURDIR}/crt0.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv -f a.out ${.TARGET}
+	${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 c++rt0.o: c++rt0.c
 	${CC} ${CFLAGS} -fpic -c ${.CURDIR}/c++rt0.c
-	@${LD} -x -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
+	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 #
 # gcrt0.o doesn't really depend on crt0.o, but this is the easiest way
@@ -27,20 +25,17 @@ c++rt0.o: c++rt0.c
 #
 gcrt0.o: crt0.o
 	${CC} ${CFLAGS} -c -DMCRT0 -DDYNAMIC ${.CURDIR}/crt0.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv -f a.out ${.TARGET}
+	${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 # dependencies fudged as for gcrt0.o
 scrt0.o: crt0.o
 	${CC} ${CFLAGS} -c -DCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv -f a.out ${.TARGET}
+	${LD} -O ${TARGET} -x -r ${.TARGET}
 
 # dependencies fudged as for gcrt0.o
 sgcrt0.o: scrt0.o
 	${CC} ${CFLAGS} -c -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
-	${LD} -x -r ${.TARGET}
-	mv -f a.out ${.TARGET}
+	${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 beforeinstall:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/dlfcn.h \