[src/trunk]: src/share/mk bye {gcc,gdb,binutils}.old

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

details:   https://anonhg.NetBSD.org/src/rev/6d02762490b5
branches:  trunk
changeset: 818314:6d02762490b5
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 07 16:14:28 2016 +0000

description:
bye {gcc,gdb,binutils}.old

diffstat:

 share/mk/bsd.own.mk |  18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diffs (54 lines):

diff -r ab2344ac615d -r 6d02762490b5 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Oct 07 15:49:58 2016 +0000
+++ b/share/mk/bsd.own.mk       Fri Oct 07 16:14:28 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.966 2016/10/05 20:02:03 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.967 2016/10/07 16:14:28 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -66,10 +66,6 @@
 #
 .if ${MACHINE_CPU} == "aarch64"
 HAVE_GCC?=     0
-.elif \
-    ${MACHINE} == "or1k" || \
-    ${MACHINE} == "riscv"
-HAVE_GCC?=     48
 .else
 HAVE_GCC?=     53
 .endif
@@ -86,8 +82,6 @@
 #
 .if ${HAVE_GCC} == 53
 EXTERNAL_GCC_SUBDIR=   gcc
-.elif ${HAVE_GCC} == 48
-EXTERNAL_GCC_SUBDIR=   gcc.old
 .else
 EXTERNAL_GCC_SUBDIR=   /does/not/exist
 .endif
@@ -138,10 +132,10 @@
 #
 HAVE_GDB?=     710
 
-.if ${HAVE_GDB} == 79
-EXTERNAL_GDB_SUBDIR=           gdb.old
+.if ${HAVE_GDB} == 710
+EXTERNAL_GDB_SUBDIR=           gdb
 .else
-EXTERNAL_GDB_SUBDIR=           gdb
+EXTERNAL_GDB_SUBDIR=           /does/not/exist
 .endif
 
 #
@@ -149,9 +143,7 @@
 #
 HAVE_BINUTILS?=        226
 
-.if ${HAVE_BINUTILS} == 223
-EXTERNAL_BINUTILS_SUBDIR=      binutils.old
-.elif ${HAVE_BINUTILS} == 226
+.if ${HAVE_BINUTILS} == 226
 EXTERNAL_BINUTILS_SUBDIR=      binutils
 .else
 EXTERNAL_BINUTILS_SUBDIR=      /does/not/exist