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

4 files changed, 17 insertions, 17 deletions

diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 5b27d0a3bdc..53010eb3bd5 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.26 2007/11/25 11:23:33 deraadt Exp $
+#	$OpenBSD: Makefile.macppc,v 1.27 2007/11/25 18:25:28 deraadt Exp $
 #
 # Makefile for OpenBSD PowerPC
 #
@@ -55,14 +55,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
@@ -92,7 +84,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; \
@@ -124,6 +116,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}
 
diff --git a/sys/arch/macppc/stand/Makefile b/sys/arch/macppc/stand/Makefile
index 2637b213d74..c7664776f1b 100644
--- a/sys/arch/macppc/stand/Makefile
+++ b/sys/arch/macppc/stand/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2005/07/20 19:40:04 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2007/11/25 18:25:32 deraadt Exp $
 #	$NetBSD: Makefile,v 1.1 1996/09/30 16:34:59 ws Exp $
 
 SUBDIR=	ofwboot boot.mac mbr tbxidata
@@ -13,12 +13,11 @@ USE_LOADFILE=yes
 .include "Makefile.inc"
 .include "$S/lib/libz/Makefile.inc"
 .include "$S/lib/libsa/Makefile.inc"
-.include "$S/lib/libkern/Makefile.inc"
 
-all:	${ZLIB} ${SALIB} ${KERNLIB} _SUBDIRUSE
+all:	${ZLIB} ${SALIB} _SUBDIRUSE
 
 libdep:
-	@echo ${.OBJDIR}/${SALIB} ${ZLIB} ${KERNLIB}
+	@echo ${.OBJDIR}/${SALIB} ${ZLIB}
 
 
 ${PROG}:	
diff --git a/sys/arch/macppc/stand/boot.mac/Makefile b/sys/arch/macppc/stand/boot.mac/Makefile
index 524e13c334b..b355ec6c4d0 100644
--- a/sys/arch/macppc/stand/boot.mac/Makefile
+++ b/sys/arch/macppc/stand/boot.mac/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2007/06/13 02:17:32 drahn Exp $
+#	$OpenBSD: Makefile,v 1.4 2007/11/25 18:25:32 deraadt Exp $
 #       $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
 
 S=      ${.CURDIR}/../../../..
@@ -20,6 +20,9 @@ LDFLAGS=	-X -Ttext ${RELOC} -e $(ENTRY) -T ${.CURDIR}/elf32_powerpc_merge.x -Bst
 .PATH:          ${S}/stand/boot
 .PATH:          ${S}/lib/libsa
 
+.PATH:		${S}/lib/libkern/arch/powerpc ${S}/lib/libkern
+SRCS+=		strlcpy.c memcpy.c strlen.c strrchr.c strlcat.c ashrdi3.c
+
 CPPFLAGS+=	-I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
 CPPFLAGS+=	-DRELOC=0x${RELOC} -DCONSPEED=57600
 CPPFLAGS+=	-DXCOFF_GLUE		# for booting PCI Powermacs
diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile
index fb3d67ef14f..b9c49aed2ef 100644
--- a/sys/arch/macppc/stand/ofwboot/Makefile
+++ b/sys/arch/macppc/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2007/06/13 02:17:32 drahn Exp $
+#	$OpenBSD: Makefile,v 1.5 2007/11/25 18:25:32 deraadt Exp $
 #	$NetBSD: Makefile,v 1.2 1997/04/17 07:46:24 thorpej Exp $
 
 S=	${.CURDIR}/../../../..
@@ -20,6 +20,9 @@ BINDIR=         /usr/mdec
 .PATH:          ${S}/stand/boot
 .PATH:          ${S}/lib/libsa
 
+.PATH:		${S}/lib/libkern/arch/powerpc ${S}/lib/libkern
+SRCS+=		strlcpy.c memcpy.c strlen.c strrchr.c strlcat.c ashrdi3.c
+
 NEWVERSWHAT=	"OpenFirmware Boot"
 
 # For now...
@@ -32,7 +35,7 @@ CPPFLAGS+=	-DRELOC=0x${RELOC} -DCONSPEED=57600
 
 LIBS!=          cd $(.CURDIR)/$(R); $(MAKE) libdep
 
-${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA} ${LIBZ}
 	${LD} -N -X -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \
 	    ${OBJS} ${LIBS}