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..

3 files changed, 10 insertions, 50 deletions

diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 9ab40a13c2b..5724e394797 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.17 2007/11/25 11:23:33 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.18 2007/11/25 18:25:29 deraadt Exp $
 
 # Makefile for OpenBSD
 #
@@ -61,14 +61,6 @@ AFLAGS=		-x assembler-with-cpp -traditional-cpp \
 		-mno-abicalls ${ABI} -D_LOCORE
 STRIPFLAGS=	-g -X -x
 
-### find out what to use for libkern
-.include "$S/lib/libkern/Makefile.inc"
-.ifndef PROF
-LIBKERN=	${KERNLIB}
-.else
-LIBKERN=	${KERNLIB_PROF}
-.endif
-
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
 NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
@@ -85,7 +77,7 @@ NORMAL_S_C=	${AS}  ${COPTS} ${PARAM} $< -o $@
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o param.o ioconf.o ${OBJS} ${LIBKERN}
+SYSTEM_OBJ=	locore.o param.o ioconf.o ${OBJS}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	rm -f $@
 SYSTEM_LD=	@if [ X${DEBUG} = X-g ]; \
@@ -166,6 +158,9 @@ param.c: $S/conf/param.c
 param.o: param.c Makefile
 	${NORMAL_C_C}
 
+mcount.o: $S/lib/libkern/mcount.c Makefile
+	${NORMAL_C_NOP}
+
 newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
diff --git a/sys/arch/sgi/stand/boot/Makefile b/sys/arch/sgi/stand/boot/Makefile
index 92cdb5fbc72..6d4be9b4d82 100644
--- a/sys/arch/sgi/stand/boot/Makefile
+++ b/sys/arch/sgi/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2005/07/21 13:22:53 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2007/11/25 18:25:32 deraadt Exp $
 
 
 PROG=		boot
@@ -18,6 +18,9 @@ SRCS=		start.S boot.c filesystem.c conf.c diskio.c arcbios.c strstr.c
 
 CLEANFILES+= machine mips64
 
+.PATH:		${S}/lib/libkern/arch/mips64 ${S}/lib/libkern
+SRCS+=		strlcpy.c memcpy.c strlen.c strrchr.c strlcat.c ashrdi3.c
+
 .if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
 .BEGIN:
 	@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
@@ -26,7 +29,7 @@ CLEANFILES+= machine mips64
 
 ${PROG}: $(OBJS) $(LDADD)
 	$(LD) $(LDFLAGS) -o boot $(OBJS) -L${LIBSADIR} ${LIBSA} \
-	-L${LIBZDIR} ${LIBZ} -L${LIBKERNDIR} ${LIBKERN}
+	-L${LIBZDIR} ${LIBZ}
 
 
 install:
diff --git a/sys/arch/sgi/stand/libkern/Makefile b/sys/arch/sgi/stand/libkern/Makefile
deleted file mode 100644
index e90e17c4408..00000000000
--- a/sys/arch/sgi/stand/libkern/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#	$OpenBSD: Makefile,v 1.5 2005/07/21 13:23:01 deraadt Exp $
-
-LIB=	kern
-
-.PATH:	${.CURDIR}/../../../../lib/libkern
-
-CFLAGS= -O2 ${SAABI} -mno-abicalls -D_NO_ABICALLS ${STANDALONE} \
-	-nostdinc -I${.CURDIR}/../include -I${.CURDIR}/../../../.. \
-	-I${.CURDIR}/../../../../lib/libkern \
-	-I${.CURDIR}/../../../../lib/libkern/arch/mips64 -I${.CURDIR} \
-	-I${.OBJDIR}
-
-AFLAGS=	-x assembler-with-cpp -traditional-cpp -I${.CURDIR}/../include \
-	-I${.CURDIR}/../../../..  -I${.CURDIR}/../../../../lib/libkern \
-	-I${.CURDIR}/../../../../lib/libkern/arch/mips64 \
-	-I${.OBJDIR}
-
-# kern routines
-SRCS=	__main.c ashrdi3.c bzero.c divdi3.c qdivrem.c strlen.c \
-	strcmp.c strlcat.c strlcpy.c strncmp.c umoddi3.c udivdi3.c \
-	moddi3.c
-
-${OBJS}:	${.CURDIR}/../Makefile.inc
-
-CLEANFILES += machine mips64
-
-NOPROFILE=
-NOPIC=
-
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
-.BEGIN:
-	@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
-	@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)
-.endif
-
-install:
-
-.include <bsd.lib.mk>