updates for GCC 6.4: add gcc-6 specific headers, combine some trunk
authormrg <mrg@NetBSD.org>
Sat, 03 Feb 2018 21:27:45 +0000
branchtrunk
changeset 274949 fd6476aa8636
parent 274948 9c47ad40072c
child 274950 24e3cb510e61
updates for GCC 6.4: add gcc-6 specific headers, combine some all-gcc files, bump the shlib versions on new libs.
distrib/sets/lists/base/ad.mips
distrib/sets/lists/base/mi
distrib/sets/lists/base/shl.mi
distrib/sets/lists/comp/ad.arm
distrib/sets/lists/comp/ad.hppa
distrib/sets/lists/comp/ad.m68k
distrib/sets/lists/comp/ad.mips
distrib/sets/lists/comp/ad.powerpc
distrib/sets/lists/comp/ad.riscv
distrib/sets/lists/comp/ad.sh3
distrib/sets/lists/comp/md.alpha
distrib/sets/lists/comp/md.amd64
distrib/sets/lists/comp/md.hppa
distrib/sets/lists/comp/md.i386
distrib/sets/lists/comp/md.or1k
distrib/sets/lists/comp/md.sparc
distrib/sets/lists/comp/md.sparc64
distrib/sets/lists/comp/md.vax
distrib/sets/lists/comp/mi
distrib/sets/lists/comp/shl.mi
distrib/sets/lists/debug/ad.mips
distrib/sets/lists/debug/mi
distrib/sets/lists/debug/shl.mi
etc/mtree/NetBSD.dist.base
external/gpl3/gcc/lib/libasan/shlib_version
external/gpl3/gcc/lib/libgomp/Makefile
external/gpl3/gcc/lib/libstdc++-v3/Makefile
external/gpl3/gcc/lib/libubsan/shlib_version
--- a/distrib/sets/lists/base/ad.mips	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/base/ad.mips	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.75 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: ad.mips,v 1.76 2018/02/03 21:27:45 mrg Exp $
 ./lib/libc_fp.so				base-sys-shlib		dynamicroot,softfloat,arch64
 ./lib/libc_fp.so.0				base-sys-shlib		dynamicroot,softfloat,arch64
 ./lib/libc_fp.so.0.0				base-sys-shlib		dynamicroot,softfloat,arch64
@@ -15,6 +15,7 @@
 ./usr/lib/o32/libc_fp.so.0.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libgomp.so.1.1			base-compat-shlib	compat,pic,arch64,gcc=48
 ./usr/lib/o32/libgomp.so.1.2			base-compat-shlib	compat,pic,arch64,gcc=5
+./usr/lib/o32/libgomp.so.1.3			base-compat-shlib	compat,pic,arch64,gcc=6
 ./usr/libexec/ld.elf_so-64			base-compat-shlib	compat,pic,arch64
 ./usr/libexec/ld.elf_so-o32			base-sysutil-bin	compat,pic,arch64
 ./usr/lkm/ldscript				base-obsolete		obsolete
--- a/distrib/sets/lists/base/mi	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/base/mi	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1171 2018/02/01 20:50:23 kamil Exp $
+# $NetBSD: mi,v 1.1172 2018/02/03 21:27:45 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1166,9 +1166,11 @@
 ./usr/include/g++/tr2				base-cxx-usr
 ./usr/include/gcc-4.1				base-obsolete		obsolete
 ./usr/include/gcc-4.5				base-obsolete		obsolete
-./usr/include/gcc-4.8				base-c-usr
+./usr/include/gcc-4.8				base-c-usr		obsolete
 ./usr/include/gcc-5				base-c-usr
 ./usr/include/gcc-5/sanitizer			base-c-usr
+./usr/include/gcc-6				base-c-usr
+./usr/include/gcc-6/sanitizer			base-c-usr
 ./usr/include/gssapi				base-c-usr
 ./usr/include/gssapi/rpc			base-obsolete		obsolete
 ./usr/include/isofs				base-c-usr
--- a/distrib/sets/lists/base/shl.mi	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/base/shl.mi	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.826 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: shl.mi,v 1.827 2018/02/03 21:27:45 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -175,12 +175,13 @@
 ./usr/lib/libarchive.so				base-sys-shlib		compatfile
 ./usr/lib/libarchive.so.4			base-sys-shlib		compatfile
 ./usr/lib/libarchive.so.4.0			base-sys-shlib		compatfile
-./usr/lib/libasan.so				base-sys-shlib		compatfile,gcc=48
-./usr/lib/libasan.so				base-sys-shlib		compatfile,gcc=5
+./usr/lib/libasan.so				base-sys-shlib		compatfile,gcc
 ./usr/lib/libasan.so.0				base-sys-shlib		compatfile,gcc=48
 ./usr/lib/libasan.so.0.0			base-sys-shlib		compatfile,gcc=48
 ./usr/lib/libasan.so.2				base-sys-shlib		compatfile,gcc=5
 ./usr/lib/libasan.so.2.0			base-sys-shlib		compatfile,gcc=5
+./usr/lib/libasan.so.3				base-sys-shlib		compatfile,gcc=6
+./usr/lib/libasan.so.3.0			base-sys-shlib		compatfile,gcc=6
 ./usr/lib/libasn1.so				base-krb5-shlib		compatfile,kerberos
 ./usr/lib/libasn1.so.10				base-krb5-shlib		compatfile,kerberos
 ./usr/lib/libasn1.so.10.0			base-krb5-shlib		compatfile,kerberos
@@ -805,6 +806,7 @@
 ./usr/lib/libstdc++.so.8			base-sys-shlib		compatfile,gcc,cxx,libstdcxx
 ./usr/lib/libstdc++.so.7.3			base-sys-shlib		compatfile,gcc=48,cxx,libstdcxx
 ./usr/lib/libstdc++.so.8.0			base-sys-shlib		compatfile,gcc=5,cxx,libstdcxx
+./usr/lib/libstdc++.so.8.1			base-sys-shlib		compatfile,gcc=6,cxx,libstdcxx
 ./usr/lib/libtelnet.so				base-obsolete		obsolete
 ./usr/lib/libtermcap.so				base-sys-shlib		compatfile
 ./usr/lib/libtermcap.so.0			base-sys-shlib		compatfile
@@ -824,9 +826,11 @@
 ./usr/lib/libtspi.so				base-sys-shlib		compatfile,tpm
 ./usr/lib/libtspi.so.3				base-sys-shlib		compatfile,tpm
 ./usr/lib/libtspi.so.3.0			base-sys-shlib		compatfile,tpm
-./usr/lib/libubsan.so				base-sys-shlib		compatfile,gcc=5
+./usr/lib/libubsan.so				base-sys-shlib		compatfile,gcc
 ./usr/lib/libubsan.so.1				base-sys-shlib		compatfile,gcc=5
 ./usr/lib/libubsan.so.1.0			base-sys-shlib		compatfile,gcc=5
+./usr/lib/libubsan.so.2				base-sys-shlib		compatfile,gcc=6
+./usr/lib/libubsan.so.2.0			base-sys-shlib		compatfile,gcc=6
 ./usr/lib/libukfs.so				base-sys-shlib		compatfile,rump
 ./usr/lib/libukfs.so.1				base-sys-shlib		compatfile,rump
 ./usr/lib/libukfs.so.1.0			base-sys-shlib		compatfile,rump
--- a/distrib/sets/lists/comp/ad.arm	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/ad.arm	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.82 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: ad.arm,v 1.83 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/acorn26				comp-obsolete		obsolete
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
 ./usr/include/acorn26/aout_machdep.h		comp-obsolete		obsolete
@@ -409,6 +409,11 @@
 ./usr/include/gcc-5/mmintrin.h			comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/unwind-arm-common.h		comp-c-include		gcccmds,gcc=5,eabi
+./usr/include/gcc-6/arm_acle.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/arm_neon.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/unwind-arm-common.h		comp-c-include		gcccmds,gcc=6,eabi
 ./usr/include/hpcarm				comp-c-include
 ./usr/include/hpcarm/ansi.h			comp-obsolete		obsolete
 ./usr/include/hpcarm/aout_machdep.h		comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/ad.hppa	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/ad.hppa	Sat Feb 03 21:27:45 2018 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: ad.hppa,v 1.11 2018/02/02 01:02:41 mrg Exp $
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
+# $NetBSD: ad.hppa,v 1.12 2018/02/03 21:27:45 mrg Exp $
+./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/hppa				comp-c-include
 ./usr/include/hppa/ansi.h			comp-c-include
 ./usr/include/hppa/aout_machdep.h		comp-c-include
--- a/distrib/sets/lists/comp/ad.m68k	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/ad.m68k	Sat Feb 03 21:27:45 2018 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: ad.m68k,v 1.54 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: ad.m68k,v 1.55 2018/02/03 21:27:45 mrg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
-./usr/include/gcc-4.8/math-68881.h		comp-c-include		gcccmds,gcc=48
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
+./usr/include/gcc-4.8/math-68881.h		comp-c-include		obsolete
+./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
 ./usr/include/gcc-5/math-68881.h		comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/math-68881.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/m68k				comp-c-include
 ./usr/include/m68k/ansi.h			comp-c-include
 ./usr/include/m68k/aout_machdep.h		comp-c-include
--- a/distrib/sets/lists/comp/ad.mips	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/ad.mips	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.71 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: ad.mips,v 1.72 2018/02/03 21:27:45 mrg Exp $
 -./usr/lib/64/libgomp.a
 -./usr/lib/64/libgomp.so
 -./usr/lib/64/libgomp.so.1
@@ -19,6 +19,8 @@
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-5/loongson.h			comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/loongson.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/mips				comp-c-include
 ./usr/include/mips/ansi.h			comp-c-include
 ./usr/include/mips/aout_machdep.h		comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/ad.powerpc	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/ad.powerpc	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.88 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: ad.powerpc,v 1.89 2018/02/03 21:27:45 mrg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/bin/psim					comp-debug-bin		gdb
 ./usr/include/altivec.h				comp-obsolete		obsolete
@@ -50,6 +50,17 @@
 ./usr/include/gcc-5/spu2vmx.h			comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/vec_types.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/altivec.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/htmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/htmxlintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/paired.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/ppc-asm.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/ppu_intrinsics.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/si2vmx.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/spe.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/spu2vmx.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/vec_types.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/powerpc				comp-c-include
 ./usr/include/powerpc/ansi.h			comp-c-include
 ./usr/include/powerpc/aout_machdep.h		comp-c-include
--- a/distrib/sets/lists/comp/ad.riscv	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/ad.riscv	Sat Feb 03 21:27:45 2018 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: ad.riscv,v 1.8 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: ad.riscv,v 1.9 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/g++/bits/riscv32			comp-c-include		arch64
 ./usr/include/g++/bits/riscv32/c++config.h	comp-c-include		arch64,gcc
 ./usr/include/g++/bits/riscv64			comp-c-include		arch64
 ./usr/include/g++/bits/riscv64/c++config.h	comp-c-include		arch64,gcc
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
+./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/riscv				comp-c-include
 ./usr/include/riscv/ansi.h			comp-c-include
--- a/distrib/sets/lists/comp/ad.sh3	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/ad.sh3	Sat Feb 03 21:27:45 2018 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: ad.sh3,v 1.36 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: ad.sh3,v 1.37 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sh3				comp-c-include
 ./usr/include/sh3/ansi.h			comp-c-include
--- a/distrib/sets/lists/comp/md.alpha	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/md.alpha	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.72 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: md.alpha,v 1.73 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/alpha				comp-c-include
 ./usr/include/alpha/_G_config.h			comp-obsolete		obsolete
 ./usr/include/alpha/alpha_cpu.h			comp-c-include
@@ -71,8 +71,9 @@
 ./usr/include/alpha/wsconsio.h			comp-obsolete		obsolete
 ./usr/include/alpha/z8530var.h			comp-c-include
 ./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
+./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/lib/crtfm.o				comp-c-lib
 ./usr/lib/libalpha.a				comp-c-lib
--- a/distrib/sets/lists/comp/md.amd64	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.253 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: md.amd64,v 1.254 2018/02/03 21:27:45 mrg Exp $
 
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
@@ -463,6 +463,63 @@
 ./usr/include/gcc-5/xsaveoptintrin.h		comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/xsavesintrin.h		comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/xtestintrin.h		comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/adxintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/ammintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx2intrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx612bwintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512cdintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512dqintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512erintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512fintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512ifmaintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512ifmavlintrin.h	comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512pfintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vbmiintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vbmivlintrin.h	comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vlbwintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vldqintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vlintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avxintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/bmi2intrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/bmiintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/bmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/clflushoptintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/clwbintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/cpuid.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/cross-stdarg.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/emmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/f16cintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/fma4intrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/fmaintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/fxsrintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/ia32intrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/immintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/lwpintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/lzcntintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mm3dnow.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mm_malloc.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mwaitxintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/nmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/pmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/popcntintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/prfchwintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/rdseedintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/rtmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/shaintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/smmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tbmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/wmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/x86intrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xopintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xsavecintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xsaveintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xsaveoptintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xsavesintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xtestintrin.h		comp-c-include		gcccmds,gcc=6
 ./usr/include/i386				comp-c-include
 ./usr/include/i386/ansi.h			comp-c-include
 ./usr/include/i386/aout_machdep.h		comp-c-include
--- a/distrib/sets/lists/comp/md.hppa	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/md.hppa	Sat Feb 03 21:27:45 2018 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: md.hppa,v 1.8 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: md.hppa,v 1.9 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
+./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/hp700				comp-obsolete		obsolete
 ./usr/include/hp700/ansi.h			comp-obsolete		obsolete
 ./usr/include/hp700/aout_machdep.h		comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.i386	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/md.i386	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.176 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: md.i386,v 1.177 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -387,6 +387,63 @@
 ./usr/include/gcc-5/xsaveoptintrin.h		comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/xsavesintrin.h		comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/xtestintrin.h		comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/adxintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/ammintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx2intrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512bwintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512cdintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512dqintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512erintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512fintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512ifmaintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512ifmavlintrin.h	comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512pfintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vbmiintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vbmivlintrin.h	comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vlbwintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vldqintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avx512vlintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/avxintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/bmi2intrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/bmiintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/bmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/clflushoptintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/clwbintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/cpuid.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/cross-stdarg.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/emmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/f16cintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/fma4intrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/fmaintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/fxsrintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/ia32intrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/immintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/lwpintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/lzcntintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mm3dnow.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mm_malloc.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/mwaitxintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/nmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/pmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/popcntintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/prfchwintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/rdseedintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/rtmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/shaintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/smmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tbmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/tmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/wmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/x86intrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xmmintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xopintrin.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xsavecintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xsaveintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xsaveoptintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xsavesintrin.h		comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/xtestintrin.h		comp-c-include		gcccmds,gcc=6
 ./usr/include/i386				comp-c-include
 ./usr/include/i386/_G_config.h			comp-obsolete		obsolete
 ./usr/include/i386/ansi.h			comp-c-include
--- a/distrib/sets/lists/comp/md.or1k	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/md.or1k	Sat Feb 03 21:27:45 2018 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: md.or1k,v 1.4 2018/02/02 01:02:41 mrg Exp $
-./usr/include/gcc-4.8/tgmath.h		comp-c-include		gcccmds,gcc=48
+# $NetBSD: md.or1k,v 1.5 2018/02/03 21:27:45 mrg Exp $
+./usr/include/gcc-4.8/tgmath.h		comp-c-include		obsolete
 ./usr/include/gcc-5/tgmath.h		comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h		comp-c-include		gcccmds,gcc=6
 ./usr/include/ieeefp.h			comp-c-include
 ./usr/include/or1k			comp-c-include
 ./usr/include/or1k/ansi.h		comp-c-include
--- a/distrib/sets/lists/comp/md.sparc	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/md.sparc	Sat Feb 03 21:27:45 2018 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: md.sparc,v 1.91 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: md.sparc,v 1.92 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
-./usr/include/gcc-4.8/visintrin.h		comp-c-include		gcccmds,gcc=48
+./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
+./usr/include/gcc-4.8/visintrin.h		comp-c-include		obsolete
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/visintrin.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/visintrin.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.sparc64	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/md.sparc64	Sat Feb 03 21:27:45 2018 +0000
@@ -1,13 +1,15 @@
-# $NetBSD: md.sparc64,v 1.198 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: md.sparc64,v 1.199 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/g++/bits/sparc			comp-c-include		compat
 ./usr/include/g++/bits/sparc/c++config.h	comp-c-include		gcc,compat
 ./usr/include/g++/bits/sparc64			comp-c-include		compat
 ./usr/include/g++/bits/sparc64/c++config.h	comp-c-include		gcc,compat
 ./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
-./usr/include/gcc-4.8/visintrin.h		comp-c-include		gcccmds,gcc=48
+./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
+./usr/include/gcc-4.8/visintrin.h		comp-c-include		obsolete
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
 ./usr/include/gcc-5/visintrin.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
+./usr/include/gcc-6/visintrin.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/md.vax	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/md.vax	Sat Feb 03 21:27:45 2018 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: md.vax,v 1.45 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: md.vax,v 1.46 2018/02/03 21:27:45 mrg Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-obsolete		obsolete
-./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48
+./usr/include/gcc-4.8/tgmath.h			comp-c-include		obsolete
 ./usr/include/gcc-5/tgmath.h			comp-c-include		gcccmds,gcc=5
+./usr/include/gcc-6/tgmath.h			comp-c-include		gcccmds,gcc=6
 ./usr/include/ieeefp.h				comp-obsolete		obsolete
 ./usr/include/vax				comp-c-include
 ./usr/include/vax/_G_config.h			comp-obsolete		obsolete
--- a/distrib/sets/lists/comp/mi	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/mi	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2173 2018/02/02 01:02:41 mrg Exp $
+#	$NetBSD: mi,v 1.2174 2018/02/03 21:27:45 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -946,12 +946,12 @@
 ./usr/include/g++/bitprims.h			comp-obsolete		obsolete
 ./usr/include/g++/bits/algorithmfwd.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/alloc_traits.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/allocated_ptr.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/allocated_ptr.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/allocator.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/atomic_0.h		comp-obsolete	obsolete
 ./usr/include/g++/bits/atomic_2.h		comp-obsolete	obsolete
 ./usr/include/g++/bits/atomic_base.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/atomic_futex.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/atomic_futex.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/atomic_lockfree_defines.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/atomic_word.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/atomicfwd_c.h		comp-obsolete	obsolete
@@ -964,7 +964,7 @@
 ./usr/include/g++/bits/basic_string.tcc		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/boost_concept_check.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/c++0x_warning.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/c++14_warning.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/c++14_warning.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/c++allocator.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/c++config.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/c++io.h			comp-cxx-include	gcc,cxx,libstdcxx
@@ -983,7 +983,7 @@
 ./usr/include/g++/bits/cxxabi_forced.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/cxxabi_tweaks.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/deque.tcc		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/enable_special_members.h	comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/enable_special_members.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/error_constants.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/exception_defines.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/exception_ptr.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1010,7 +1010,7 @@
 ./usr/include/g++/bits/list.tcc			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/locale_classes.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/locale_classes.tcc	comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/locale_conv.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/locale_conv.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/locale_facets.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/locale_facets.tcc	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/locale_facets_nonio.h	comp-cxx-include	gcc,cxx,libstdcxx
@@ -1025,34 +1025,34 @@
 ./usr/include/g++/bits/os_defines.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/ostream.tcc		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/ostream_insert.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/parse_numbers.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/parse_numbers.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/postypes.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/predefined_ops.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/predefined_ops.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/pthread_allocimpl.h	comp-obsolete		obsolete
 ./usr/include/g++/bits/ptr_traits.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/quoted_string.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/quoted_string.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/random.h			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/random.tcc		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/range_access.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/regex.h			comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/regex.tcc		comp-cxx-include	gcc=5,cxx,libstdcxx
-./usr/include/g++/bits/regex_automaton.h	comp-cxx-include	gcc=5,cxx,libstdcxx
-./usr/include/g++/bits/regex_automaton.tcc	comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/regex.tcc		comp-cxx-include	gcc,cxx,libstdcxx
+./usr/include/g++/bits/regex_automaton.h	comp-cxx-include	gcc,cxx,libstdcxx
+./usr/include/g++/bits/regex_automaton.tcc	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/regex_compiler.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/regex_compiler.tcc	comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/regex_compiler.tcc	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/regex_constants.h	comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/regex_cursor.h		comp-cxx-include	gcc=48,cxx,libstdcxx
+./usr/include/g++/bits/regex_cursor.h		comp-cxx-include	obsolete
 ./usr/include/g++/bits/regex_error.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/regex_executor.h		comp-cxx-include	gcc=5,cxx,libstdcxx
-./usr/include/g++/bits/regex_executor.tcc	comp-cxx-include	gcc=5,cxx,libstdcxx
-./usr/include/g++/bits/regex_grep_matcher.h	comp-cxx-include	gcc=48,cxx,libstdcxx
-./usr/include/g++/bits/regex_grep_matcher.tcc	comp-cxx-include	gcc=48,cxx,libstdcxx
-./usr/include/g++/bits/regex_nfa.h		comp-cxx-include	gcc=48,cxx,libstdcxx
-./usr/include/g++/bits/regex_nfa.tcc		comp-cxx-include	gcc=48,cxx,libstdcxx
-./usr/include/g++/bits/regex_scanner.h		comp-cxx-include	gcc=5,cxx,libstdcxx
-./usr/include/g++/bits/regex_scanner.tcc	comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/regex_executor.h		comp-cxx-include	gcc,cxx,libstdcxx
+./usr/include/g++/bits/regex_executor.tcc	comp-cxx-include	gcc,cxx,libstdcxx
+./usr/include/g++/bits/regex_grep_matcher.h	comp-cxx-include	obsolete
+./usr/include/g++/bits/regex_grep_matcher.tcc	comp-cxx-include	obsolete
+./usr/include/g++/bits/regex_nfa.h		comp-cxx-include	obsolete
+./usr/include/g++/bits/regex_nfa.tcc		comp-cxx-include	obsolete
+./usr/include/g++/bits/regex_scanner.h		comp-cxx-include	gcc,cxx,libstdcxx
+./usr/include/g++/bits/regex_scanner.tcc	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/shared_ptr.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/bits/shared_ptr_atomic.h	comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/shared_ptr_atomic.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/shared_ptr_base.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/slice_array.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/sstream.tcc		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1092,7 +1092,7 @@
 ./usr/include/g++/bits/stringfwd.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/time_members.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/type_traits.h		comp-obsolete		obsolete
-./usr/include/g++/bits/uniform_int_dist.h	comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/bits/uniform_int_dist.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/unique_ptr.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/unordered_map.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/bits/unordered_set.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1121,7 +1121,7 @@
 ./usr/include/g++/climits			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/clocale			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/cmath				comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/codecvt			comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/codecvt			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/compare.h			comp-obsolete		obsolete
 ./usr/include/g++/complex			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/complex.h			comp-obsolete		obsolete
@@ -1162,7 +1162,7 @@
 ./usr/include/g++/debug/multimap.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/debug/multiset.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/debug/safe_base.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/debug/safe_container.h	comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/debug/safe_container.h	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/debug/safe_iterator.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/debug/safe_iterator.tcc	comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/debug/safe_local_iterator.h	comp-cxx-include	gcc,cxx,libstdcxx
@@ -1188,7 +1188,7 @@
 ./usr/include/g++/exception_defines.h		comp-obsolete		obsolete
 ./usr/include/g++/exception_ptr.h		comp-obsolete		obsolete
 ./usr/include/g++/ext/algorithm			comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/ext/aligned_buffer.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/ext/aligned_buffer.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/ext/alloc_traits.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/ext/array_allocator.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/ext/atomicity.h		comp-cxx-include	gcc,cxx,libstdcxx
@@ -1752,7 +1752,7 @@
 ./usr/include/g++/profile/map.h			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/profile/multimap.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/profile/multiset.h		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/profile/ordered_base.h		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/profile/ordered_base.h		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/profile/set			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/profile/set.h			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/profile/unordered_base.h	comp-cxx-include	gcc,cxx,libstdcxx
@@ -1775,7 +1775,7 @@
 ./usr/include/g++/scoped_allocator		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/set				comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/set.h				comp-obsolete		obsolete
-./usr/include/g++/shared_mutex		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/shared_mutex		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/slist				comp-obsolete		obsolete
 ./usr/include/g++/slist.h			comp-obsolete		obsolete
 ./usr/include/g++/sstream			comp-cxx-include	gcc,cxx,libstdcxx
@@ -1972,7 +1972,7 @@
 ./usr/include/g++/tr2/bool_set			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr2/bool_set.tcc		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr2/dynamic_bitset		comp-cxx-include	gcc,cxx,libstdcxx
-./usr/include/g++/tr2/dynamic_bitset.tcc		comp-cxx-include	gcc=5,cxx,libstdcxx
+./usr/include/g++/tr2/dynamic_bitset.tcc		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr2/ratio			comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tr2/type_traits		comp-cxx-include	gcc,cxx,libstdcxx
 ./usr/include/g++/tree.cc			comp-obsolete		obsolete
@@ -1992,8 +1992,8 @@
 ./usr/include/g++/vector.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.5/mf-runtime.h		comp-obsolete		obsolete
 ./usr/include/gcc-4.5/omp.h			comp-obsolete		obsolete
-./usr/include/gcc-4.8/mf-runtime.h		comp-gcc-include	gcc=48
-./usr/include/gcc-4.8/omp.h			comp-gcc-include	gcc=48
+./usr/include/gcc-4.8/mf-runtime.h		comp-gcc-include	obsolete
+./usr/include/gcc-4.8/omp.h			comp-gcc-include	obsolete
 ./usr/include/gcc-5/omp.h			comp-gcc-include	gcc=5
 ./usr/include/gcc-5/openacc.h			comp-gcc-include	gcc=5
 ./usr/include/gcc-5/stdatomic.h			comp-gcc-include	gcc=5,gcccmds
@@ -2001,6 +2001,13 @@
 ./usr/include/gcc-5/sanitizer/asan_interface.h	comp-gcc-include	gcc=5
 ./usr/include/gcc-5/sanitizer/common_interface_defs.h	comp-gcc-include	gcc=5
 ./usr/include/gcc-5/sanitizer/tsan_interface_atomic.h	comp-gcc-include	gcc=5
+./usr/include/gcc-6/omp.h			comp-gcc-include	gcc=6
+./usr/include/gcc-6/openacc.h			comp-gcc-include	gcc=6
+./usr/include/gcc-6/stdatomic.h			comp-gcc-include	gcc=6,gcccmds
+./usr/include/gcc-6/sanitizer/allocator_interface.h	comp-gcc-include	gcc=6
+./usr/include/gcc-6/sanitizer/asan_interface.h	comp-gcc-include	gcc=6
+./usr/include/gcc-6/sanitizer/common_interface_defs.h	comp-gcc-include	gcc=6
+./usr/include/gcc-6/sanitizer/tsan_interface_atomic.h	comp-gcc-include	gcc=6
 ./usr/include/gelf.h				comp-c-include
 ./usr/include/getopt.h				comp-c-include
 ./usr/include/glob.h				comp-c-include
@@ -3186,10 +3193,8 @@
 ./usr/lib/libamu_p.a				comp-obsolete		obsolete
 ./usr/lib/libarchive.a				comp-c-lib		compatfile
 ./usr/lib/libarchive_p.a			comp-c-proflib		compatfile,profile
-./usr/lib/libasan.a				comp-c-lib		compatfile,gcc=48
-./usr/lib/libasan.a				comp-c-lib		compatfile,gcc=5
-./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,gcc=48
-./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,gcc=5
+./usr/lib/libasan.a				comp-c-lib		compatfile,gcc
+./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,gcc
 ./usr/lib/libasn1.a				comp-krb5-lib		compatfile,kerberos
 ./usr/lib/libasn1_p.a				comp-krb5-proflib	compatfile,kerberos,profile
 ./usr/lib/libatf-c++.a				comp-atf-lib		compatfile,atf
@@ -3662,8 +3667,8 @@
 ./usr/lib/libtre_p.a				comp-c-proflib		compatfile,profile
 ./usr/lib/libtspi.a				comp-c-lib		compatfile,tpm
 ./usr/lib/libtspi_p.a				comp-c-proflib		compatfile,tpm,profile
-./usr/lib/libubsan.a				comp-c-lib		compatfile,gcc=5
-./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,gcc=5
+./usr/lib/libubsan.a				comp-c-lib		compatfile,gcc
+./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,gcc
 ./usr/lib/libukfs.a				comp-c-lib		compatfile,rump
 ./usr/lib/libukfs_p.a				comp-c-proflib		compatfile,rump,profile
 ./usr/lib/libumem.a				comp-zfs-lib		compatfile,zfs
--- a/distrib/sets/lists/comp/shl.mi	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/comp/shl.mi	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.311 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: shl.mi,v 1.312 2018/02/03 21:27:45 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7,8 +7,7 @@
 ./usr/lib/crtendS.o				comp-c-lib		compatfile
 ./usr/lib/libamu_pic.a				comp-obsolete		obsolete
 ./usr/lib/libarchive_pic.a			comp-c-piclib		compatfile,picinstall
-./usr/lib/libasan_pic.a				comp-c-piclib		compatfile,picinstall,gcc=48
-./usr/lib/libasan_pic.a				comp-c-piclib		compatfile,picinstall,gcc=5
+./usr/lib/libasan_pic.a				comp-c-piclib		compatfile,picinstall,gcc
 ./usr/lib/libasn1_pic.a				comp-c-piclib		compatfile,picinstall,kerberos
 ./usr/lib/libatf-c++_pic.a			comp-atf-piclib		compatfile,picinstall,atf
 ./usr/lib/libatf-c_pic.a			comp-atf-piclib		compatfile,picinstall,atf
@@ -263,7 +262,7 @@
 ./usr/lib/libtpm_unseal_pic.a			comp-tpm-lib		compatfile,picinstall,tpm
 ./usr/lib/libtre_pic.a				comp-c-piclib		compatfile,picinstall
 ./usr/lib/libtspi_pic.a				comp-c-piclib		compatfile,picinstall,tpm
-./usr/lib/libubsan_pic.a			comp-c-piclib		compatfile,picinstall,gcc=5
+./usr/lib/libubsan_pic.a			comp-c-piclib		compatfile,picinstall,gcc
 ./usr/lib/libukfs_pic.a				comp-c-piclib		compatfile,picinstall,rump
 ./usr/lib/libumem_pic.a				comp-zfs-piclib		compatfile,picinstall,zfs
 ./usr/lib/libunbound_pic.a			comp-c-piclib		compatfile,picinstall,unbound
--- a/distrib/sets/lists/debug/ad.mips	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/debug/ad.mips	Sat Feb 03 21:27:45 2018 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: ad.mips,v 1.66 2018/02/02 01:02:41 mrg Exp $
--./usr/lib/64/libgomp_g.a				comp-c-debuglib		debuglib,compatfile,gcc=48
--./usr/libdata/debug/usr/lib/64/libgomp.so.1.1.debug	comp-c-debug		debug,compatfile,gcc=48
+# $NetBSD: ad.mips,v 1.67 2018/02/03 21:27:45 mrg Exp $
 -./usr/libdata/debug/usr/lib/64/libgomp.so.1.2.debug	comp-c-debug		debug,compatfile,gcc=5
+-./usr/libdata/debug/usr/lib/64/libgomp.so.1.3.debug	comp-c-debug		debug,compatfile,gcc=6
 ./usr/lib/64/libc_fp_g.a				comp-c-debuglib		debuglib,softfloat,compat,arch64
 ./usr/lib/libc_fp_g.a					comp-c-debuglib		debuglib,softfloat,arch64
 ./usr/lib/o32/libc_fp_g.a				comp-c-debuglib		debuglib,softfloat,compat,arch64
--- a/distrib/sets/lists/debug/mi	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/debug/mi	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.238 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: mi,v 1.239 2018/02/03 21:27:45 mrg Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib					comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -26,8 +26,7 @@
 ./usr/lib/i18n/libmapper_zone_g.a		comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libamu_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libarchive_g.a			comp-c-debuglib		debuglib,compatfile
-./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,compatfile,gcc=48
-./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,compatfile,gcc=5
+./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,compatfile,gcc
 ./usr/lib/libasn1_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libatf-c++_g.a			comp-c-debuglib		debuglib,compatfile,atf
 ./usr/lib/libatf-c_g.a				comp-c-debuglib		debuglib,compatfile,atf
@@ -252,7 +251,7 @@
 ./usr/lib/libtpm_unseal_g.a			comp-c-debuglib		debuglib,compatfile,tpm
 ./usr/lib/libtre_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libtspi_g.a				comp-c-debuglib		debuglib,compatfile,tpm
-./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,compatfile,gcc=5
+./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,compatfile,gcc
 ./usr/lib/libukfs_g.a				comp-c-debuglib		debuglib,compatfile,rump
 ./usr/lib/libumem_g.a				comp-c-debuglib		debuglib,compatfile,zfs
 ./usr/lib/libunbound_g.a			comp-c-debuglib		debuglib,compatfile,unbound
--- a/distrib/sets/lists/debug/shl.mi	Sat Feb 03 19:34:01 2018 +0000
+++ b/distrib/sets/lists/debug/shl.mi	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.189 2018/02/02 01:02:41 mrg Exp $
+# $NetBSD: shl.mi,v 1.190 2018/02/03 21:27:45 mrg Exp $
 ./usr/lib/libbfd_g.a						comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib						base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
@@ -56,8 +56,8 @@
 ./usr/libdata/debug/usr/lib/i18n/libmapper_zone.so.5.0.debug	comp-i18n-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libamu.so.5.0.debug			comp-amd-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libarchive.so.4.0.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libasan.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc=48
 ./usr/libdata/debug/usr/lib/libasan.so.2.0.debug		comp-sys-debug	debug,compatfile,gcc=5
+./usr/libdata/debug/usr/lib/libasan.so.3.0.debug		comp-sys-debug	debug,compatfile,gcc=6
 ./usr/libdata/debug/usr/lib/libasn1.so.10.0.debug		comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libatf-c++.so.2.0.debug		comp-atf-debug	debug,compatfile,atf
 ./usr/libdata/debug/usr/lib/libatf-c.so.0.0.debug		comp-atf-debug	debug,compatfile,atf
@@ -100,8 +100,8 @@
 ./usr/libdata/debug/usr/lib/libgcc_s.so.1.0.debug		comp-sys-debug	debug,compatfile,gcc
 ./usr/libdata/debug/usr/lib/libgmp.so.10.2.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/lib/libgnumalloc.so.1.0.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libgomp.so.1.1.debug		comp-sys-debug	debug,compatfile,gcc=48
 ./usr/libdata/debug/usr/lib/libgomp.so.1.2.debug		comp-sys-debug	debug,compatfile,gcc=5
+./usr/libdata/debug/usr/lib/libgomp.so.1.3.debug		comp-sys-debug	debug,compatfile,gcc=6
 ./usr/libdata/debug/usr/lib/libgssapi.so.11.0.debug		comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libhdb.so.15.0.debug		comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libheimbase.so.2.0.debug		comp-krb5-debug	debug,compatfile,kerberos
@@ -272,13 +272,14 @@
 ./usr/libdata/debug/usr/lib/libsqlite3.so.1.3.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libssh.so.31.0.debug		comp-secsh-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug		comp-crypto-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libstdc++.so.7.3.debug		comp-sys-debug	debug,compatfile,gcc=48,cxx,libstdcxx
 ./usr/libdata/debug/usr/lib/libstdc++.so.8.0.debug		comp-sys-debug	debug,compatfile,gcc=5,cxx,libstdcxx
+./usr/libdata/debug/usr/lib/libstdc++.so.8.1.debug		comp-sys-debug	debug,compatfile,gcc=6,cxx,libstdcxx
 ./usr/libdata/debug/usr/lib/libterminfo.so.1.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libtpm_unseal.so.1.0.debug		comp-tpm-debug	debug,compatfile,tpm
 ./usr/libdata/debug/usr/lib/libtre.so.0.8.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libtspi.so.3.0.debug		comp-tpm-debug	debug,compatfile,tpm
 ./usr/libdata/debug/usr/lib/libubsan.so.1.0.debug		comp-sys-debug	debug,compatfile,gcc=5
+./usr/libdata/debug/usr/lib/libubsan.so.2.0.debug		comp-sys-debug	debug,compatfile,gcc=6
 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug		comp-sys-debug	debug,compatfile,rump
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libunbound.so.6.1.debug 		comp-net-debug	debug,compatfile,unbound
--- a/etc/mtree/NetBSD.dist.base	Sat Feb 03 19:34:01 2018 +0000
+++ b/etc/mtree/NetBSD.dist.base	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.168 2018/02/01 20:50:22 kamil Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.169 2018/02/03 21:27:45 mrg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -191,9 +191,10 @@
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1_impl
 ./usr/include/g++/tr2
-./usr/include/gcc-4.8
 ./usr/include/gcc-5
 ./usr/include/gcc-5/sanitizer
+./usr/include/gcc-6
+./usr/include/gcc-6/sanitizer
 ./usr/include/gssapi
 ./usr/include/isofs
 ./usr/include/isofs/cd9660
--- a/external/gpl3/gcc/lib/libasan/shlib_version	Sat Feb 03 19:34:01 2018 +0000
+++ b/external/gpl3/gcc/lib/libasan/shlib_version	Sat Feb 03 21:27:45 2018 +0000
@@ -1,2 +1,2 @@
-major=2
+major=3
 minor=0
--- a/external/gpl3/gcc/lib/libgomp/Makefile	Sat Feb 03 19:34:01 2018 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2018/02/03 19:27:15 mrg Exp $
+#	$NetBSD: Makefile,v 1.19 2018/02/03 21:27:45 mrg Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -67,8 +67,9 @@
 
 # libgomp is 1.0 is in GCC 4.5, and 1.1 in 4.8 since it added more symbols
 # XXXGCC5 -- marking 1.2 for GCC 5.3 for now
+# XXXGCC6 -- marking 1.3 for GCC 6 for now
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	2
+SHLIB_MINOR=	3
 
 LDFLAGS+=	-Wl,--version-script,${DIST}/libgomp/libgomp.map
 
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile	Sat Feb 03 19:34:01 2018 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile	Sat Feb 03 21:27:45 2018 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2018/02/03 19:27:15 mrg Exp $
+#	$NetBSD: Makefile,v 1.30 2018/02/03 21:27:45 mrg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -43,7 +43,7 @@
 .include "${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}/defs.mk"
 
 SHLIB_MAJOR=	8
-SHLIB_MINOR=	0
+SHLIB_MINOR=	1
 
 SUBDIR=		include
 
--- a/external/gpl3/gcc/lib/libubsan/shlib_version	Sat Feb 03 19:34:01 2018 +0000
+++ b/external/gpl3/gcc/lib/libubsan/shlib_version	Sat Feb 03 21:27:45 2018 +0000
@@ -1,2 +1,2 @@
-major=1
+major=2
 minor=0