Thu Jul 7 07:52:24 2016 UTC ()
Switch sparc64 to gcc 5.4, binutils 2.26 and gdb 7.10.


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

--- src/share/mk/bsd.own.mk 2016/07/01 20:05:28 1.937
+++ src/share/mk/bsd.own.mk 2016/07/07 07:52:24 1.938
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.937 2016/07/01 20:05:28 martin Exp $ 1# $NetBSD: bsd.own.mk,v 1.938 2016/07/07 07:52:24 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#
@@ -64,26 +64,27 @@ MKGCC?= no @@ -64,26 +64,27 @@ MKGCC?= no
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} == "alpha" || \
71 ${MACHINE} == "amd64" || \ 71 ${MACHINE} == "amd64" || \
72 ${MACHINE} == "hppa" || \ 72 ${MACHINE} == "hppa" || \
73 ${MACHINE} == "i386" || \ 73 ${MACHINE} == "i386" || \
74 ${MACHINE} == "ia64" || \ 74 ${MACHINE} == "ia64" || \
75 ${MACHINE} == "playstation2" || \ 75 ${MACHINE} == "playstation2" || \
76 ${MACHINE} == "sparc" || \ 76 ${MACHINE} == "sparc" || \
 77 ${MACHINE} == "sparc64" || \
77 ${MACHINE_CPU} == "arm" || \ 78 ${MACHINE_CPU} == "arm" || \
78 ${MACHINE_CPU} == "powerpc" || \ 79 ${MACHINE_CPU} == "powerpc" || \
79 ${MACHINE_ARCH} == "vax" 80 ${MACHINE_ARCH} == "vax"
80HAVE_GCC?= 53 81HAVE_GCC?= 53
81.else 82.else
82# Otherwise, default to GCC4.8 83# Otherwise, default to GCC4.8
83HAVE_GCC?= 48 84HAVE_GCC?= 48
84.endif 85.endif
85 86
86# 87#
87# Platforms that can't run a modern GCC natively 88# Platforms that can't run a modern GCC natively
88.if ${MACHINE_ARCH} == "m68000" 89.if ${MACHINE_ARCH} == "m68000"
89MKGCCCMDS?= no 90MKGCCCMDS?= no
@@ -141,26 +142,27 @@ HAVE_SSP?= yes @@ -141,26 +142,27 @@ HAVE_SSP?= yes
141USE_SSP?= yes 142USE_SSP?= yes
142.endif 143.endif
143.endif 144.endif
144 145
145# 146#
146# What GDB is used? 147# What GDB is used?
147# 148#
148.if ${MACHINE} == "alpha" || \ 149.if ${MACHINE} == "alpha" || \
149 ${MACHINE} == "amd64" || \ 150 ${MACHINE} == "amd64" || \
150 ${MACHINE} == "i386" || \ 151 ${MACHINE} == "i386" || \
151 ${MACHINE} == "ia64" || \ 152 ${MACHINE} == "ia64" || \
152 ${MACHINE} == "playstation2" || \ 153 ${MACHINE} == "playstation2" || \
153 ${MACHINE} == "sparc" || \ 154 ${MACHINE} == "sparc" || \
 155 ${MACHINE} == "sparc64" || \
154 ${MACHINE} == "vax" || \ 156 ${MACHINE} == "vax" || \
155 ${MACHINE_CPU} == "arm" || \ 157 ${MACHINE_CPU} == "arm" || \
156 ${MACHINE_CPU} == "powerpc" || \ 158 ${MACHINE_CPU} == "powerpc" || \
157 ${MACHINE_CPU} == "sh3" || \ 159 ${MACHINE_CPU} == "sh3" || \
158 ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" 160 ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
159HAVE_GDB?= 710 161HAVE_GDB?= 710
160.else 162.else
161HAVE_GDB?= 79 163HAVE_GDB?= 79
162.endif 164.endif
163 165
164.if ${HAVE_GDB} == 79 166.if ${HAVE_GDB} == 79
165EXTERNAL_GDB_SUBDIR= gdb.old 167EXTERNAL_GDB_SUBDIR= gdb.old
166.else 168.else
@@ -168,26 +170,27 @@ EXTERNAL_GDB_SUBDIR= gdb @@ -168,26 +170,27 @@ EXTERNAL_GDB_SUBDIR= gdb
168.endif 170.endif
169 171
170# 172#
171# What binutils is used? 173# What binutils is used?
172# 174#
173.if ${MACHINE} == "alpha" || \ 175.if ${MACHINE} == "alpha" || \
174 ${MACHINE} == "amd64" || \ 176 ${MACHINE} == "amd64" || \
175 ${MACHINE} == "evbarm" || \ 177 ${MACHINE} == "evbarm" || \
176 ${MACHINE} == "hppa" || \ 178 ${MACHINE} == "hppa" || \
177 ${MACHINE} == "i386" || \ 179 ${MACHINE} == "i386" || \
178 ${MACHINE} == "ia64" || \ 180 ${MACHINE} == "ia64" || \
179 ${MACHINE} == "playstation2" || \ 181 ${MACHINE} == "playstation2" || \
180 ${MACHINE} == "sparc" || \ 182 ${MACHINE} == "sparc" || \
 183 ${MACHINE} == "sparc64" || \
181 ${MACHINE} == "vax" || \ 184 ${MACHINE} == "vax" || \
182 ${MACHINE_CPU} == "sh3" || \ 185 ${MACHINE_CPU} == "sh3" || \
183 ${MACHINE_ARCH} == "powerpc" 186 ${MACHINE_ARCH} == "powerpc"
184HAVE_BINUTILS?= 226 187HAVE_BINUTILS?= 226
185.else 188.else
186HAVE_BINUTILS?= 223 189HAVE_BINUTILS?= 223
187.endif 190.endif
188 191
189.if ${HAVE_BINUTILS} == 223 192.if ${HAVE_BINUTILS} == 223
190EXTERNAL_BINUTILS_SUBDIR= binutils.old 193EXTERNAL_BINUTILS_SUBDIR= binutils.old
191.elif ${HAVE_BINUTILS} == 226 194.elif ${HAVE_BINUTILS} == 226
192EXTERNAL_BINUTILS_SUBDIR= binutils 195EXTERNAL_BINUTILS_SUBDIR= binutils
193.else 196.else