Module Name: src
Committed By: martin
Date: Fri Aug 14 11:02:42 UTC 2020
Modified Files:
src/share/mk [netbsd-9]: bsd.own.mk
src/tools/gcc [netbsd-9]: Makefile gcc-version.mk mknative-gcc
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.1149.2.3 -r1.1149.2.4 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.93 -r1.93.2.1 src/tools/gcc/Makefile
cvs rdiff -u -r1.16 -r1.16.2.1 src/tools/gcc/gcc-version.mk
cvs rdiff -u -r1.101 -r1.101.2.1 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1149.2.3 src/share/mk/bsd.own.mk:1.1149.2.4
--- src/share/mk/bsd.own.mk:1.1149.2.3 Mon Dec 9 15:19:30 2019
+++ src/share/mk/bsd.own.mk Fri Aug 14 11:02:42 2020
@@ -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 @@ 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
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.93 src/tools/gcc/Makefile:1.93.2.1
--- src/tools/gcc/Makefile:1.93 Tue Mar 19 05:55:00 2019
+++ src/tools/gcc/Makefile Fri Aug 14 11:02:42 2020
@@ -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}
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.16 src/tools/gcc/gcc-version.mk:1.16.2.1
--- src/tools/gcc/gcc-version.mk:1.16 Wed Mar 20 05:09:26 2019
+++ src/tools/gcc/gcc-version.mk Fri Aug 14 11:02:42 2020
@@ -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
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.101 src/tools/gcc/mknative-gcc:1.101.2.1
--- src/tools/gcc/mknative-gcc:1.101 Sat Feb 23 06:54:45 2019
+++ src/tools/gcc/mknative-gcc Fri Aug 14 11:02:42 2020
@@ -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 @@ 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 \
