Revert the part of Kirks UFS2 commit which added divdi3.c and moddi3.c

to libi386, this issue was resolved already in a cleaner way.

5 files changed, 8 insertions, 11 deletions

diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 3fbdc45..4fd9447 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=		libi386 mbr boot0 btx boot2 cdboot kgzldr loader
+SUBDIR=		mbr boot0 btx boot2 cdboot kgzldr libi386 loader
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 75e4fe3..2883b93 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -75,7 +75,7 @@ boot2.bin: boot2.out
 
 boot2.out: boot2.o sio.o
 	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} \
-		${BTX}/lib/crt0.o boot2.o sio.o ../libi386/libi386.a
+		${BTX}/lib/crt0.o boot2.o sio.o
 
 boot2.o: boot2.h
 
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 75e4fe3..2883b93 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -75,7 +75,7 @@ boot2.bin: boot2.out
 
 boot2.out: boot2.o sio.o
 	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} \
-		${BTX}/lib/crt0.o boot2.o sio.o ../libi386/libi386.a
+		${BTX}/lib/crt0.o boot2.o sio.o
 
 boot2.o: boot2.h
 
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 5c5292b..1268e02 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -4,9 +4,9 @@ LIB=			i386
 INTERNALLIB=		true
 
 SRCS=	aout_freebsd.c biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
-	biospci.c bootinfo.c comconsole.c devicename.c divdi3.c elf_freebsd.c \
-	gatea20.c i386_copy.c i386_module.c moddi3.c nullconsole.c pxe.c \
-	pxetramp.s qdivrem.c time.c vidconsole.c
+	biospci.c bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \
+	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
+	time.c vidconsole.c
 
 CFLAGS+=	-ffreestanding
 BOOT_COMCONSOLE_PORT?= 0x3f8
@@ -39,12 +39,9 @@ beforedepend ${OBJS}: machine
 
 machine:
 	ln -sf ${.CURDIR}/../../../i386/include machine
-	ln -sf ${.CURDIR}/../../../../lib/libc/quad/divdi3.c divdi3.c
-	ln -sf ${.CURDIR}/../../../../lib/libc/quad/moddi3.c moddi3.c
-	ln -sf ${.CURDIR}/../../../../lib/libc/quad/qdivrem.c qdivrem.c
 
 .endif
 
-CLEANFILES+=	machine divdi3.c moddi3.c qdivrem.c
+CLEANFILES+=	machine
 
 .include <bsd.lib.mk>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 8ff4779..0ad1276 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -119,7 +119,7 @@ FILES+=	loader.rc
 
 ${BASE}.sym: ${OBJS} ${LIBI386} ${LIBSTAND} ${LIBFICL} vers.o
 	${CC} ${LDFLAGS} -o ${.TARGET} ${BTXCRT} ${OBJS} vers.o \
-		${LIBFICL} ${LIBI386} ${LIBSTAND} ${LIBI386}
+		${LIBFICL} ${LIBI386} ${LIBSTAND}
 
 # If it's not there, don't consider it a target
 .if exists(${.CURDIR}/../../../i386/include)