diff options
| -rw-r--r-- | sys/arch/arm/footbridge/genassym.cf | 47 | ||||
| -rw-r--r-- | sys/arch/armish/conf/Makefile.armish | 4 | ||||
| -rw-r--r-- | sys/arch/cats/conf/Makefile.cats | 6 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/Makefile.zaurus | 4 |
4 files changed, 7 insertions, 54 deletions
diff --git a/sys/arch/arm/footbridge/genassym.cf b/sys/arch/arm/footbridge/genassym.cf deleted file mode 100644 index 864c1448d12..00000000000 --- a/sys/arch/arm/footbridge/genassym.cf +++ /dev/null @@ -1,47 +0,0 @@ -# $OpenBSD: genassym.cf,v 1.1 2004/02/01 05:09:49 drahn Exp $ -# $NetBSD: genassym.cf,v 1.2 2001/12/20 01:20:23 thorpej Exp $ - -# Copyright (c) 1982, 1990 The Regents of the University of California. -# All rights reserved. -# -# This code is derived from software contributed to Berkeley by -# William Jolitz. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. -# 4. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -include <machine/intr.h> - -define IH_FUNC offsetof(struct irqhandler, ih_func) -define IH_ARG offsetof(struct irqhandler, ih_arg) -define IH_FLAGS offsetof(struct irqhandler, ih_flags) -define IH_LEVEL offsetof(struct irqhandler, ih_level) -define IH_NUM offsetof(struct irqhandler, ih_num) -define IH_MASKADDR offsetof(struct irqhandler, ih_maskaddr) -define IH_MASKBITS offsetof(struct irqhandler, ih_maskbits) -define IH_NEXT offsetof(struct irqhandler, ih_next) diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish index 4806cdde4ca..7a2997a91ae 100644 --- a/sys/arch/armish/conf/Makefile.armish +++ b/sys/arch/armish/conf/Makefile.armish @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.armish,v 1.1 2006/05/29 17:13:19 drahn Exp $ +# $OpenBSD: Makefile.armish,v 1.2 2006/05/30 18:25:42 miod Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -179,7 +179,7 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${ARM}/arm/genassym.cf ${ARM}/footbridge/genassym.cf | \ + cat ${ARM}/arm/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ ${CPPFLAGS} @sed -e 's/.*\.o:.* /assym.h: /' < assym.dep >> .depend diff --git a/sys/arch/cats/conf/Makefile.cats b/sys/arch/cats/conf/Makefile.cats index 3ac82270d03..c13fe8db4ef 100644 --- a/sys/arch/cats/conf/Makefile.cats +++ b/sys/arch/cats/conf/Makefile.cats @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile.cats,v 1.3 2004/11/19 06:41:13 miod Exp $ -# $OpenBSD: Makefile.cats,v 1.3 2004/11/19 06:41:13 miod Exp $ +# $OpenBSD: Makefile.cats,v 1.4 2006/05/30 18:25:42 miod Exp $ +# $OpenBSD: Makefile.cats,v 1.4 2006/05/30 18:25:42 miod Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -172,7 +172,7 @@ depend:: .depend ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ARM}/arm/locore.S ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} - cat ${ARM}/arm/genassym.cf ${ARM}/footbridge/genassym.cf | \ + cat ${ARM}/arm/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ ${CPPFLAGS} @sed -e 's/.*\.o:.* /assym.h: /' < assym.dep >> .depend diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus index ed88ca73d31..2621fcdb1d6 100644 --- a/sys/arch/zaurus/conf/Makefile.zaurus +++ b/sys/arch/zaurus/conf/Makefile.zaurus @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.zaurus,v 1.4 2005/11/19 00:17:18 drahn Exp $ +# $OpenBSD: Makefile.zaurus,v 1.5 2006/05/30 18:25:42 miod Exp $ # $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $ # Makefile for OpenBSD @@ -179,7 +179,7 @@ depend:: .depend .if ${SFILES} != "" ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif - cat ${ARM}/arm/genassym.cf ${ARM}/footbridge/genassym.cf | \ + cat ${ARM}/arm/genassym.cf | \ sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ ${CPPFLAGS} @sed -e 's/.*\.o:.* /assym.h: /' < assym.dep >> .depend |