From fd3cd56c5876d53b6c02e5b0821c0039831c6b6d Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Sun, 25 Nov 2007 18:25:37 +0000 Subject: 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.. --- sys/arch/mvme68k/conf/Makefile.mvme68k | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'sys/arch/mvme68k/conf') diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k index b754748e0ed..a2a1efa2c73 100644 --- a/sys/arch/mvme68k/conf/Makefile.mvme68k +++ b/sys/arch/mvme68k/conf/Makefile.mvme68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme68k,v 1.29 2007/11/25 11:23:33 deraadt Exp $ +# $OpenBSD: Makefile.mvme68k,v 1.30 2007/11/25 18:25:28 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -54,14 +54,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 - ### for the Motorola 68040 Floating Point Software Product .include "${M68K}/fpsp/Makefile.inc" @@ -87,7 +79,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP} ${060SP} ${LIBKERN} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP} ${060SP} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ @@ -120,6 +112,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} -- cgit v1.2.3