diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-25 18:25:37 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-25 18:25:37 +0000 |
| commit | fd3cd56c5876d53b6c02e5b0821c0039831c6b6d (patch) | |
| tree | 3d877f0b245dd0e07d6c535cd77daf7b8459efe5 /sys/arch/alpha/conf | |
| parent | 98824d13d14295a8c20e3c51cd80ca8e90e5c383 (diff) | |
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..
Diffstat (limited to 'sys/arch/alpha/conf')
| -rw-r--r-- | sys/arch/alpha/conf/Makefile.alpha | 15 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/files.alpha | 13 |
2 files changed, 17 insertions, 11 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 5435fc97c1f..6a36714be28 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.alpha,v 1.40 2007/11/25 11:23:33 deraadt Exp $ +# $OpenBSD: Makefile.alpha,v 1.41 2007/11/25 18:25:25 deraadt Exp $ # $NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $ # Makefile for OpenBSD @@ -50,14 +50,6 @@ HOSTED_CC= ${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} where TYPE is NORMAL or # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file). @@ -77,7 +69,7 @@ HOSTED_C= ${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${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; \ @@ -109,6 +101,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/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index c276f5135eb..c979e7e444a 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: files.alpha,v 1.82 2007/06/08 22:57:42 jasper Exp $ +# $OpenBSD: files.alpha,v 1.83 2007/11/25 18:25:25 deraadt Exp $ # $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $ # # alpha-specific configuration info @@ -355,3 +355,14 @@ include "dev/bluetooth/files.bluetooth" # Machine-independent 1-Wire drivers # include "dev/onewire/files.onewire" + +# Machine-dependent libkern components +file lib/libkern/softfloat.c +file lib/libkern/arch/alpha/__divl.S +file lib/libkern/arch/alpha/__divlu.S +file lib/libkern/arch/alpha/__divq.S +file lib/libkern/arch/alpha/__divqu.S +file lib/libkern/arch/alpha/__reml.S +file lib/libkern/arch/alpha/__remlu.S +file lib/libkern/arch/alpha/__remq.S +file lib/libkern/arch/alpha/__remqu.S |