libkern, begone. Move to a new mechanism where config(8)'s "file"

directive can select between MI and MD versions of these files.  At
the same time, adjust the boot programs to pick exactly what they need,
instead of the 7 or 8 mechanisms previously used.

There will be some fallout from this, but testing it all by myself is a
ridiculously slow process; it will be finished in-tree.

Various developers were very nice and avoided making fun of me when I
was gibbering in the corner..

1 files changed, 6 insertions, 2 deletions

diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile
index 2846ebf7df5..8f8cef36591 100644
--- a/sys/arch/sparc/stand/boot/Makefile
+++ b/sys/arch/sparc/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2007/10/30 06:03:16 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.14 2007/11/25 18:25:33 deraadt Exp $
 #	$NetBSD: Makefile,v 1.2 1995/09/30 21:43:38 pk Exp $
 
 .PATH:	${.CURDIR}/../common
@@ -7,16 +7,20 @@ PROG=	boot
 
 NOMAN=	noman
 INSTALL_STRIP=
+S=	${.CURDIR}/../../../..
 
 SRCS=	srt0.S boot.c conf.c dvma.c net.c netif_sun.c promdev.c version.c
 SRCS+=	loadfile.c
 
+.PATH:	${S}/lib/libkern/arch/sparc ${S}/lib/libkern
+SRCS+=	bzero.S strlen.c mul.S umul.S strcmp.S sdiv.S urem.S udiv.S rem.S
+
 CFLAGS=	-O2 -I${.CURDIR}/../common -I${.CURDIR}/../../../../arch \
 	-I${.CURDIR}/../../../.. -I${.CURDIR}/../../../../lib/libsa ${DEFS} \
 	-DSPARC_BOOT_AOUT -DSPARC_BOOT_ELF
 
 CLEANFILES+=${PROG}.aout ${PROG}.elf elfclean
-LIBS=${LIBSA} ${LIBKERN} ${LIBZ}
+LIBS=${LIBSA} ${LIBZ}
 
 elfclean: clean-elf.c
 	${HOSTCC} -o elfclean ${.ALLSRC}