[src/trunk]: src/share/mk switch vax and ia64 to binutils 2.34. reverse the ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/17203f1fa6da
branches:  trunk
changeset: 954939:17203f1fa6da
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Sep 13 20:59:18 2020 +0000

description:
switch vax and ia64 to binutils 2.34.  reverse the list and leave
the remaining m68k (untested), riscv (riscv64 ld is missing emulations
for 32 bit targets), and sh3 (untested).

diffstat:

 share/mk/bsd.own.mk |  67 ++++++++++++++++++++++++----------------------------
 1 files changed, 31 insertions(+), 36 deletions(-)

diffs (88 lines):

diff -r a854e5d6aac0 -r 17203f1fa6da share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Sep 13 20:38:47 2020 +0000
+++ b/share/mk/bsd.own.mk       Sun Sep 13 20:59:18 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1211 2020/09/13 02:37:32 kamil Exp $
+#      $NetBSD: bsd.own.mk,v 1.1212 2020/09/13 20:59:18 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -92,6 +92,36 @@
 .endif
 
 #
+# What binutils is used?
+#
+.if ${MACHINE_CPU} == "sh3" || ${MACHINE_CPU} == "riscv" || \
+    ${MACHINE_CPU} == "m68k"
+HAVE_BINUTILS?=        231
+.endif
+HAVE_BINUTILS?=        234
+
+.if ${HAVE_BINUTILS} == 234
+EXTERNAL_BINUTILS_SUBDIR=      binutils
+.elif ${HAVE_BINUTILS} == 231
+EXTERNAL_BINUTILS_SUBDIR=      binutils.old
+.else
+EXTERNAL_BINUTILS_SUBDIR=      /does/not/exist
+.endif
+
+#
+# What GDB is used?
+#
+HAVE_GDB?=     830
+
+.if ${HAVE_GDB} == 830
+EXTERNAL_GDB_SUBDIR=           gdb
+.elif ${HAVE_GDB} == 801
+EXTERNAL_GDB_SUBDIR=           gdb.old
+.else
+EXTERNAL_GDB_SUBDIR=           /does/not/exist
+.endif
+
+#
 # What OpenSSL is used?
 # 
 HAVE_OPENSSL?=  11
@@ -172,41 +202,6 @@
 .endif
 
 #
-# What GDB is used?
-#
-HAVE_GDB?=     830
-
-.if ${HAVE_GDB} == 830
-EXTERNAL_GDB_SUBDIR=           gdb
-.elif ${HAVE_GDB} == 801
-EXTERNAL_GDB_SUBDIR=           gdb.old
-.else
-EXTERNAL_GDB_SUBDIR=           /does/not/exist
-.endif
-
-#
-# What binutils is used?
-#
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_CPU} == "aarch64" || ${MACHINE_CPU} == "arm" || \
-    ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64" || \
-    ${MACHINE} == "sun2" || ${MACHINE} == "alpha" || \
-    ${MACHINE_CPU} == "mips" || ${MACHINE} == "sparc"
-HAVE_BINUTILS?=        234
-.else
-HAVE_BINUTILS?=        231
-.endif
-
-.if ${HAVE_BINUTILS} == 234
-EXTERNAL_BINUTILS_SUBDIR=      binutils
-.elif ${HAVE_BINUTILS} == 231
-EXTERNAL_BINUTILS_SUBDIR=      binutils.old
-.else
-EXTERNAL_BINUTILS_SUBDIR=      /does/not/exist
-.endif
-
-#
 # What version of jemalloc we use (100 is the one
 # built-in to libc from 2005 (pre version 3).
 #