Index: tools/gcc/Makefile
===================================================================
RCS file: /cvsroot/src/tools/gcc/Makefile,v
retrieving revision 1.93
diff -p -u -r1.93 Makefile
--- tools/gcc/Makefile	19 Mar 2019 05:55:00 -0000	1.93
+++ tools/gcc/Makefile	13 Aug 2020 11:01:19 -0000
@@ -3,7 +3,7 @@
 .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}
Index: tools/gcc/gcc-version.mk
===================================================================
RCS file: /cvsroot/src/tools/gcc/gcc-version.mk,v
retrieving revision 1.16
diff -p -u -r1.16 gcc-version.mk
--- tools/gcc/gcc-version.mk	20 Mar 2019 05:09:26 -0000	1.16
+++ tools/gcc/gcc-version.mk	13 Aug 2020 11:01:19 -0000
@@ -2,8 +2,6 @@
 
 # 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
Index: tools/gcc/mknative-gcc
===================================================================
RCS file: /cvsroot/src/tools/gcc/mknative-gcc,v
retrieving revision 1.101
diff -p -u -r1.101 mknative-gcc
--- tools/gcc/mknative-gcc	23 Feb 2019 06:54:45 -0000	1.101
+++ tools/gcc/mknative-gcc	13 Aug 2020 11:01:19 -0000
@@ -4,7 +4,7 @@
 # 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 @@ fi
 
 . $_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 \
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.1149.2.3
diff -p -u -r1.1149.2.3 bsd.own.mk
--- share/mk/bsd.own.mk	9 Dec 2019 15:19:30 -0000	1.1149.2.3
+++ share/mk/bsd.own.mk	13 Aug 2020 11:01:19 -0000
@@ -75,7 +75,7 @@ EXTERNAL_GCC_SUBDIR?=	gcc.old
 .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