sync

13 files changed, 353 insertions, 353 deletions

diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 50f20e36061..df529208f0b 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -55,29 +55,29 @@
 ./usr/include/alpha/tcb.h
 ./usr/include/alpha/varargs.h
 ./usr/include/alpha/vmparam.h
-./usr/include/g++/alpha-unknown-openbsd6.0
-./usr/include/g++/alpha-unknown-openbsd6.0/bits
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd6.1
+./usr/include/g++/alpha-unknown-openbsd6.1/bits
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -605,10 +605,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libalpha.a
 ./usr/lib/libalpha_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 0f79c225e0c..bfba0eac2fe 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -80,29 +80,29 @@
 ./usr/include/amd64/vmparam.h
 ./usr/include/cpuid.h
 ./usr/include/emmintrin.h
-./usr/include/g++/amd64-unknown-openbsd6.0
-./usr/include/g++/amd64-unknown-openbsd6.0/bits
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd6.1
+./usr/include/g++/amd64-unknown-openbsd6.1/bits
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -634,10 +634,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libamd64.a
 ./usr/lib/libamd64_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.armv7 b/distrib/sets/lists/comp/md.armv7
index 81abf28c80c..476e9f57ad4 100644
--- a/distrib/sets/lists/comp/md.armv7
+++ b/distrib/sets/lists/comp/md.armv7
@@ -100,29 +100,29 @@
 ./usr/include/armv7/tcb.h
 ./usr/include/armv7/trap.h
 ./usr/include/armv7/vmparam.h
-./usr/include/g++/arm-unknown-openbsd6.0
-./usr/include/g++/arm-unknown-openbsd6.0/bits
-./usr/include/g++/arm-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd6.1
+./usr/include/g++/arm-unknown-openbsd6.1/bits
+./usr/include/g++/arm-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -651,10 +651,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 3e60a3f5970..290d161f535 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -458,29 +458,29 @@
 ./usr/include/g++/ext/vstring.tcc
 ./usr/include/g++/ext/vstring_fwd.h
 ./usr/include/g++/ext/vstring_util.h
-./usr/include/g++/hppa-unknown-openbsd6.0
-./usr/include/g++/hppa-unknown-openbsd6.0/bits
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd6.1
+./usr/include/g++/hppa-unknown-openbsd6.1/bits
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -605,10 +605,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index e8f0ab65a86..621a75a78cd 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -460,29 +460,29 @@
 ./usr/include/g++/ext/vstring.tcc
 ./usr/include/g++/ext/vstring_fwd.h
 ./usr/include/g++/ext/vstring_util.h
-./usr/include/g++/i386-unknown-openbsd6.0
-./usr/include/g++/i386-unknown-openbsd6.0/bits
-./usr/include/g++/i386-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd6.1
+./usr/include/g++/i386-unknown-openbsd6.1/bits
+./usr/include/g++/i386-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -636,10 +636,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libi386.a
 ./usr/lib/libi386_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk
index b91b0a98b8d..e0b92c39e2b 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -463,29 +463,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/sh-unknown-openbsd6.0
-./usr/include/g++/sh-unknown-openbsd6.0/bits
-./usr/include/g++/sh-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd6.1
+./usr/include/g++/sh-unknown-openbsd6.1/bits
+./usr/include/g++/sh-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -652,10 +652,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.loongson b/distrib/sets/lists/comp/md.loongson
index fbeb40570ef..8ae5340c4b5 100644
--- a/distrib/sets/lists/comp/md.loongson
+++ b/distrib/sets/lists/comp/md.loongson
@@ -462,29 +462,29 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/mips64el-unknown-openbsd6.0
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.1
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
@@ -656,10 +656,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 5ead6ad8e13..5e3f58dac64 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -131,24 +131,24 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd6.0
-./usr/include/g++/m88k-unknown-openbsd6.0/bits
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/codecvt_specializations.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd6.1
+./usr/include/g++/m88k-unknown-openbsd6.1/bits
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
@@ -253,17 +253,17 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/specs
 ./usr/lib/libsupc++.a
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf32m88k_obsd.x
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 2016a297d63..39868808cff 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -464,29 +464,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.0
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.1
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -649,10 +649,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.octeon b/distrib/sets/lists/comp/md.octeon
index cef046d4a06..7282d0708f0 100644
--- a/distrib/sets/lists/comp/md.octeon
+++ b/distrib/sets/lists/comp/md.octeon
@@ -462,29 +462,29 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd6.0
-./usr/include/g++/mips64-unknown-openbsd6.0/bits
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.1
+./usr/include/g++/mips64-unknown-openbsd6.1/bits
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
@@ -654,10 +654,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index 4bdebf2950d..aaaf53bbf18 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -462,29 +462,29 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd6.0
-./usr/include/g++/mips64-unknown-openbsd6.0/bits
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.1
+./usr/include/g++/mips64-unknown-openbsd6.1/bits
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
@@ -652,10 +652,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc
index 274a2bf98e7..ae77fbb0a0c 100644
--- a/distrib/sets/lists/comp/md.socppc
+++ b/distrib/sets/lists/comp/md.socppc
@@ -464,29 +464,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.0
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.1
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -643,10 +643,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 805368af5c3..caa0c8c013c 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -463,29 +463,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/sparc64-unknown-openbsd6.0
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.0/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.1
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.1/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -611,10 +611,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/libgcov.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a