[src/trunk]: src obsolete gcc 5 support.

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

details:   https://anonhg.NetBSD.org/src/rev/7e836d93ac84
branches:  trunk
changeset: 447620:7e836d93ac84
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jan 19 12:58:37 2019 +0000

description:
obsolete gcc 5 support.
add gcc 7 support.  call it "nb1 20190119"

diffstat:

 share/mk/bsd.own.mk      |   4 +++-
 tools/gcc/Makefile       |  13 +++++--------
 tools/gcc/gcc-version.mk |   4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diffs (76 lines):

diff -r 5499ed56323f -r 7e836d93ac84 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Jan 19 12:57:32 2019 +0000
+++ b/share/mk/bsd.own.mk       Sat Jan 19 12:58:37 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1094 2019/01/09 23:52:29 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.1095 2019/01/19 12:58:37 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -72,6 +72,8 @@
 #
 .if ${HAVE_GCC} == 6
 EXTERNAL_GCC_SUBDIR?=  gcc.old
+.elif ${HAVE_GCC} == 7
+EXTERNAL_GCC_SUBDIR?=  gcc
 .else
 EXTERNAL_GCC_SUBDIR=?  /does/not/exist
 .endif
diff -r 5499ed56323f -r 7e836d93ac84 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Sat Jan 19 12:57:32 2019 +0000
+++ b/tools/gcc/Makefile        Sat Jan 19 12:58:37 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.87 2018/10/19 16:16:21 maya Exp $
+#      $NetBSD: Makefile,v 1.88 2019/01/19 12:58:37 mrg Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -8,7 +8,7 @@
 GCCDIST=       ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
 GNUHOSTDIST=   ${GCCDIST}
 
-.if ${HAVE_GCC} == 5
+.if ${HAVE_GCC} == 6
 MKNATIVE=              ${.CURDIR}/mknative-gcc.old
 .endif
 
@@ -47,10 +47,7 @@
 COMMON_CONFIGURE_ARGS+=        --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
 .endif
 
-.if ${HAVE_GCC} >= 5
-# Turn on colour output only if GCC_COLORS env is set
 COMMON_CONFIGURE_ARGS+= --with-diagnostics-color=auto-if-env
-.endif
 
 CONFIGURE_ARGS=        ${COMMON_CONFIGURE_ARGS}
 CONFIGURE_ARGS+= \
@@ -89,10 +86,10 @@
 
 MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgcc
 MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgomp
-.if ${HAVE_GCC} == 6
+.if ${HAVE_GCC} == 7
+MKNATIVE_TARGET=       gcc7
+.elif ${HAVE_GCC} == 6
 MKNATIVE_TARGET=       gcc6
-.elif ${HAVE_GCC} == 5
-MKNATIVE_TARGET=       gcc5
 .endif
 
 MKNATIVE_CONFIG_TARGET_LIBS+= \
diff -r 5499ed56323f -r 7e836d93ac84 tools/gcc/gcc-version.mk
--- a/tools/gcc/gcc-version.mk  Sat Jan 19 12:57:32 2019 +0000
+++ b/tools/gcc/gcc-version.mk  Sat Jan 19 12:58:37 2019 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: gcc-version.mk,v 1.12 2018/11/11 23:05:25 mrg Exp $
+#      $NetBSD: gcc-version.mk,v 1.13 2019/01/19 12:58:37 mrg Exp $
 
 # common location for tools and native build
 
 .if ${HAVE_GCC} == 6
 NETBSD_GCC_VERSION=nb4 20181109
 .elif ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb1 20180905
+NETBSD_GCC_VERSION=nb1 20190119
 .endif