[src/netbsd-9]: src Pull up following revision(s) (requested by mrg in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/aa26a45f820a
branches:  netbsd-9
changeset: 964069:aa26a45f820a
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Aug 14 11:02:42 2020 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1049):

        tools/gcc/mknative-gcc: revision 1.104
        tools/gcc/mknative-gcc: revision 1.105
        tools/gcc/gcc-version.mk: revision 1.19
        share/mk/bsd.own.mk: revision 1.1203
        tools/gcc/Makefile: revision 1.98
        tools/gcc/mknative-gcc.old: revision 1.7
        tools/gcc/mknative-gcc.old: revision 1.8

First pass at mknative for GCC 7.5.0

diffstat:

 share/mk/bsd.own.mk      |   4 ++--
 tools/gcc/Makefile       |   4 ++--
 tools/gcc/gcc-version.mk |   8 +++-----
 tools/gcc/mknative-gcc   |  15 +++++++++++----
 4 files changed, 18 insertions(+), 13 deletions(-)

diffs (83 lines):

diff -r 45488be9cc78 -r aa26a45f820a share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Aug 14 10:45:08 2020 +0000
+++ b/share/mk/bsd.own.mk       Fri Aug 14 11:02:42 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1149.2.3 2019/12/09 15:19:30 martin Exp $
+#      $NetBSD: bsd.own.mk,v 1.1149.2.4 2020/08/14 11:02:42 martin Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -75,7 +75,7 @@
 .elif ${HAVE_GCC} == 7
 EXTERNAL_GCC_SUBDIR?=  gcc
 .else
-EXTERNAL_GCC_SUBDIR=?  /does/not/exist
+EXTERNAL_GCC_SUBDIR?=  /does/not/exist
 .endif
 .else
 MKGCCCMDS?=    no
diff -r 45488be9cc78 -r aa26a45f820a tools/gcc/Makefile
--- a/tools/gcc/Makefile        Fri Aug 14 10:45:08 2020 +0000
+++ b/tools/gcc/Makefile        Fri Aug 14 11:02:42 2020 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.93 2019/03/19 05:55:00 mrg Exp $
+#      $NetBSD: Makefile,v 1.93.2.1 2020/08/14 11:02:42 martin Exp $
 
 .include <bsd.hostinit.mk>
 
 GCC_LANGUAGES=c c++ objc
-MODULE=                        gcc4
+MODULE=                ${EXTERNAL_GCC_SUBDIR}
 
 GCCDIST=       ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
 GNUHOSTDIST=   ${GCCDIST}
diff -r 45488be9cc78 -r aa26a45f820a tools/gcc/gcc-version.mk
--- a/tools/gcc/gcc-version.mk  Fri Aug 14 10:45:08 2020 +0000
+++ b/tools/gcc/gcc-version.mk  Fri Aug 14 11:02:42 2020 +0000
@@ -1,9 +1,7 @@
-#      $NetBSD: gcc-version.mk,v 1.16 2019/03/20 05:09:26 mrg Exp $
+#      $NetBSD: gcc-version.mk,v 1.16.2.1 2020/08/14 11:02:42 martin Exp $
 
 # common location for tools and native build
 
-.if ${HAVE_GCC} == 6
-NETBSD_GCC_VERSION=nb4 20181109
-.elif ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb3 20190319
+.if ${HAVE_GCC} == 7
+NETBSD_GCC_VERSION=nb4 20200810
 .endif
diff -r 45488be9cc78 -r aa26a45f820a tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Fri Aug 14 10:45:08 2020 +0000
+++ b/tools/gcc/mknative-gcc    Fri Aug 14 11:02:42 2020 +0000
@@ -1,10 +1,10 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp $
+#      $NetBSD: mknative-gcc,v 1.101.2.1 2020/08/14 11:02:42 martin Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
 #
-# This version is for GCC 6.4
+# This version is for GCC 7.5
 
 # initialise
 
@@ -24,8 +24,15 @@
 
 . $_TOP/tools/gcc/mknative.common
 
-_OUTDIR="$_TOP/external/gpl3/gcc"
-_OUTDIRBASE="external/gpl3/gcc"
+case $0 in
+       *mknative-gcc.old)
+               _OUTDIRBASE="external/gpl3/gcc.old"
+               ;;
+       *)
+               _OUTDIRBASE="external/gpl3/gcc"
+               ;;
+esac
+_OUTDIR="$_TOP/$_OUTDIRBASE"
 
 sanitise_includes () {
        sed \