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

6 files changed, 41 insertions, 46 deletions

diff --git a/sys/arch/vax/boot/boot/Makefile b/sys/arch/vax/boot/boot/Makefile
index 1999af6e674..145d023ba81 100644
--- a/sys/arch/vax/boot/boot/Makefile
+++ b/sys/arch/vax/boot/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2005/07/30 16:36:09 millert Exp $
+#	$OpenBSD: Makefile,v 1.7 2007/11/25 18:25:33 deraadt Exp $
 #	$NetBSD: Makefile,v 1.27 2002/04/07 07:00:25 matt Exp $
 
 S!=	cd ${.CURDIR}/../../../../; pwd
@@ -32,12 +32,7 @@ CFLAGS+=-I${S}/lib/libsa
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ=	${ZLIB}
 
-#KERN_AS=library
-#.include "${S}/lib/libkern/Makefile.inc"
-#LIBKERN=${KERNLIB}
-
-# Only need these from libkern
-.PATH:	${S}/lib/libkern
+.PATH:	${S}/lib/libkern/arch/vax ${S}/lib/libkern
 SRCS+= moddi3.c negdi2.c
 
 .if ${MACHINE} == "vax"
@@ -56,9 +51,9 @@ CLEANFILES+= machine ${MACHINE_ARCH}
 START=nisse
 #.endif
 
-${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ}
 	${LD} -N -Ttext ${RELOC} -e ${START} -o ${PROG}.sym -Llib/sa -L. ${OBJS} \
-	    ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
+	    ${LIBSA} ${LIBZ} ${LIBSA}
 	/usr/sbin/mopa.out ${PROG}.sym ${PROG}.mop
 	/bin/cp ${PROG}.sym ${PROG}
 	/usr/bin/strip ${PROG}
diff --git a/sys/arch/vax/boot/xxboot/Makefile b/sys/arch/vax/boot/xxboot/Makefile
index 3b10714a293..b20744469d5 100644
--- a/sys/arch/vax/boot/xxboot/Makefile
+++ b/sys/arch/vax/boot/xxboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2006/07/04 21:43:53 martin Exp $
+#	$OpenBSD: Makefile,v 1.7 2007/11/25 18:25:33 deraadt Exp $
 #	$NetBSD: Makefile,v 1.12 2002/02/24 01:04:25 matt Exp $
 
 S=	${.CURDIR}/../../../../
@@ -29,10 +29,6 @@ SA_AS=	library
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=	${SALIB}
 
-#KERN_AS=library
-#.include "${S}/lib/libkern/Makefile.inc"
-#LIBKERN=${KERNLIB}
-
 .if ${MACHINE} == "vax"
 .PHONY: machine-links
 beforedepend: machine-links
@@ -43,9 +39,8 @@ machine-links:
 CLEANFILES+= machine ${MACHINE_ARCH} ${PROG}.out
 .endif
 
-${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
-	${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA}
+	${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA}
 	/usr/bin/strip ${PROG}.out
 	/usr/bin/size ${PROG}.out
 	/bin/dd if=${PROG}.out of=${PROG} bs=32 skip=1
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index da991ff7aff..5c934e6cfa5 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.vax,v 1.29 2007/11/25 11:23:33 deraadt Exp $
+#	$OpenBSD: Makefile.vax,v 1.30 2007/11/25 18:25:29 deraadt Exp $
 #	$NetBSD: Makefile.vax,v 1.49 1999/07/26 05:20:49 cgd Exp $
 
 # Makefile for OpenBSD/vax
@@ -81,15 +81,6 @@ HOSTED_CC=	${CC}
 HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
 HOSTED_CFLAGS=	${CFLAGS}
 
-### find out what to use for libkern
-KERN_AS=	obj
-.include "$S/lib/libkern/Makefile.inc"
-.ifndef PROF
-LIBKERN=	${KERNLIB}
-.else
-LIBKERN=        ${KERNLIB_PROF}
-.endif
-
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
@@ -104,7 +95,7 @@ HOSTED_C=	${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	intvec.o subr.o param.o ioconf.o ${OBJS} ${LIBKERN}
+SYSTEM_OBJ=	intvec.o subr.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; \
@@ -136,6 +127,9 @@ param.c: $S/conf/param.c
 param.o: param.c Makefile
 	${NORMAL_C}
 
+mcount.o: $S/lib/libkern/mcount.c Makefile
+	${NORMAL_C_NOP}
+
 ioconf.o: ioconf.c
 	${NORMAL_C}
 
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index f0ad81a3583..61c7973ae4e 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.vax,v 1.43 2007/06/01 22:01:52 maja Exp $
+#	$OpenBSD: files.vax,v 1.44 2007/11/25 18:25:29 deraadt Exp $
 #	$NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
 #
 # new style config file for vax architecture
@@ -415,3 +415,24 @@ include	"compat/vax1k/files.vax1k"
 #arch/vax/if/if_pcl.c		optional pcl device-driver
 #arch/vax/if/if_vv.c		optional vv device-driver
 #arch/vax/if/raw_hy.c		optional hy device-driver
+
+# quad support is neccessary for 32 bit architectures
+file	lib/libkern/adddi3.c
+file	lib/libkern/anddi3.c
+file	lib/libkern/ashldi3.c
+file	lib/libkern/ashrdi3.c
+file	lib/libkern/cmpdi2.c
+file	lib/libkern/divdi3.c
+file	lib/libkern/iordi3.c
+file	lib/libkern/lshldi3.c
+file	lib/libkern/lshrdi3.c
+file	lib/libkern/moddi3.c
+file	lib/libkern/muldi3.c
+file	lib/libkern/negdi2.c
+file	lib/libkern/notdi2.c
+file	lib/libkern/qdivrem.c
+file	lib/libkern/subdi3.c
+file	lib/libkern/ucmpdi2.c
+file	lib/libkern/udivdi3.c
+file	lib/libkern/umoddi3.c
+file	lib/libkern/xordi3.c
diff --git a/sys/arch/vax/stand/boot/Makefile b/sys/arch/vax/stand/boot/Makefile
index 1999af6e674..145d023ba81 100644
--- a/sys/arch/vax/stand/boot/Makefile
+++ b/sys/arch/vax/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2005/07/30 16:36:09 millert Exp $
+#	$OpenBSD: Makefile,v 1.7 2007/11/25 18:25:33 deraadt Exp $
 #	$NetBSD: Makefile,v 1.27 2002/04/07 07:00:25 matt Exp $
 
 S!=	cd ${.CURDIR}/../../../../; pwd
@@ -32,12 +32,7 @@ CFLAGS+=-I${S}/lib/libsa
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ=	${ZLIB}
 
-#KERN_AS=library
-#.include "${S}/lib/libkern/Makefile.inc"
-#LIBKERN=${KERNLIB}
-
-# Only need these from libkern
-.PATH:	${S}/lib/libkern
+.PATH:	${S}/lib/libkern/arch/vax ${S}/lib/libkern
 SRCS+= moddi3.c negdi2.c
 
 .if ${MACHINE} == "vax"
@@ -56,9 +51,9 @@ CLEANFILES+= machine ${MACHINE_ARCH}
 START=nisse
 #.endif
 
-${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ}
 	${LD} -N -Ttext ${RELOC} -e ${START} -o ${PROG}.sym -Llib/sa -L. ${OBJS} \
-	    ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
+	    ${LIBSA} ${LIBZ} ${LIBSA}
 	/usr/sbin/mopa.out ${PROG}.sym ${PROG}.mop
 	/bin/cp ${PROG}.sym ${PROG}
 	/usr/bin/strip ${PROG}
diff --git a/sys/arch/vax/stand/xxboot/Makefile b/sys/arch/vax/stand/xxboot/Makefile
index 3b10714a293..b20744469d5 100644
--- a/sys/arch/vax/stand/xxboot/Makefile
+++ b/sys/arch/vax/stand/xxboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2006/07/04 21:43:53 martin Exp $
+#	$OpenBSD: Makefile,v 1.7 2007/11/25 18:25:33 deraadt Exp $
 #	$NetBSD: Makefile,v 1.12 2002/02/24 01:04:25 matt Exp $
 
 S=	${.CURDIR}/../../../../
@@ -29,10 +29,6 @@ SA_AS=	library
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=	${SALIB}
 
-#KERN_AS=library
-#.include "${S}/lib/libkern/Makefile.inc"
-#LIBKERN=${KERNLIB}
-
 .if ${MACHINE} == "vax"
 .PHONY: machine-links
 beforedepend: machine-links
@@ -43,9 +39,8 @@ machine-links:
 CLEANFILES+= machine ${MACHINE_ARCH} ${PROG}.out
 .endif
 
-${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
-	${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA}
+	${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA}
 	/usr/bin/strip ${PROG}.out
 	/usr/bin/size ${PROG}.out
 	/bin/dd if=${PROG}.out of=${PROG} bs=32 skip=1