Mon Dec 14 00:42:06 2009 UTC ()
Merge from matt-nb5-mips64
Teach lint about mips64


(matt)
diff -r1.10 -r1.11 src/usr.bin/xlint/Makefile.inc
cvs diff -r1.10 -r1.11 src/usr.bin/xlint/Makefile.inc (expand / switch to unified diff)

--- src/usr.bin/xlint/Makefile.inc 2009/04/14 09:09:59 1.10
+++ src/usr.bin/xlint/Makefile.inc 2009/12/14 00:42:06 1.11
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: Makefile.inc,v 1.10 2009/04/14 09:09:59 lukem Exp $ 1# $NetBSD: Makefile.inc,v 1.11 2009/12/14 00:42:06 matt Exp $
2 2
3WARNS?= 3 # XXX: fails -Wsign-compare 3WARNS?= 3 # XXX: fails -Wsign-compare
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7.PATH: ${.CURDIR}/../common 7.PATH: ${.CURDIR}/../common
8 8
9# On the m68000, MACHINE_CPU is "m68k", but we have different 9# On the m68000, MACHINE_CPU is "m68k", but we have different
10# target parameters (namely, long double is a different size 10# target parameters (namely, long double is a different size
11# on the m68000), so we special case the directory name here. 11# on the m68000), so we special case the directory name here.
12.if ${MACHINE_ARCH} == "m68000" 12.if ${MACHINE_ARCH} == "m68000"
13ARCHSUBDIR= m68000 13ARCHSUBDIR= m68000
 14.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 15ARCHSUBDIR= mips64
14.else 16.else
15ARCHSUBDIR= ${MACHINE_CPU} 17ARCHSUBDIR= ${MACHINE_CPU}
16.endif 18.endif
17 19
18CPPFLAGS+= -I${.CURDIR}/../arch/${ARCHSUBDIR} 20CPPFLAGS+= -I${.CURDIR}/../arch/${ARCHSUBDIR}
19CPPFLAGS+= -I${.CURDIR}/../common 21CPPFLAGS+= -I${.CURDIR}/../common
20 22
21.if exists(${.CURDIR}/../../Makefile.inc) 23.if exists(${.CURDIR}/../../Makefile.inc)
22.include "${.CURDIR}/../../Makefile.inc" 24.include "${.CURDIR}/../../Makefile.inc"
23.endif 25.endif