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/zaurus | |
| 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/zaurus')
| -rw-r--r-- | sys/arch/zaurus/conf/Makefile.zaurus | 16 | ||||
| -rw-r--r-- | sys/arch/zaurus/stand/zboot/Makefile | 6 |
2 files changed, 7 insertions, 15 deletions
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index 6ea67d220ca..58e3103dd27 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.9 2007/11/25 11:23:33 deraadt Exp $ +# $OpenBSD: Makefile.zaurus,v 1.10 2007/11/25 18:25:29 deraadt Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -61,14 +61,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 @@ -96,8 +88,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= ${BOARDTYPE}_start.o locore.o \ - param.o ioconf.o ${OBJS} ${LIBKERN} +SYSTEM_OBJ= ${BOARDTYPE}_start.o locore.o param.o ioconf.o ${OBJS} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD_HEAD+=; \ @@ -136,6 +127,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/zaurus/stand/zboot/Makefile b/sys/arch/zaurus/stand/zboot/Makefile index e8a56816e84..de807b3e8d7 100644 --- a/sys/arch/zaurus/stand/zboot/Makefile +++ b/sys/arch/zaurus/stand/zboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2006/10/30 18:28:57 jmc Exp $ +# $OpenBSD: Makefile,v 1.8 2007/11/25 18:25:33 deraadt Exp $ MAN= boot.8 MANSUBDIR=zaurus @@ -28,7 +28,7 @@ SRCS+= close.c closeall.c cons.c ctime.c disklabel.c dkcksum.c fstat.c \ lseek.c memcmp.c memcpy.c memset.c open.c printf.c read.c \ readdir.c snprintf.c stat.c strerror.c strtol.c ufs.c -# libkern +.PATH: ${S}/lib/libkern/arch/arm ${S}/lib/libkern SRCS+= strcmp.c strlcpy.c strlen.c strncmp.c strncpy.c write.c \ ashrdi3.c divsi3.S @@ -38,8 +38,6 @@ SRCS+= alloc.c cmd.c devopen.c diskprobe.c exec.c exit.c loadfile.c \ .PATH: ${S}/stand/boot .PATH: ${S}/lib/libsa -.PATH: ${S}/lib/libkern -.PATH: ${S}/lib/libkern/arch/arm .else NOPROG= |