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, 12 insertions, 22 deletions

diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 84740c25be5..57bbde8a6fe 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.5 2007/11/25 11:23:33 deraadt Exp $
+#	$OpenBSD: Makefile.landisk,v 1.6 2007/11/25 18:25:28 deraadt Exp $
 #
 # Makefile for OpenBSD/landisk
 #
@@ -56,14 +56,6 @@ HOSTCC?=	${CC}
 HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
 HOSTED_CFLAGS=	${CFLAGS}
 
-### find out what to use for libkern
-.include "$S/lib/libkern/Makefile.inc"
-.ifndef PROF
-LIBKERN=	${KERNLIB}
-.else
-LIBKERN=	${KERNLIB_PROF}
-.endif
-
 # compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
 # where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
 # capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
@@ -93,7 +85,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=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
@@ -127,6 +119,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}
+
 ioconf.o: ioconf.c
 	${NORMAL_C}
 
@@ -180,7 +175,6 @@ assym.h machdep.o: Makefile
 # depend on CPU configuration
 locore.o machdep.o: Makefile
 
-
 locore.o: ${LANDISK}/landisk/locore.S assym.h
 	${NORMAL_S}
 
diff --git a/sys/arch/landisk/stand/boot/Makefile b/sys/arch/landisk/stand/boot/Makefile
index 29479c96489..141c97d8192 100644
--- a/sys/arch/landisk/stand/boot/Makefile
+++ b/sys/arch/landisk/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2006/11/12 19:37:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2007/11/25 18:25:32 deraadt Exp $
 
 PROG=	boot
 SRCS=	srt0.S conf.c devs.c getsecs.c scifcons.c delay.c
@@ -17,6 +17,9 @@ CFLAGS+=-m4-nofpu
 .PATH:  ${S}/stand/boot
 SRCS+=	boot.c cmd.c vars.c bootarg.c
 
+.PATH:	${S}/lib/libkern/arch/sh ${S}/lib/libkern
+SRCS+=	strlen.c strlcpy.c
+
 SAREL=
 SA_ZLIB=
 USE_LOADFILE=
@@ -26,11 +29,6 @@ SRCS+=	ctime.c strtol.c
 DPADD+= $(SALIB)
 LDADD+= $(SALIB)
 
-KERN_AS?=	library
-.include "${S}/lib/libkern/Makefile.inc"
-DPADD+= $(KERNLIB)
-LDADD+= $(KERNLIB)
-
 Z_AS?=	library
 .include "${S}/lib/libz/Makefile.inc"
 DPADD+= $(ZLIB)
diff --git a/sys/arch/landisk/stand/xxboot/Makefile b/sys/arch/landisk/stand/xxboot/Makefile
index c0b34aba72f..83055ec07cd 100644
--- a/sys/arch/landisk/stand/xxboot/Makefile
+++ b/sys/arch/landisk/stand/xxboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2006/11/08 20:03:32 drahn Exp $
+#	$OpenBSD: Makefile,v 1.4 2007/11/25 18:25:32 deraadt Exp $
 
 MAN=	xxboot.8
 
@@ -27,10 +27,8 @@ SAREL=
 DPADD+= $(SALIB)
 LDADD+= $(SALIB)
 
-KERN_AS?=	library
-.include "${S}/lib/libkern/Makefile.inc"
-DPADD+= $(KERNLIB)
-LDADD+= $(KERNLIB)
+.PATH:	${S}/lib/libkern/arch/sh ${S}/lib/libkern
+SRCS+=	strlen.c
 
 LIBGCC!=${CC} -print-libgcc-file-name
 LDADD+= $(LIBGCC)