Fri Jul 1 20:05:28 2016 UTC ()
Switch ia64 and alpha to latest gcc/binutils(alpha was there already)/gdb.


(martin)
diff -r1.936 -r1.937 src/share/mk/bsd.own.mk
cvs diff -r1.936 -r1.937 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2016/06/14 13:26:45 1.936
+++ src/share/mk/bsd.own.mk 2016/07/01 20:05:28 1.937
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.936 2016/06/14 13:26:45 christos Exp $ 1# $NetBSD: bsd.own.mk,v 1.937 2016/07/01 20:05:28 martin Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -57,29 +57,31 @@ MKGCC?= no @@ -57,29 +57,31 @@ MKGCC?= no
57.endif 57.endif
58 58
59# 59#
60# GCC Using platforms. 60# GCC Using platforms.
61# 61#
62.if ${MKGCC:Uyes} != "no" 62.if ${MKGCC:Uyes} != "no"
63 63
64# 64#
65# What GCC is used? 65# What GCC is used?
66# 66#
67.if ${MACHINE_CPU} == "aarch64" 67.if ${MACHINE_CPU} == "aarch64"
68HAVE_GCC?= 0 68HAVE_GCC?= 0
69.elif \ 69.elif \
 70 ${MACHINE} == "alpha" || \
70 ${MACHINE} == "amd64" || \ 71 ${MACHINE} == "amd64" || \
71 ${MACHINE} == "hppa" || \ 72 ${MACHINE} == "hppa" || \
72 ${MACHINE} == "i386" || \ 73 ${MACHINE} == "i386" || \
 74 ${MACHINE} == "ia64" || \
73 ${MACHINE} == "playstation2" || \ 75 ${MACHINE} == "playstation2" || \
74 ${MACHINE} == "sparc" || \ 76 ${MACHINE} == "sparc" || \
75 ${MACHINE_CPU} == "arm" || \ 77 ${MACHINE_CPU} == "arm" || \
76 ${MACHINE_CPU} == "powerpc" || \ 78 ${MACHINE_CPU} == "powerpc" || \
77 ${MACHINE_ARCH} == "vax" 79 ${MACHINE_ARCH} == "vax"
78HAVE_GCC?= 53 80HAVE_GCC?= 53
79.else 81.else
80# Otherwise, default to GCC4.8 82# Otherwise, default to GCC4.8
81HAVE_GCC?= 48 83HAVE_GCC?= 48
82.endif 84.endif
83 85
84# 86#
85# Platforms that can't run a modern GCC natively 87# Platforms that can't run a modern GCC natively
@@ -133,53 +135,57 @@ HAVE_LIBGCC_EH?= yes @@ -133,53 +135,57 @@ HAVE_LIBGCC_EH?= yes
133 ${MACHINE} == "ia64" || \ 135 ${MACHINE} == "ia64" || \
134 ${MACHINE_CPU} == "mips" 136 ${MACHINE_CPU} == "mips"
135HAVE_SSP?= no 137HAVE_SSP?= no
136.else 138.else
137HAVE_SSP?= yes 139HAVE_SSP?= yes
138.if !defined(NOFORT) && ${USE_FORT:Uno} != "no" 140.if !defined(NOFORT) && ${USE_FORT:Uno} != "no"
139USE_SSP?= yes 141USE_SSP?= yes
140.endif 142.endif
141.endif 143.endif
142 144
143# 145#
144# What GDB is used? 146# What GDB is used?
145# 147#
146.if ${MACHINE} == "amd64" || \ 148.if ${MACHINE} == "alpha" || \
 149 ${MACHINE} == "amd64" || \
147 ${MACHINE} == "i386" || \ 150 ${MACHINE} == "i386" || \
 151 ${MACHINE} == "ia64" || \
148 ${MACHINE} == "playstation2" || \ 152 ${MACHINE} == "playstation2" || \
149 ${MACHINE} == "sparc" || \ 153 ${MACHINE} == "sparc" || \
150 ${MACHINE} == "vax" || \ 154 ${MACHINE} == "vax" || \
151 ${MACHINE_CPU} == "arm" || \ 155 ${MACHINE_CPU} == "arm" || \
152 ${MACHINE_CPU} == "powerpc" || \ 156 ${MACHINE_CPU} == "powerpc" || \
153 ${MACHINE_CPU} == "sh3" || \ 157 ${MACHINE_CPU} == "sh3" || \
154 ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" 158 ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
155HAVE_GDB?= 710 159HAVE_GDB?= 710
156.else 160.else
157HAVE_GDB?= 79 161HAVE_GDB?= 79
158.endif 162.endif
159 163
160.if ${HAVE_GDB} == 79 164.if ${HAVE_GDB} == 79
161EXTERNAL_GDB_SUBDIR= gdb.old 165EXTERNAL_GDB_SUBDIR= gdb.old
162.else 166.else
163EXTERNAL_GDB_SUBDIR= gdb 167EXTERNAL_GDB_SUBDIR= gdb
164.endif 168.endif
165 169
166# 170#
167# What binutils is used? 171# What binutils is used?
168# 172#
169.if ${MACHINE} == "amd64" || \ 173.if ${MACHINE} == "alpha" || \
 174 ${MACHINE} == "amd64" || \
170 ${MACHINE} == "evbarm" || \ 175 ${MACHINE} == "evbarm" || \
171 ${MACHINE} == "hppa" || \ 176 ${MACHINE} == "hppa" || \
172 ${MACHINE} == "i386" || \ 177 ${MACHINE} == "i386" || \
 178 ${MACHINE} == "ia64" || \
173 ${MACHINE} == "playstation2" || \ 179 ${MACHINE} == "playstation2" || \
174 ${MACHINE} == "sparc" || \ 180 ${MACHINE} == "sparc" || \
175 ${MACHINE} == "vax" || \ 181 ${MACHINE} == "vax" || \
176 ${MACHINE_CPU} == "sh3" || \ 182 ${MACHINE_CPU} == "sh3" || \
177 ${MACHINE_ARCH} == "powerpc" 183 ${MACHINE_ARCH} == "powerpc"
178HAVE_BINUTILS?= 226 184HAVE_BINUTILS?= 226
179.else 185.else
180HAVE_BINUTILS?= 223 186HAVE_BINUTILS?= 223
181.endif 187.endif
182 188
183.if ${HAVE_BINUTILS} == 223 189.if ${HAVE_BINUTILS} == 223
184EXTERNAL_BINUTILS_SUBDIR= binutils.old 190EXTERNAL_BINUTILS_SUBDIR= binutils.old
185.elif ${HAVE_BINUTILS} == 226 191.elif ${HAVE_BINUTILS} == 226