[src/trunk]: src/tools/gcc remove HAVE_GCC == 6 support, add HAVE_GCC == 8 su...

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

details:   https://anonhg.NetBSD.org/src/rev/cba077fcc6b4
branches:  trunk
changeset: 1003779:cba077fcc6b4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Sep 30 08:40:20 2019 +0000

description:
remove HAVE_GCC == 6 support, add HAVE_GCC == 8 support

diffstat:

 tools/gcc/Makefile        |  10 +++++-----
 tools/gcc/README.mknative |  12 ++++++------
 tools/gcc/gcc-version.mk  |   8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diffs (89 lines):

diff -r 1a8231d337da -r cba077fcc6b4 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Mon Sep 30 07:13:54 2019 +0000
+++ b/tools/gcc/Makefile        Mon Sep 30 08:40:20 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.94 2019/09/09 13:57:13 maya Exp $
+#      $NetBSD: Makefile,v 1.95 2019/09/30 08:40:20 mrg Exp $
 
 .include <bsd.hostinit.mk>
 
@@ -8,7 +8,7 @@
 GCCDIST=       ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
 GNUHOSTDIST=   ${GCCDIST}
 
-.if ${HAVE_GCC} == 6
+.if ${HAVE_GCC} == 7
 MKNATIVE=              ${.CURDIR}/mknative-gcc.old
 .endif
 
@@ -95,10 +95,10 @@
 
 MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgcc
 MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgomp
-.if ${HAVE_GCC} == 7
+.if ${HAVE_GCC} == 8
+MKNATIVE_TARGET=       gcc8
+.elif ${HAVE_GCC} == 7
 MKNATIVE_TARGET=       gcc7
-.elif ${HAVE_GCC} == 6
-MKNATIVE_TARGET=       gcc6
 .endif
 
 MKNATIVE_CONFIG_TARGET_LIBS+= \
diff -r 1a8231d337da -r cba077fcc6b4 tools/gcc/README.mknative
--- a/tools/gcc/README.mknative Mon Sep 30 07:13:54 2019 +0000
+++ b/tools/gcc/README.mknative Mon Sep 30 08:40:20 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.22 2018/02/02 01:02:41 mrg Exp $
+$NetBSD: README.mknative,v 1.23 2019/09/30 08:40:20 mrg Exp $
 
 This file describes how to bootstrap the native toolchain on a new NetBSD
 platform (and how to update the new toolchain files, if needed).  These
@@ -29,7 +29,7 @@
    to build.sh. Use -M instead. (The differences are in layout and pathname
    prefixes in the object directory pointed to by each option.)
 
-3. In src/tools/gcc, do "nbmake-MACHINE HAVE_GCC=6 bootstrap-libgcc".
+3. In src/tools/gcc, do "nbmake-MACHINE HAVE_GCC=8 bootstrap-libgcc".
 
    This will create just enough glue in src/external/gpl3/gcc/lib/libgcc/arch
    to make it possible to build, based on the toolchain built in
@@ -39,9 +39,9 @@
    will regenerate the "proper" libgcc config files.
 
 4. At top level, do
-   "nbmake-MACHINE obj do-distrib-dirs MKGCC=no MKBINUTILS=no HAVE_GCC=6", and
-   "nbmake-MACHINE includes HAVE_GCC= MKGCC=no MKBINUTILS=no HAVE_GCC=6".
-   (Note: replace 6 [for GCC 6.x] with the appropriate version you are going
+   "nbmake-MACHINE obj do-distrib-dirs MKGCC=no MKBINUTILS=no HAVE_GCC=8", and
+   "nbmake-MACHINE includes HAVE_GCC= MKGCC=no MKBINUTILS=no HAVE_GCC=8".
+   (Note: replace 8 [for GCC 8.x] with the appropriate version you are going
    to mknative-for, the MKGCC=no prevents the standard makefiles from picking
    up any gcc version info automatically)
 
@@ -56,7 +56,7 @@
    do "nbmake-MACHINE obj dependall".
 
 8. In src/lib, do
-   "nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=6".
+   "nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=8".
 
    Optionally, all of the following may be set in the environment to reduce
    the amount of code needed to build at this step.  Basically, it must be
diff -r 1a8231d337da -r cba077fcc6b4 tools/gcc/gcc-version.mk
--- a/tools/gcc/gcc-version.mk  Mon Sep 30 07:13:54 2019 +0000
+++ b/tools/gcc/gcc-version.mk  Mon Sep 30 08:40:20 2019 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: gcc-version.mk,v 1.16 2019/03/20 05:09:26 mrg Exp $
+#      $NetBSD: gcc-version.mk,v 1.17 2019/09/30 08:40:20 mrg Exp $
 
 # common location for tools and native build
 
-.if ${HAVE_GCC} == 6
-NETBSD_GCC_VERSION=nb4 20181109
-.elif ${HAVE_GCC} == 7
+.if ${HAVE_GCC} == 7
 NETBSD_GCC_VERSION=nb3 20190319
+.elif ${HAVE_GCC} == 8
+NETBSD_GCC_VERSION=nb1 20190930
 .endif