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/hppa64/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/hppa64/conf')
| -rw-r--r-- | sys/arch/hppa64/conf/Makefile.hppa64 | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index 2f7422a58cd..fb41b12a22b 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.5 2007/11/25 11:23:33 deraadt Exp $ +# $OpenBSD: Makefile.hppa64,v 1.6 2007/11/25 18:25:28 deraadt Exp $ # Makefile for OpenBSD # @@ -58,14 +58,6 @@ HOSTED_CFLAGS= ${CFLAGS} # this line must be there because libkern needs assym.h generated early depend:: .NOTMAIN .depend -### 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). @@ -85,7 +77,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} ${LIBSPMATH} ${LIBKERN} +SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBSPMATH} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ @@ -116,6 +108,12 @@ param.c: $S/conf/param.c param.o: param.c Makefile ${NORMAL_C} +mcount.o: $S/lib/libkern/mcount.c Makefile + ${NORMAL_C_NOP} + +mcount.o: $S/lib/libkern/mcount.c Makefile + ${NORMAL_C_NOP} + ioconf.o: ioconf.c ${NORMAL_C} @@ -169,9 +167,9 @@ assym.h machdep.o: Makefile # depend on CPU configuration locore.o machdep.o trap.o: Makefile - locore.o: ${HPPA}/hppa64/locore.S assym.h ${NORMAL_S} + fpemu.o: assym.h # The install target can be redefined by putting a |