Module Name: src
Committed By: mrg
Date: Fri Feb 2 01:02:42 UTC 2018
Modified Files:
src/bin/expr: Makefile
src/distrib/sets/lists/base: ad.mips shl.mi
src/distrib/sets/lists/comp: ad.arm ad.hppa ad.m68k ad.mips ad.powerpc
ad.riscv ad.sh3 md.alpha md.amd64 md.hppa md.i386 md.or1k md.sparc
md.sparc64 md.vax mi shl.mi
src/distrib/sets/lists/debug: ad.mips mi shl.mi
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/lib/libiscntp: Makefile
src/external/bsd/ntp/lib/libntp: Makefile
src/external/bsd/ntp/lib/libopts: Makefile
src/external/gpl2/libmalloc/lib: Makefile
src/external/mit/xorg/lib/libXft: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/share/mk: bsd.own.mk bsd.sys.mk
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/sun68k/stand/libsa: Makefile
src/tools/gcc: Makefile README.mknative
Log Message:
convert HAVE_GCC handling to modern GCC release numbering:
- HAVE_GCC=5 is now the default (vs. HAVE_GCC=53 we've been using for
GCC 5.4 and GCC 5.5.)
- remove some more GCC 4.8 code. we don't support GCC 4 here.
- adjust set lists to gcc=5 from gcc=53.
add some basic HAVE_GCC=6 handling (totally unused so far.)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/expr/Makefile
cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.825 -r1.826 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/comp/ad.hppa
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/ad.m68k
cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/comp/ad.mips
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/comp/ad.riscv \
src/distrib/sets/lists/comp/md.hppa
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/comp/ad.sh3
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/comp/md.alpha
cvs rdiff -u -r1.252 -r1.253 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/comp/md.or1k
cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/comp/md.sparc
cvs rdiff -u -r1.197 -r1.198 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/comp/md.vax
cvs rdiff -u -r1.2172 -r1.2173 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.310 -r1.311 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.237 -r1.238 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.188 -r1.189 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.42 -r1.43 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/ntp/lib/libntp/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/lib/libopts/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/libmalloc/lib/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libXft/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.31 -r1.32 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.1029 -r1.1030 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.274 -r1.275 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sun68k/stand/libsa/Makefile
cvs rdiff -u -r1.83 -r1.84 src/tools/gcc/Makefile
cvs rdiff -u -r1.21 -r1.22 src/tools/gcc/README.mknative
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/expr/Makefile
diff -u src/bin/expr/Makefile:1.15 src/bin/expr/Makefile:1.16
--- src/bin/expr/Makefile:1.15 Fri Apr 1 08:19:31 2016
+++ src/bin/expr/Makefile Fri Feb 2 01:02:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/04/01 08:19:31 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2018/02/02 01:02:39 mrg Exp $
PROG= expr
SRCS= expr.y
@@ -6,7 +6,6 @@ SRCS= expr.y
.include <bsd.prog.mk>
# XXXGCC5
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 53 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 5 && ${ACTIVE_CC} == "gcc"
CFLAGS+= -fwrapv
.endif
-
Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.74 src/distrib/sets/lists/base/ad.mips:1.75
--- src/distrib/sets/lists/base/ad.mips:1.74 Wed Dec 14 12:59:51 2016
+++ src/distrib/sets/lists/base/ad.mips Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.74 2016/12/14 12:59:51 kre Exp $
+# $NetBSD: ad.mips,v 1.75 2018/02/02 01:02:41 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
@@ -14,7 +14,7 @@
./usr/lib/o32/libc_fp.so.0 base-compat-shlib compat,pic,arch64
./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=53
+./usr/lib/o32/libgomp.so.1.2 base-compat-shlib compat,pic,arch64,gcc=5
./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
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.825 src/distrib/sets/lists/base/shl.mi:1.826
--- src/distrib/sets/lists/base/shl.mi:1.825 Wed Jan 10 11:02:41 2018
+++ src/distrib/sets/lists/base/shl.mi Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.825 2018/01/10 11:02:41 knakahara Exp $
+# $NetBSD: shl.mi,v 1.826 2018/02/02 01:02:41 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -176,11 +176,11 @@
./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=53
+./usr/lib/libasan.so base-sys-shlib compatfile,gcc=5
./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=53
-./usr/lib/libasan.so.2.0 base-sys-shlib compatfile,gcc=53
+./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/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
@@ -298,9 +298,9 @@
./usr/lib/libgomp.so base-sys-shlib compatfile,gcc
./usr/lib/libgomp.so.1 base-sys-shlib compatfile,gcc
./usr/lib/libgomp.so.1.1 base-sys-shlib compatfile,gcc=48
-./usr/lib/libgomp.so.1.2 base-sys-shlib compatfile,gcc=53,!machine_arch=mips64eb,!machine_arch=mips64el
-./usr/lib/libgomp.so.1.2 base-sys-shlib gcc=53,machine_arch=mips64eb
-./usr/lib/libgomp.so.1.2 base-sys-shlib gcc=53,machine_arch=mips64el
+./usr/lib/libgomp.so.1.2 base-sys-shlib compatfile,gcc=5,!machine_arch=mips64eb,!machine_arch=mips64el
+./usr/lib/libgomp.so.1.2 base-sys-shlib gcc=5,machine_arch=mips64eb
+./usr/lib/libgomp.so.1.2 base-sys-shlib gcc=5,machine_arch=mips64el
./usr/lib/libgssapi.so base-krb5-shlib compatfile,kerberos
./usr/lib/libgssapi.so.11 base-krb5-shlib compatfile,kerberos
./usr/lib/libgssapi.so.11.0 base-krb5-shlib compatfile,kerberos
@@ -804,7 +804,7 @@
./usr/lib/libstdc++.so base-sys-shlib compatfile,gcc,cxx,libstdcxx
./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=53,cxx,libstdcxx
+./usr/lib/libstdc++.so.8.0 base-sys-shlib compatfile,gcc=5,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 +824,9 @@
./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=53
-./usr/lib/libubsan.so.1 base-sys-shlib compatfile,gcc=53
-./usr/lib/libubsan.so.1.0 base-sys-shlib compatfile,gcc=53
+./usr/lib/libubsan.so base-sys-shlib compatfile,gcc=5
+./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/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
Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.81 src/distrib/sets/lists/comp/ad.arm:1.82
--- src/distrib/sets/lists/comp/ad.arm:1.81 Wed Jan 24 09:51:26 2018
+++ src/distrib/sets/lists/comp/ad.arm Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.81 2018/01/24 09:51:26 wiz Exp $
+# $NetBSD: ad.arm,v 1.82 2018/02/02 01:02:41 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
@@ -404,11 +404,11 @@
./usr/include/gcc-4.8/mmintrin.h comp-obsolete obsolete
./usr/include/gcc-4.8/tgmath.h comp-obsolete obsolete
./usr/include/gcc-4.8/unwind-arm-common.h comp-obsolete obsolete
-./usr/include/gcc-5/arm_acle.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/arm_neon.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/unwind-arm-common.h comp-c-include gcccmds,gcc=53,eabi
+./usr/include/gcc-5/arm_acle.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/arm_neon.h comp-c-include gcccmds,gcc=5
+./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/hpcarm comp-c-include
./usr/include/hpcarm/ansi.h comp-obsolete obsolete
./usr/include/hpcarm/aout_machdep.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.hppa
diff -u src/distrib/sets/lists/comp/ad.hppa:1.10 src/distrib/sets/lists/comp/ad.hppa:1.11
--- src/distrib/sets/lists/comp/ad.hppa:1.10 Fri Mar 18 03:08:25 2016
+++ src/distrib/sets/lists/comp/ad.hppa Fri Feb 2 01:02:41 2018
@@ -1,6 +1,6 @@
-# $NetBSD: ad.hppa,v 1.10 2016/03/18 03:08:25 mrg Exp $
+# $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
-./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
./usr/include/hppa comp-c-include
./usr/include/hppa/ansi.h comp-c-include
./usr/include/hppa/aout_machdep.h comp-c-include
Index: src/distrib/sets/lists/comp/ad.m68k
diff -u src/distrib/sets/lists/comp/ad.m68k:1.53 src/distrib/sets/lists/comp/ad.m68k:1.54
--- src/distrib/sets/lists/comp/ad.m68k:1.53 Fri Mar 18 03:08:25 2016
+++ src/distrib/sets/lists/comp/ad.m68k Fri Feb 2 01:02:41 2018
@@ -1,9 +1,9 @@
-# $NetBSD: ad.m68k,v 1.53 2016/03/18 03:08:25 mrg Exp $
+# $NetBSD: ad.m68k,v 1.54 2018/02/02 01:02:41 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-5/math-68881.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53
+./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/m68k comp-c-include
./usr/include/m68k/ansi.h comp-c-include
./usr/include/m68k/aout_machdep.h comp-c-include
Index: src/distrib/sets/lists/comp/ad.mips
diff -u src/distrib/sets/lists/comp/ad.mips:1.70 src/distrib/sets/lists/comp/ad.mips:1.71
--- src/distrib/sets/lists/comp/ad.mips:1.70 Tue Aug 1 20:07:43 2017
+++ src/distrib/sets/lists/comp/ad.mips Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.70 2017/08/01 20:07:43 joerg Exp $
+# $NetBSD: ad.mips,v 1.71 2018/02/02 01:02:41 mrg Exp $
-./usr/lib/64/libgomp.a
-./usr/lib/64/libgomp.so
-./usr/lib/64/libgomp.so.1
@@ -17,8 +17,8 @@
./usr/include/g++/bits/mipso32/c++config.h comp-c-include compat,arch64,gcc
./usr/include/gcc-4.8/loongson.h comp-c-include gcccmds,gcc=48
./usr/include/gcc-4.8/tgmath.h comp-c-include gcccmds,gcc=48
-./usr/include/gcc-5/loongson.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53
+./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/mips comp-c-include
./usr/include/mips/ansi.h comp-c-include
./usr/include/mips/aout_machdep.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.powerpc
diff -u src/distrib/sets/lists/comp/ad.powerpc:1.87 src/distrib/sets/lists/comp/ad.powerpc:1.88
--- src/distrib/sets/lists/comp/ad.powerpc:1.87 Tue Aug 1 20:07:43 2017
+++ src/distrib/sets/lists/comp/ad.powerpc Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.87 2017/08/01 20:07:43 joerg Exp $
+# $NetBSD: ad.powerpc,v 1.88 2018/02/02 01:02:41 mrg Exp $
./usr/bin/elf2aout comp-sysutil-bin
./usr/bin/psim comp-debug-bin gdb
./usr/include/altivec.h comp-obsolete obsolete
@@ -39,17 +39,17 @@
./usr/include/gcc-4.8/spu2vmx.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/vec_types.h comp-c-include gcccmds,gcc=48
-./usr/include/gcc-5/altivec.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/htmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/htmxlintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/paired.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/ppc-asm.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/ppu_intrinsics.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/si2vmx.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/spe.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/spu2vmx.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/vec_types.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/altivec.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/htmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/htmxlintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/paired.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/ppc-asm.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/ppu_intrinsics.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/si2vmx.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/spe.h comp-c-include gcccmds,gcc=5
+./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/powerpc comp-c-include
./usr/include/powerpc/ansi.h comp-c-include
./usr/include/powerpc/aout_machdep.h comp-c-include
Index: src/distrib/sets/lists/comp/ad.riscv
diff -u src/distrib/sets/lists/comp/ad.riscv:1.7 src/distrib/sets/lists/comp/ad.riscv:1.8
--- src/distrib/sets/lists/comp/ad.riscv:1.7 Fri Mar 18 03:08:25 2016
+++ src/distrib/sets/lists/comp/ad.riscv Fri Feb 2 01:02:41 2018
@@ -1,10 +1,10 @@
-# $NetBSD: ad.riscv,v 1.7 2016/03/18 03:08:25 mrg Exp $
+# $NetBSD: ad.riscv,v 1.8 2018/02/02 01:02:41 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-5/tgmath.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
./usr/include/ieeefp.h comp-c-include
./usr/include/riscv comp-c-include
./usr/include/riscv/ansi.h comp-c-include
Index: src/distrib/sets/lists/comp/md.hppa
diff -u src/distrib/sets/lists/comp/md.hppa:1.7 src/distrib/sets/lists/comp/md.hppa:1.8
--- src/distrib/sets/lists/comp/md.hppa:1.7 Thu Jan 5 13:45:51 2017
+++ src/distrib/sets/lists/comp/md.hppa Fri Feb 2 01:02:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: md.hppa,v 1.7 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: md.hppa,v 1.8 2018/02/02 01:02:41 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=53
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
./usr/include/hp700 comp-obsolete obsolete
./usr/include/hp700/ansi.h comp-obsolete obsolete
./usr/include/hp700/aout_machdep.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.sh3
diff -u src/distrib/sets/lists/comp/ad.sh3:1.35 src/distrib/sets/lists/comp/ad.sh3:1.36
--- src/distrib/sets/lists/comp/ad.sh3:1.35 Thu Jan 5 13:45:51 2017
+++ src/distrib/sets/lists/comp/ad.sh3 Fri Feb 2 01:02:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: ad.sh3,v 1.35 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: ad.sh3,v 1.36 2018/02/02 01:02:41 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=53
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
./usr/include/ieeefp.h comp-c-include
./usr/include/sh3 comp-c-include
./usr/include/sh3/ansi.h comp-c-include
Index: src/distrib/sets/lists/comp/md.alpha
diff -u src/distrib/sets/lists/comp/md.alpha:1.71 src/distrib/sets/lists/comp/md.alpha:1.72
--- src/distrib/sets/lists/comp/md.alpha:1.71 Thu Jan 5 13:45:51 2017
+++ src/distrib/sets/lists/comp/md.alpha Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.71 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: md.alpha,v 1.72 2018/02/02 01:02:41 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
@@ -72,7 +72,7 @@
./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-5/tgmath.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
./usr/include/ieeefp.h comp-c-include
./usr/lib/crtfm.o comp-c-lib
./usr/lib/libalpha.a comp-c-lib
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.252 src/distrib/sets/lists/comp/md.amd64:1.253
--- src/distrib/sets/lists/comp/md.amd64:1.252 Mon Nov 13 12:42:26 2017
+++ src/distrib/sets/lists/comp/md.amd64 Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.252 2017/11/13 12:42:26 martin Exp $
+# $NetBSD: md.amd64,v 1.253 2018/02/02 01:02:41 mrg Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
@@ -405,64 +405,64 @@
./usr/include/gcc-4.8/xsaveintrin.h comp-c-include gcccmds,gcc=48
./usr/include/gcc-4.8/xsaveoptintrin.h comp-c-include gcccmds,gcc=48
./usr/include/gcc-4.8/xtestintrin.h comp-c-include gcccmds,gcc=48
-./usr/include/gcc-5/adxintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/ammintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx2intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512bwintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512cdintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512dqintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512erintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512fintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512ifmaintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512ifmavlintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512pfintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vbmiintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vbmivlintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vlbwintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vldqintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vlintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avxintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/bmi2intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/bmiintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/bmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/clflushoptintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/clwbintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/cpuid.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/cross-stdarg.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/emmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/f16cintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/fma4intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/fmaintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/fxsrintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/ia32intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/immintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/lwpintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/lzcntintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mm3dnow.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mm_malloc.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mwaitxintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/nmmintrin.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/adxintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/ammintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx2intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512bwintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512cdintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512dqintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512erintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512fintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512ifmaintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512ifmavlintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512pfintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vbmiintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vbmivlintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vlbwintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vldqintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vlintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avxintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/bmi2intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/bmiintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/bmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/clflushoptintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/clwbintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/cpuid.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/cross-stdarg.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/emmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/f16cintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/fma4intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/fmaintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/fxsrintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/ia32intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/immintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/lwpintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/lzcntintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/mm3dnow.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/mm_malloc.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/mmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/mwaitxintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/nmmintrin.h comp-c-include gcccmds,gcc=5
./usr/include/gcc-5/pcommitintrin.h comp-obsolete obsolete
-./usr/include/gcc-5/pmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/popcntintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/prfchwintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/rdseedintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/rtmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/shaintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/smmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tbmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/wmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/x86intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xopintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xsavecintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xsaveintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xsaveoptintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xsavesintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xtestintrin.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/pmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/popcntintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/prfchwintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/rdseedintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/rtmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/shaintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/smmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/tbmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/tmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/wmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/x86intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/xmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/xopintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/xsavecintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/xsaveintrin.h comp-c-include gcccmds,gcc=5
+./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/i386 comp-c-include
./usr/include/i386/ansi.h comp-c-include
./usr/include/i386/aout_machdep.h comp-c-include
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.175 src/distrib/sets/lists/comp/md.i386:1.176
--- src/distrib/sets/lists/comp/md.i386:1.175 Mon Nov 13 12:42:26 2017
+++ src/distrib/sets/lists/comp/md.i386 Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.175 2017/11/13 12:42:26 martin Exp $
+# $NetBSD: md.i386,v 1.176 2018/02/02 01:02:41 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
@@ -329,64 +329,64 @@
./usr/include/gcc-4.8/xsaveintrin.h comp-c-include gcccmds,gcc=48
./usr/include/gcc-4.8/xsaveoptintrin.h comp-c-include gcccmds,gcc=48
./usr/include/gcc-4.8/xtestintrin.h comp-c-include gcccmds,gcc=48
-./usr/include/gcc-5/adxintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/ammintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx2intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512bwintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512cdintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512dqintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512erintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512fintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512ifmaintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512ifmavlintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512pfintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vbmiintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vbmivlintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vlbwintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vldqintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avx512vlintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/avxintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/bmi2intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/bmiintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/bmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/clflushoptintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/clwbintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/cpuid.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/cross-stdarg.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/emmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/f16cintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/fma4intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/fmaintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/fxsrintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/ia32intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/immintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/lwpintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/lzcntintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mm3dnow.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mm_malloc.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/mwaitxintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/nmmintrin.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/adxintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/ammintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx2intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512bwintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512cdintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512dqintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512erintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512fintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512ifmaintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512ifmavlintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512pfintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vbmiintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vbmivlintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vlbwintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vldqintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avx512vlintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/avxintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/bmi2intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/bmiintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/bmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/clflushoptintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/clwbintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/cpuid.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/cross-stdarg.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/emmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/f16cintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/fma4intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/fmaintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/fxsrintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/ia32intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/immintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/lwpintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/lzcntintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/mm3dnow.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/mm_malloc.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/mmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/mwaitxintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/nmmintrin.h comp-c-include gcccmds,gcc=5
./usr/include/gcc-5/pcommitintrin.h comp-obsolete obsolete
-./usr/include/gcc-5/pmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/popcntintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/prfchwintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/rdseedintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/rtmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/shaintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/smmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tbmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/tmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/wmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/x86intrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xmmintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xopintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xsavecintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xsaveintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xsaveoptintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xsavesintrin.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/xtestintrin.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/pmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/popcntintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/prfchwintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/rdseedintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/rtmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/shaintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/smmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/tbmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/tmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/wmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/x86intrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/xmmintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/xopintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/xsavecintrin.h comp-c-include gcccmds,gcc=5
+./usr/include/gcc-5/xsaveintrin.h comp-c-include gcccmds,gcc=5
+./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/i386 comp-c-include
./usr/include/i386/_G_config.h comp-obsolete obsolete
./usr/include/i386/ansi.h comp-c-include
Index: src/distrib/sets/lists/comp/md.or1k
diff -u src/distrib/sets/lists/comp/md.or1k:1.3 src/distrib/sets/lists/comp/md.or1k:1.4
--- src/distrib/sets/lists/comp/md.or1k:1.3 Fri Mar 18 03:08:25 2016
+++ src/distrib/sets/lists/comp/md.or1k Fri Feb 2 01:02:41 2018
@@ -1,6 +1,6 @@
-# $NetBSD: md.or1k,v 1.3 2016/03/18 03:08:25 mrg Exp $
+# $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
-./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=53
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
./usr/include/ieeefp.h comp-c-include
./usr/include/or1k comp-c-include
./usr/include/or1k/ansi.h comp-c-include
Index: src/distrib/sets/lists/comp/md.sparc
diff -u src/distrib/sets/lists/comp/md.sparc:1.90 src/distrib/sets/lists/comp/md.sparc:1.91
--- src/distrib/sets/lists/comp/md.sparc:1.90 Thu Jan 5 13:45:51 2017
+++ src/distrib/sets/lists/comp/md.sparc Fri Feb 2 01:02:41 2018
@@ -1,9 +1,9 @@
-# $NetBSD: md.sparc,v 1.90 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: md.sparc,v 1.91 2018/02/02 01:02:41 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-5/tgmath.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/visintrin.h comp-c-include gcccmds,gcc=53
+./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/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.197 src/distrib/sets/lists/comp/md.sparc64:1.198
--- src/distrib/sets/lists/comp/md.sparc64:1.197 Thu Jan 5 13:45:51 2017
+++ src/distrib/sets/lists/comp/md.sparc64 Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.197 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: md.sparc64,v 1.198 2018/02/02 01:02:41 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
@@ -6,8 +6,8 @@
./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-5/tgmath.h comp-c-include gcccmds,gcc=53
-./usr/include/gcc-5/visintrin.h comp-c-include gcccmds,gcc=53
+./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/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/md.vax
diff -u src/distrib/sets/lists/comp/md.vax:1.44 src/distrib/sets/lists/comp/md.vax:1.45
--- src/distrib/sets/lists/comp/md.vax:1.44 Thu Jan 5 13:45:51 2017
+++ src/distrib/sets/lists/comp/md.vax Fri Feb 2 01:02:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: md.vax,v 1.44 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: md.vax,v 1.45 2018/02/02 01:02:41 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=53
+./usr/include/gcc-5/tgmath.h comp-c-include gcccmds,gcc=5
./usr/include/ieeefp.h comp-obsolete obsolete
./usr/include/vax comp-c-include
./usr/include/vax/_G_config.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2172 src/distrib/sets/lists/comp/mi:1.2173
--- src/distrib/sets/lists/comp/mi:1.2172 Thu Feb 1 20:50:22 2018
+++ src/distrib/sets/lists/comp/mi Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2172 2018/02/01 20:50:22 kamil Exp $
+# $NetBSD: mi,v 1.2173 2018/02/02 01:02:41 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=53,cxx,libstdcxx
+./usr/include/g++/bits/allocated_ptr.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/bits/atomic_futex.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/bits/c++14_warning.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/bits/enable_special_members.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/bits/locale_conv.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/bits/parse_numbers.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/bits/predefined_ops.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/bits/quoted_string.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
-./usr/include/g++/bits/regex_automaton.h comp-cxx-include gcc=53,cxx,libstdcxx
-./usr/include/g++/bits/regex_automaton.tcc comp-cxx-include gcc=53,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_compiler.h comp-cxx-include gcc,cxx,libstdcxx
-./usr/include/g++/bits/regex_compiler.tcc comp-cxx-include gcc=53,cxx,libstdcxx
+./usr/include/g++/bits/regex_compiler.tcc comp-cxx-include gcc=5,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_error.h comp-cxx-include gcc,cxx,libstdcxx
-./usr/include/g++/bits/regex_executor.h comp-cxx-include gcc=53,cxx,libstdcxx
-./usr/include/g++/bits/regex_executor.tcc comp-cxx-include gcc=53,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=53,cxx,libstdcxx
-./usr/include/g++/bits/regex_scanner.tcc comp-cxx-include gcc=53,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/shared_ptr.h comp-cxx-include gcc,cxx,libstdcxx
-./usr/include/g++/bits/shared_ptr_atomic.h comp-cxx-include gcc=53,cxx,libstdcxx
+./usr/include/g++/bits/shared_ptr_atomic.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/bits/uniform_int_dist.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/codecvt comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/debug/safe_container.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/ext/aligned_buffer.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/profile/ordered_base.h comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/shared_mutex comp-cxx-include gcc=5,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=53,cxx,libstdcxx
+./usr/include/g++/tr2/dynamic_bitset.tcc comp-cxx-include gcc=5,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
@@ -1994,13 +1994,13 @@
./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-5/omp.h comp-gcc-include gcc=53
-./usr/include/gcc-5/openacc.h comp-gcc-include gcc=53
-./usr/include/gcc-5/stdatomic.h comp-gcc-include gcc=53,gcccmds
-./usr/include/gcc-5/sanitizer/allocator_interface.h comp-gcc-include gcc=53
-./usr/include/gcc-5/sanitizer/asan_interface.h comp-gcc-include gcc=53
-./usr/include/gcc-5/sanitizer/common_interface_defs.h comp-gcc-include gcc=53
-./usr/include/gcc-5/sanitizer/tsan_interface_atomic.h comp-gcc-include gcc=53
+./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
+./usr/include/gcc-5/sanitizer/allocator_interface.h comp-gcc-include gcc=5
+./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/gelf.h comp-c-include
./usr/include/getopt.h comp-c-include
./usr/include/glob.h comp-c-include
@@ -3187,9 +3187,9 @@
./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=53
+./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=53
+./usr/lib/libasan_p.a comp-c-proflib compatfile,profile,gcc=5
./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 +3662,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=53
-./usr/lib/libubsan_p.a comp-c-proflib compatfile,profile,gcc=53
+./usr/lib/libubsan.a comp-c-lib compatfile,gcc=5
+./usr/lib/libubsan_p.a comp-c-proflib compatfile,profile,gcc=5
./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
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.310 src/distrib/sets/lists/comp/shl.mi:1.311
--- src/distrib/sets/lists/comp/shl.mi:1.310 Wed Jan 10 11:02:41 2018
+++ src/distrib/sets/lists/comp/shl.mi Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.310 2018/01/10 11:02:41 knakahara Exp $
+# $NetBSD: shl.mi,v 1.311 2018/02/02 01:02:41 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -8,7 +8,7 @@
./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=53
+./usr/lib/libasan_pic.a comp-c-piclib compatfile,picinstall,gcc=5
./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 +263,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=53
+./usr/lib/libubsan_pic.a comp-c-piclib compatfile,picinstall,gcc=5
./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
Index: src/distrib/sets/lists/debug/ad.mips
diff -u src/distrib/sets/lists/debug/ad.mips:1.65 src/distrib/sets/lists/debug/ad.mips:1.66
--- src/distrib/sets/lists/debug/ad.mips:1.65 Wed Dec 14 12:59:51 2016
+++ src/distrib/sets/lists/debug/ad.mips Fri Feb 2 01:02:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: ad.mips,v 1.65 2016/12/14 12:59:51 kre Exp $
+# $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
--./usr/libdata/debug/usr/lib/64/libgomp.so.1.2.debug comp-c-debug debug,compatfile,gcc=53
+-./usr/libdata/debug/usr/lib/64/libgomp.so.1.2.debug comp-c-debug debug,compatfile,gcc=5
./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
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.237 src/distrib/sets/lists/debug/mi:1.238
--- src/distrib/sets/lists/debug/mi:1.237 Thu Jan 25 08:57:59 2018
+++ src/distrib/sets/lists/debug/mi Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.237 2018/01/25 08:57:59 wiz Exp $
+# $NetBSD: mi,v 1.238 2018/02/02 01:02:41 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
@@ -27,7 +27,7 @@
./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=53
+./usr/lib/libasan_g.a comp-c-debuglib debuglib,compatfile,gcc=5
./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 +252,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=53
+./usr/lib/libubsan_g.a comp-c-debuglib debuglib,compatfile,gcc=5
./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
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.188 src/distrib/sets/lists/debug/shl.mi:1.189
--- src/distrib/sets/lists/debug/shl.mi:1.188 Wed Jan 10 11:02:41 2018
+++ src/distrib/sets/lists/debug/shl.mi Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.188 2018/01/10 11:02:41 knakahara Exp $
+# $NetBSD: shl.mi,v 1.189 2018/02/02 01:02:41 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
@@ -57,7 +57,7 @@
./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=53
+./usr/libdata/debug/usr/lib/libasan.so.2.0.debug comp-sys-debug debug,compatfile,gcc=5
./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
@@ -101,7 +101,7 @@
./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=53
+./usr/libdata/debug/usr/lib/libgomp.so.1.2.debug comp-sys-debug debug,compatfile,gcc=5
./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
@@ -273,12 +273,12 @@
./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=53,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/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=53
+./usr/libdata/debug/usr/lib/libubsan.so.1.0.debug comp-sys-debug debug,compatfile,gcc=5
./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
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.42 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.43
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.42 Sat Oct 7 14:11:07 2017
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Fri Feb 2 01:02:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2017/10/07 14:11:07 roy Exp $
+# $NetBSD: Makefile,v 1.43 2018/02/02 01:02:39 mrg Exp $
#
WARNS?= 6
@@ -75,7 +75,7 @@ ${f}: ${f}.in
.endfor
# XXXGCC5
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 53 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 5 && ${ACTIVE_CC} == "gcc"
COPTS.if-bsd.c+= -Wno-error=sign-conversion
.endif
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.21 src/external/bsd/ntp/bin/ntpd/Makefile:1.22
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.21 Sun May 1 23:32:00 2016
+++ src/external/bsd/ntp/bin/ntpd/Makefile Fri Feb 2 01:02:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/05/01 23:32:00 christos Exp $
+# $NetBSD: Makefile,v 1.22 2018/02/02 01:02:39 mrg Exp $
.include <bsd.own.mk>
@@ -88,7 +88,7 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
YHEADER=1
# XXXGCC5
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 53 && ${ACTIVE_CC} == "gcc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 5 && ${ACTIVE_CC} == "gcc"
COPTS.ntp_control.c+= -Wno-error=maybe-uninitialized
.endif
Index: src/external/bsd/ntp/lib/libiscntp/Makefile
diff -u src/external/bsd/ntp/lib/libiscntp/Makefile:1.14 src/external/bsd/ntp/lib/libiscntp/Makefile:1.15
--- src/external/bsd/ntp/lib/libiscntp/Makefile:1.14 Sun May 1 23:32:02 2016
+++ src/external/bsd/ntp/lib/libiscntp/Makefile Fri Feb 2 01:02:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/05/01 23:32:02 christos Exp $
+# $NetBSD: Makefile,v 1.15 2018/02/02 01:02:39 mrg Exp $
LIBISPRIVATE=yes
@@ -45,8 +45,6 @@ SRCS= assertions.c \
tsmemcmp.c \
sockaddr.c
-.if ${HAVE_GCC:U} != 4
COPTS.log.c+= -Wno-error=format-nonliteral
-.endif
.include <bsd.lib.mk>
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.19 src/external/bsd/ntp/lib/libntp/Makefile:1.20
--- src/external/bsd/ntp/lib/libntp/Makefile:1.19 Tue Nov 22 03:09:31 2016
+++ src/external/bsd/ntp/lib/libntp/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/11/22 03:09:31 christos Exp $
+# $NetBSD: Makefile,v 1.20 2018/02/02 01:02:40 mrg Exp $
LIBISPRIVATE=yes
@@ -81,11 +81,7 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
-.if ${HAVE_GCC:U} == 4
-COPTS.systime.c+= -Wno-uninitialized
-.else
COPTS.msyslog.c+= -Wno-error=format-nonliteral
-.endif
# For MKREPRO, avoid using __DATE__ and __TIME__.
# Instead, use the date and time from ${IMPORTDATE_FILE}.
Index: src/external/bsd/ntp/lib/libopts/Makefile
diff -u src/external/bsd/ntp/lib/libopts/Makefile:1.14 src/external/bsd/ntp/lib/libopts/Makefile:1.15
--- src/external/bsd/ntp/lib/libopts/Makefile:1.14 Wed Jan 11 12:19:43 2017
+++ src/external/bsd/ntp/lib/libopts/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/01/11 12:19:43 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2018/02/02 01:02:40 mrg Exp $
LIBISPRIVATE=yes
@@ -17,11 +17,7 @@ CPPFLAGS+=-I${DIST}
SRCS=libopts.c
COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
-.if ${HAVE_GCC:U} == 4
-COPTS.libopts.c+= -Wno-error
-.else
COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
-.endif
COPTS.libopts.c+= ${${ACTIVE_CC} == "clang":? -Wno-format :}
.include <bsd.lib.mk>
Index: src/external/gpl2/libmalloc/lib/Makefile
diff -u src/external/gpl2/libmalloc/lib/Makefile:1.5 src/external/gpl2/libmalloc/lib/Makefile:1.6
--- src/external/gpl2/libmalloc/lib/Makefile:1.5 Wed May 4 17:17:00 2016
+++ src/external/gpl2/libmalloc/lib/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/05/04 17:17:00 christos Exp $
+# $NetBSD: Makefile,v 1.6 2018/02/02 01:02:40 mrg Exp $
NOMAN= # defined
.include <bsd.init.mk>
@@ -13,7 +13,7 @@ SRCS+= ralloc.c
CPPFLAGS+= -I${DIST} -I${.CURDIR} -DSTDC_HEADERS -DHAVE_STDLIB_H -DHAVE_UNISTD_H
-.if ${HAVE_GCC:U0} >= 53
+.if ${HAVE_GCC:U0} >= 5
COPTS+=-fno-builtin-malloc
.endif
Index: src/external/mit/xorg/lib/libXft/Makefile
diff -u src/external/mit/xorg/lib/libXft/Makefile:1.7 src/external/mit/xorg/lib/libXft/Makefile:1.8
--- src/external/mit/xorg/lib/libXft/Makefile:1.7 Fri Nov 21 01:11:50 2014
+++ src/external/mit/xorg/lib/libXft/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/11/21 01:11:50 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2018/02/02 01:02:40 mrg Exp $
.include <bsd.own.mk>
@@ -20,11 +20,6 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xft
-.if !empty(MACHINE_ARCH:Mearm*) && ${HAVE_GCC:U} == 48
-# Workaround a crash in XftGlyphSpecRender with GCC 4.8.4
-COPTS.xftrender.c+= ${${ACTIVE_CC} == "gcc" :? -O0 :}
-.endif
-
LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic \
fontconfig ${.CURDIR}/../fontconfig/src \
freetype ${.CURDIR}/../freetype \
Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.6 Thu Nov 17 05:28:43 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/11/17 05:28:43 snj Exp $
+# $NetBSD: Makefile,v 1.7 2018/02/02 01:02:40 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -48,9 +48,7 @@ CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DAT
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC:U0} > 48
COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-.endif
COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.12 Fri Sep 1 14:38:23 2017
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/09/01 14:38:23 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/02/02 01:02:40 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -46,9 +46,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
# XXX
COPTS.via_dri.c+= -Wno-error
COPTS.via_display.c+= -Wno-error=stack-protector
-.if ${HAVE_GCC:U0} > 48
COPTS.via_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.via_lvds.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-.endif
CWARNFLAGS.clang+= -Wno-tautological-compare
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.11 Fri Sep 2 04:49:48 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/09/02 04:49:48 jakllsch Exp $
+# $NetBSD: Makefile,v 1.12 2018/02/02 01:02:40 mrg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -14,9 +14,7 @@ CPPFLAGS+= -DHAVE_XMODES -DHAVE_XEXTPROT
.include "../Makefile.xf86-driver"
-.if ${HAVE_GCC:U0} > 48
COPTS.smi_video.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-.endif
COPTS.smi_video.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
XORG_PKG_VER_PROG= ${DRIVER}
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.16
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.15 Fri Sep 2 04:49:48 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/09/02 04:49:48 jakllsch Exp $
+# $NetBSD: Makefile,v 1.16 2018/02/02 01:02:40 mrg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -23,11 +23,9 @@ CWARNFLAGS.clang+= -Wno-parentheses
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC:U0} > 48
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.initextx.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-.endif
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.initextx.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
Index: src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.9 Tue Sep 27 19:24:19 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/09/27 19:24:19 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2018/02/02 01:02:40 mrg Exp $
DRIVER= xf86-video-suncg6
DRIVER_NAME= suncg6_drv
@@ -12,7 +12,5 @@ MAN= suncg6.4
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC:U0} > 48
COPTS.cg6_accel.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-.endif
COPTS.cg6_accel.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.13 Tue Sep 27 19:26:06 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Fri Feb 2 01:02:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/09/27 19:26:06 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2018/02/02 01:02:40 mrg Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
@@ -25,10 +25,8 @@ MAN= sunffb.4
.include "../Makefile.xf86-driver"
# XXX
-.if ${HAVE_GCC:U0} > 48
COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.ffb_dga.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-.endif
COPTS.ffb_dac.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.ffb_dga.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.ffb_exa.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=pointer-sign :}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.31 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.32
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.31 Tue Nov 22 10:34:57 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2016/11/22 10:34:57 snj Exp $
+# $NetBSD: Makefile,v 1.32 2018/02/02 01:02:41 mrg Exp $
.include <bsd.own.mk>
@@ -113,9 +113,7 @@ CPPFLAGS.xf86AutoConfig.c= -DPROJECTROOT
-DIDRIVERS='"${IDRIVERS}"'
COPTS.xf86sbusBus.c= -Wno-error=incompatible-pointer-types
-.if ${HAVE_GCC:U0} > 48
COPTS.xf86Configure.c= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-.endif
COPTS.xf86pciBus.c= ${${ACTIVE_CC} == "clang":? -Wno-error=tautological-constant-out-of-range-compare :}
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1029 src/share/mk/bsd.own.mk:1.1030
--- src/share/mk/bsd.own.mk:1.1029 Sat Jan 27 23:59:17 2018
+++ src/share/mk/bsd.own.mk Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1029 2018/01/27 23:59:17 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1030 2018/02/02 01:02:41 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -67,7 +67,7 @@ MKGCC?= no
.if ${MACHINE_CPU} == "aarch64"
HAVE_GCC?= 0
.else
-HAVE_GCC?= 53
+HAVE_GCC?= 5
.endif
#
@@ -80,7 +80,9 @@ MKGCCCMDS?= no
# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
-.if ${HAVE_GCC} == 53
+.if ${HAVE_GCC} == 6
+EXTERNAL_GCC_SUBDIR?= gcc
+.elif ${HAVE_GCC} == 5
EXTERNAL_GCC_SUBDIR?= gcc.old
.else
EXTERNAL_GCC_SUBDIR=? /does/not/exist
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.274 src/share/mk/bsd.sys.mk:1.275
--- src/share/mk/bsd.sys.mk:1.274 Mon Jan 22 17:34:01 2018
+++ src/share/mk/bsd.sys.mk Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.274 2018/01/22 17:34:01 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.275 2018/02/02 01:02:41 mrg Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -145,10 +145,10 @@ COPTS+= -fstack-protector -Wstack-protec
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59674
# (the underlying issue for sh and vax may be different, needs more
# investigation, symptoms are similar but for different sources)
-# also true for GCC 5.3
+# also true for GCC 5, assume GCC 6 too.
. if "${ACTIVE_CC}" == "gcc" && \
- ( ${HAVE_GCC} == "48" || \
- ${HAVE_GCC} == "53" ) && \
+ ( ${HAVE_GCC} == "5" || \
+ ${HAVE_GCC} == "6" ) && \
( ${MACHINE_CPU} == "sh3" || \
${MACHINE_ARCH} == "vax" || \
${MACHINE_CPU} == "m68k" || \
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.44 src/sys/arch/i386/stand/lib/Makefile:1.45
--- src/sys/arch/i386/stand/lib/Makefile:1.44 Tue Mar 22 08:25:22 2016
+++ src/sys/arch/i386/stand/lib/Makefile Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2016/03/22 08:25:22 mrg Exp $
+# $NetBSD: Makefile,v 1.45 2018/02/02 01:02:41 mrg Exp $
S?= ${.CURDIR}/../../../..
@@ -52,8 +52,3 @@ lib${LIB}.o:: ${OBJS:O}
@echo building standard ${LIB} library
@rm -f lib${LIB}.o
@${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort`
-
-# XXX
-.if ${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U} == 48
-COPTS.biosdisk_ll.c+= -O0
-.endif
Index: src/sys/arch/sun68k/stand/libsa/Makefile
diff -u src/sys/arch/sun68k/stand/libsa/Makefile:1.32 src/sys/arch/sun68k/stand/libsa/Makefile:1.33
--- src/sys/arch/sun68k/stand/libsa/Makefile:1.32 Sun Apr 9 18:46:55 2017
+++ src/sys/arch/sun68k/stand/libsa/Makefile Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/04/09 18:46:55 christos Exp $
+# $NetBSD: Makefile,v 1.33 2018/02/02 01:02:41 mrg Exp $
# Logically src/sys
.include <bsd.own.mk>
@@ -14,13 +14,9 @@ CPUFLAGS= # ignore settings in /etc/mk.c
DEFS= -Dsun3 -D_STANDALONE -D__daddr_t=int32_t
INCL= -I. -I${.CURDIR} -I${S}/lib/libsa -I${S} -I${S}/arch
AFLAGS= -Wa,-mc68020 -Wa,-mc68851
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
-# gcc 4.8 convers -mc68000 to -mcpu=68000 and that breaks gas
+# gcc 4.8 converts -mc68000 to -mcpu=68000 and that breaks gas
# which works for -march=68010 but breaks for -mcpu=68010
CFLAGS= -march=68010
-.else
-CFLAGS= -mc68000 -Wa,-mc68010
-.endif
CFLAGS+= -Wa,-m68851 -msoft-float
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
COPTS= -Os -fno-defer-pop -ffreestanding -fno-unwind-tables
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.83 src/tools/gcc/Makefile:1.84
--- src/tools/gcc/Makefile:1.83 Wed Oct 4 21:29:43 2017
+++ src/tools/gcc/Makefile Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2017/10/04 21:29:43 christos Exp $
+# $NetBSD: Makefile,v 1.84 2018/02/02 01:02:41 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ MODULE= gcc4
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
GNUHOSTDIST= ${GCCDIST}
-.if ${HAVE_GCC} == 53
+.if ${HAVE_GCC} == 5
MKNATIVE= ${.CURDIR}/mknative-gcc.old
.endif
@@ -46,11 +46,7 @@ COMMON_CONFIGURE_ARGS+= --with-arch=${GC
COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
.endif
-.if ${HAVE_GCC} == 48
-COMMON_CONFIGURE_ARGS+= --enable-lto
-.endif
-
-.if ${HAVE_GCC} == 53
+.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
@@ -92,10 +88,10 @@ MKNATIVE_CONFIG_TARGET_LIBS=
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
-.if ${HAVE_GCC} == 53
+.if ${HAVE_GCC} == 6
+MKNATIVE_TARGET= gcc6
+.elif ${HAVE_GCC} == 5
MKNATIVE_TARGET= gcc5
-.elif ${HAVE_GCC} == 48
-MKNATIVE_TARGET= gcc48
.endif
MKNATIVE_CONFIG_TARGET_LIBS+= \
@@ -197,12 +193,6 @@ NATIVE_CONFIGURE_ARGS+= \
--with-sysroot=${DESTDIR}
MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
-UNWIND_H=unwind.h
-# XXXGCC5
-.if ${HAVE_GCC} == 53
-UNWIND_H=
-.endif
-
.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
mkdir .native 2>/dev/null || true
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
@@ -225,7 +215,7 @@ UNWIND_H=
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
- (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h ${UNWIND_H}); \
+ (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h); \
(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
.if defined(EXTRA_GCC_TARGETS)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
Index: src/tools/gcc/README.mknative
diff -u src/tools/gcc/README.mknative:1.21 src/tools/gcc/README.mknative:1.22
--- src/tools/gcc/README.mknative:1.21 Sun May 21 15:28:42 2017
+++ src/tools/gcc/README.mknative Fri Feb 2 01:02:41 2018
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.21 2017/05/21 15:28:42 riastradh Exp $
+$NetBSD: README.mknative,v 1.22 2018/02/02 01:02:41 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=48 bootstrap-libgcc".
+3. In src/tools/gcc, do "nbmake-MACHINE HAVE_GCC=6 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,11 +39,11 @@ 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=48", and
- "nbmake-MACHINE includes HAVE_GCC= MKGCC=no MKBINUTILS=no HAVE_GCC=48".
- (Note: replace 48 [for gcc 4.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)
+ "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
+ to mknative-for, the MKGCC=no prevents the standard makefiles from picking
+ up any gcc version info automatically)
5. In src/lib/csu, do
"nbmake-MACHINE dependall". and "nbmake-MACHINE install".
@@ -56,7 +56,7 @@ work.
do "nbmake-MACHINE obj dependall".
8. In src/lib, do
- "nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=48".
+ "nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=6".
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
