summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2019-01-19 12:58:37 +0000
committermrg <mrg@NetBSD.org>2019-01-19 12:58:37 +0000
commit2ac3a8b201052548fb047dfbec117d6682fb3ea5 (patch)
tree693644680d7351a56c3714a5269aa47620d1a812
parentf2cc3cb68e8870afa80cc5839c355239947728fc (diff)
obsolete gcc 5 support.
add gcc 7 support. call it "nb1 20190119"
-rw-r--r--share/mk/bsd.own.mk4
-rw-r--r--tools/gcc/Makefile13
-rw-r--r--tools/gcc/gcc-version.mk4
3 files changed, 10 insertions, 11 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 15f5ddd7402..76088267bf6 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1094 2019/01/09 23:52:29 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1095 2019/01/19 12:58:37 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -72,6 +72,8 @@ MKGCCCMDS?= no
#
.if ${HAVE_GCC} == 6
EXTERNAL_GCC_SUBDIR?= gcc.old
+.elif ${HAVE_GCC} == 7
+EXTERNAL_GCC_SUBDIR?= gcc
.else
EXTERNAL_GCC_SUBDIR=? /does/not/exist
.endif
diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
index 8a559d7efa4..1dbbabc0242 100644
--- a/tools/gcc/Makefile
+++ b/tools/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2018/10/19 16:16:21 maya Exp $
+# $NetBSD: Makefile,v 1.88 2019/01/19 12:58:37 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} == 5
+.if ${HAVE_GCC} == 6
MKNATIVE= ${.CURDIR}/mknative-gcc.old
.endif
@@ -47,10 +47,7 @@ COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
.endif
-.if ${HAVE_GCC} >= 5
-# Turn on colour output only if GCC_COLORS env is set
COMMON_CONFIGURE_ARGS+= --with-diagnostics-color=auto-if-env
-.endif
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
CONFIGURE_ARGS+= \
@@ -89,10 +86,10 @@ MKNATIVE_CONFIG_TARGET_LIBS=
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
-.if ${HAVE_GCC} == 6
+.if ${HAVE_GCC} == 7
+MKNATIVE_TARGET= gcc7
+.elif ${HAVE_GCC} == 6
MKNATIVE_TARGET= gcc6
-.elif ${HAVE_GCC} == 5
-MKNATIVE_TARGET= gcc5
.endif
MKNATIVE_CONFIG_TARGET_LIBS+= \
diff --git a/tools/gcc/gcc-version.mk b/tools/gcc/gcc-version.mk
index 1efeb1352a5..8391bed593f 100644
--- a/tools/gcc/gcc-version.mk
+++ b/tools/gcc/gcc-version.mk
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.12 2018/11/11 23:05:25 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.13 2019/01/19 12:58:37 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 6
NETBSD_GCC_VERSION=nb4 20181109
.elif ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb1 20180905
+NETBSD_GCC_VERSION=nb1 20190119
.endif