diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-23 15:09:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-05-23 15:09:39 +0000 |
| commit | 7fa574d37b736e6fb129acef706aac37106da496 (patch) | |
| tree | ffedd5ef1165cbb5b8925344ddb62db282bc5c2b /sys | |
| parent | b2ee6ccfa6d001db27946ca9d8af0d97fd1f39db (diff) | |
mac68k can move to defining __mac68k__ instead
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mac68k/conf/Makefile.mac68k | 7 | ||||
| -rw-r--r-- | sys/dev/adb/akbd.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k index 2a23d4b8157..7093c7c2a52 100644 --- a/sys/arch/mac68k/conf/Makefile.mac68k +++ b/sys/arch/mac68k/conf/Makefile.mac68k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mac68k,v 1.56 2010/04/28 15:31:33 deraadt Exp $ +# $OpenBSD: Makefile.mac68k,v 1.57 2010/05/23 15:09:38 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -25,7 +25,7 @@ _machdir?= $S/arch/${_mach} _archdir?= $S/arch/${_arch} INCLUDES= -nostdinc -I. -I$S -I$S/arch -CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach} -Dmc68020 +CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_-${_mach}__ CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main \ -Wstack-larger-than-2047 -Wvariable-decl @@ -59,7 +59,6 @@ HOSTED_CFLAGS= ${CFLAGS} NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $< NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< -NORMAL_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $< HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< @@ -108,7 +107,7 @@ param.c: $S/conf/param.c cp $S/conf/param.c . param.o: param.c Makefile - ${NORMAL_C_C} + ${NORMAL_C} mcount.o: $S/lib/libkern/mcount.c Makefile ${NORMAL_C_NOP} diff --git a/sys/dev/adb/akbd.c b/sys/dev/adb/akbd.c index af1bbd19556..3b0f67fd418 100644 --- a/sys/dev/adb/akbd.c +++ b/sys/dev/adb/akbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: akbd.c,v 1.7 2009/01/21 21:53:59 grange Exp $ */ +/* $OpenBSD: akbd.c,v 1.8 2010/05/23 15:09:38 deraadt Exp $ */ /* $NetBSD: akbd.c,v 1.17 2005/01/15 16:00:59 chs Exp $ */ /* @@ -425,7 +425,7 @@ akbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) return (0); #endif -#ifdef mac68k /* XXX not worth creating akbd_machdep_ioctl() */ +#if defined(__mac68k__) /* XXX not worth creating akbd_machdep_ioctl() */ case WSKBDIO_BELL: case WSKBDIO_COMPLEXBELL: #define d ((struct wskbd_bell_data *)data) |