Thu Oct 1 09:12:44 2009 UTC ()
Switch amd64 to binutils 2.19.1.


(skrll)
diff -r1.583 -r1.584 src/share/mk/bsd.own.mk
cvs diff -r1.583 -r1.584 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2009/09/29 23:56:34 1.583
+++ src/share/mk/bsd.own.mk 2009/10/01 09:12:44 1.584
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.583 2009/09/29 23:56:34 tsarna Exp $ 1# $NetBSD: bsd.own.mk,v 1.584 2009/10/01 09:12:44 skrll Exp $
2 2
3.if !defined(_BSD_OWN_MK_) 3.if !defined(_BSD_OWN_MK_)
4_BSD_OWN_MK_=1 4_BSD_OWN_MK_=1
5 5
6MAKECONF?= /etc/mk.conf 6MAKECONF?= /etc/mk.conf
7.-include "${MAKECONF}" 7.-include "${MAKECONF}"
8 8
9# 9#
10# CPU model, derived from MACHINE_ARCH 10# CPU model, derived from MACHINE_ARCH
11# 11#
12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/} 12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/}
13 13
14# 14#
@@ -48,27 +48,28 @@ HAVE_GCC= 4 @@ -48,27 +48,28 @@ HAVE_GCC= 4
48# default to GDB6 48# default to GDB6
49HAVE_GDB?= 6 49HAVE_GDB?= 6
50 50
51# default to binutils 2.16 51# default to binutils 2.16
52.if \ 52.if \
53 ${MACHINE_ARCH} == "alpha" || \ 53 ${MACHINE_ARCH} == "alpha" || \
54 ${MACHINE_ARCH} == "armeb" || ${MACHINE_ARCH} == "arm" || \ 54 ${MACHINE_ARCH} == "armeb" || ${MACHINE_ARCH} == "arm" || \
55 ${MACHINE_ARCH} == "hppa" || \ 55 ${MACHINE_ARCH} == "hppa" || \
56 ${MACHINE_ARCH} == "i386" || \ 56 ${MACHINE_ARCH} == "i386" || \
57 ${MACHINE_ARCH} == "m68k" || \ 57 ${MACHINE_ARCH} == "m68k" || \
58 ${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el" || \ 58 ${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el" || \
59 ${MACHINE_ARCH} == "sparc" || \ 59 ${MACHINE_ARCH} == "sparc" || \
60 ${MACHINE_ARCH} == "sparc64" || \ 60 ${MACHINE_ARCH} == "sparc64" || \
61 ${MACHINE_ARCH} == "vax" 61 ${MACHINE_ARCH} == "vax" || \
 62 ${MACHINE_ARCH} == "x86_64"
62HAVE_BINUTILS?= 219 63HAVE_BINUTILS?= 219
63.else 64.else
64HAVE_BINUTILS?= 216 65HAVE_BINUTILS?= 216
65.endif 66.endif
66 67
67CPPFLAG_ISYSTEM= -isystem 68CPPFLAG_ISYSTEM= -isystem
68.if defined(HAVE_GCC) 69.if defined(HAVE_GCC)
69.if ${HAVE_GCC} == 3 70.if ${HAVE_GCC} == 3
70CPPFLAG_ISYSTEMXX= -isystem-cxx 71CPPFLAG_ISYSTEMXX= -isystem-cxx
71.else # GCC 4 72.else # GCC 4
72CPPFLAG_ISYSTEMXX= -cxx-isystem 73CPPFLAG_ISYSTEMXX= -cxx-isystem
73.endif 74.endif
74.endif 75.endif