Module Name: src
Committed By: mrg
Date: Mon Sep 30 08:40:20 UTC 2019
Modified Files:
src/tools/gcc: Makefile README.mknative gcc-version.mk
Log Message:
remove HAVE_GCC == 6 support, add HAVE_GCC == 8 support
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/tools/gcc/Makefile
cvs rdiff -u -r1.22 -r1.23 src/tools/gcc/README.mknative
cvs rdiff -u -r1.16 -r1.17 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.94 src/tools/gcc/Makefile:1.95
--- src/tools/gcc/Makefile:1.94 Mon Sep 9 13:57:13 2019
+++ src/tools/gcc/Makefile Mon Sep 30 08:40:20 2019
@@ -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 @@ MODULE= gcc4
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=
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+= \
Index: src/tools/gcc/README.mknative
diff -u src/tools/gcc/README.mknative:1.22 src/tools/gcc/README.mknative:1.23
--- src/tools/gcc/README.mknative:1.22 Fri Feb 2 01:02:41 2018
+++ src/tools/gcc/README.mknative Mon Sep 30 08:40:20 2019
@@ -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 @@ work.
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 @@ work.
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 @@ work.
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
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.16 src/tools/gcc/gcc-version.mk:1.17
--- src/tools/gcc/gcc-version.mk:1.16 Wed Mar 20 05:09:26 2019
+++ src/tools/gcc/gcc-version.mk Mon Sep 30 08:40:20 2019
@@ -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
