Sat Mar 26 10:35:14 2016 UTC ()
Switch playstation2 over to gcc 5.3, binutils 2.26 and gdb 7.10


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

--- src/share/mk/bsd.own.mk 2016/03/24 09:15:38 1.910
+++ src/share/mk/bsd.own.mk 2016/03/26 10:35:14 1.911
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.910 2016/03/24 09:15:38 martin Exp $ 1# $NetBSD: bsd.own.mk,v 1.911 2016/03/26 10:35:14 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#
@@ -34,46 +34,46 @@ RELEASEMACHINE?= ${MACHINE} @@ -34,46 +34,46 @@ RELEASEMACHINE?= ${MACHINE}
34# NEED_OWN_INSTALL_TARGET is set to "no" by pkgsrc/mk/bsd.pkg.mk to 34# NEED_OWN_INSTALL_TARGET is set to "no" by pkgsrc/mk/bsd.pkg.mk to
35# ensure that things defined by <bsd.own.mk> (default targets, 35# ensure that things defined by <bsd.own.mk> (default targets,
36# INSTALL_FILE, etc.) are not conflicting with bsd.pkg.mk. 36# INSTALL_FILE, etc.) are not conflicting with bsd.pkg.mk.
37# 37#
38NEED_OWN_INSTALL_TARGET?= yes 38NEED_OWN_INSTALL_TARGET?= yes
39 39
40# 40#
41# This lists the platforms which do not have working in-tree toolchains. For 41# This lists the platforms which do not have working in-tree toolchains. For
42# the in-tree gcc toolchain, this list is empty. 42# the in-tree gcc toolchain, this list is empty.
43# 43#
44# If some future port is not supported by the in-tree toolchain, this should 44# If some future port is not supported by the in-tree toolchain, this should
45# be set to "yes" for that port only. 45# be set to "yes" for that port only.
46# 46#
47.if ${MACHINE} == "playstation2" 47# .if ${MACHINE} == "playstation2"
48TOOLCHAIN_MISSING?= yes 48# TOOLCHAIN_MISSING?= yes
49.endif 49# .endif
50 50
51TOOLCHAIN_MISSING?= no 51TOOLCHAIN_MISSING?= no
52 52
53.if ${MACHINE_CPU} == "aarch64" && !defined(EXTERNAL_TOOLCHAIN) && ${MKLLVM:Uyes} != "no" 53.if ${MACHINE_CPU} == "aarch64" && !defined(EXTERNAL_TOOLCHAIN) && ${MKLLVM:Uyes} != "no"
54MKLLVM?= yes 54MKLLVM?= yes
55HAVE_LLVM?= yes 55HAVE_LLVM?= yes
56MKGCC?= no 56MKGCC?= 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.if ${MACHINE} == "playstation2" || ${MACHINE_CPU} == "aarch64" 64.if ${MACHINE_CPU} == "aarch64"
65HAVE_GCC?= 0 65HAVE_GCC?= 0
66.elif ${MACHINE_ARCH} == "vax" 66.elif ${MACHINE_ARCH} == "vax" || ${MACHINE} == "playstation2"
67HAVE_GCC?= 53 67HAVE_GCC?= 53
68.else 68.else
69# Otherwise, default to GCC4.8 69# Otherwise, default to GCC4.8
70HAVE_GCC?= 48 70HAVE_GCC?= 48
71.endif 71.endif
72 72
73# 73#
74# Platforms that can't run a modern GCC natively 74# Platforms that can't run a modern GCC natively
75.if ${MACHINE_ARCH} == "m68000" 75.if ${MACHINE_ARCH} == "m68000"
76MKGCCCMDS?= no 76MKGCCCMDS?= no
77.endif 77.endif
78 78
79# 79#
@@ -121,44 +121,46 @@ HAVE_LIBGCC_EH?= yes @@ -121,44 +121,46 @@ HAVE_LIBGCC_EH?= yes
121 (${MACHINE_ARCH} == "hppa") || \ 121 (${MACHINE_ARCH} == "hppa") || \
122 (${MACHINE_ARCH} == "ia64") || \ 122 (${MACHINE_ARCH} == "ia64") || \
123 (${MACHINE_CPU} == "mips") 123 (${MACHINE_CPU} == "mips")
124HAVE_SSP?= no 124HAVE_SSP?= no
125.else 125.else
126HAVE_SSP?= yes 126HAVE_SSP?= yes
127.if !defined(NOFORT) && ${USE_FORT:Uno} != "no" 127.if !defined(NOFORT) && ${USE_FORT:Uno} != "no"
128USE_SSP?= yes 128USE_SSP?= yes
129.endif 129.endif
130.endif 130.endif
131 131
132.if ${MACHINE} == "amd64" || \ 132.if ${MACHINE} == "amd64" || \
133 ${MACHINE} == "i386" || \ 133 ${MACHINE} == "i386" || \
 134 ${MACHINE} == "playstation2" || \
134 ${MACHINE_CPU} == "sh3" || \ 135 ${MACHINE_CPU} == "sh3" || \
135 ${MACHINE_ARCH} == "vax" || \ 136 ${MACHINE_ARCH} == "vax" || \
136 ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" 137 ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
137HAVE_GDB?= 710 138HAVE_GDB?= 710
138.else 139.else
139HAVE_GDB?= 79 140HAVE_GDB?= 79
140.endif 141.endif
141 142
142.if ${HAVE_GDB} == 79 143.if ${HAVE_GDB} == 79
143EXTERNAL_GDB_SUBDIR= gdb.old 144EXTERNAL_GDB_SUBDIR= gdb.old
144.else 145.else
145EXTERNAL_GDB_SUBDIR= gdb 146EXTERNAL_GDB_SUBDIR= gdb
146.endif 147.endif
147 148
148.if ${MACHINE} == "amd64" || \ 149.if ${MACHINE} == "amd64" || \
149 ${MACHINE} == "evbarm" || \ 150 ${MACHINE} == "evbarm" || \
150 ${MACHINE} == "i386" || \ 151 ${MACHINE} == "i386" || \
151 ${MACHINE} == "hppa" || \ 152 ${MACHINE} == "hppa" || \
 153 ${MACHINE} == "playstation2" || \
152 ${MACHINE_CPU} == "sh3" || \ 154 ${MACHINE_CPU} == "sh3" || \
153 ${MACHINE} == "sparc" || \ 155 ${MACHINE} == "sparc" || \
154 ${MACHINE} == "sparc64" || \ 156 ${MACHINE} == "sparc64" || \
155 ${MACHINE_ARCH} == "powerpc" || \ 157 ${MACHINE_ARCH} == "powerpc" || \
156 ${MACHINE_ARCH} == "vax" 158 ${MACHINE_ARCH} == "vax"
157HAVE_BINUTILS?= 226 159HAVE_BINUTILS?= 226
158.else 160.else
159HAVE_BINUTILS?= 223 161HAVE_BINUTILS?= 223
160.endif 162.endif
161 163
162.if ${HAVE_BINUTILS} == 223 164.if ${HAVE_BINUTILS} == 223
163EXTERNAL_BINUTILS_SUBDIR= binutils.old 165EXTERNAL_BINUTILS_SUBDIR= binutils.old
164.elif ${HAVE_BINUTILS} == 226 166.elif ${HAVE_BINUTILS} == 226