syn

20 files changed, 321 insertions, 321 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 06dcc88ccb4..79075745491 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -67,11 +67,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/alpha-openbsd
 ./usr/libdata/perl5/alpha-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 727c64ef8f9..ea226dede17 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -76,11 +76,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libLLVM.so.2.0
 ./usr/lib/libc++.so.4.0
 ./usr/lib/libc++abi.so.2.1
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 2c060ec904c..64993ee85d5 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -69,11 +69,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/hppa-openbsd
 ./usr/libdata/perl5/hppa-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 7c49b31e2c9..d7528525375 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -34,11 +34,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/sh-openbsd
 ./usr/libdata/perl5/sh-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 301dda5b4b1..ffe9d7cab1d 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -43,11 +43,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libLLVM.so.2.0
 ./usr/lib/libc++.so.4.0
 ./usr/lib/libc++abi.so.2.1
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 0113eb78fec..5a669a05557 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -6,10 +6,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/libgcc.a
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/m88k-openbsd
 ./usr/libdata/perl5/m88k-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 6bd7e82e031..2145207118f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -73,11 +73,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libLLVM.so.2.0
 ./usr/lib/libc++.so.4.0
 ./usr/lib/libc++abi.so.2.1
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index d31d82a0c5a..8aed5ae9762 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -41,11 +41,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libLLVM.so.2.0
 ./usr/lib/libc++.so.4.0
 ./usr/lib/libc++abi.so.2.1
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 79dd34ba330..4b108888dbf 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -72,11 +72,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libLLVM.so.2.0
 ./usr/lib/libc++.so.4.0
 ./usr/lib/libc++abi.so.2.1
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index b808da78b19..be2a0a650e6 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -74,11 +74,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6/4.2.1/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7/4.2.1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7/4.2.1/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7/4.2.1/specs
 ./usr/lib/libLLVM.so.2.0
 ./usr/lib/libc++.so.4.0
 ./usr/lib/libc++abi.so.2.1
diff --git a/distrib/sets/lists/comp/gcc.alpha b/distrib/sets/lists/comp/gcc.alpha
index 309c0ccc268..6d90c2b0cc3 100644
--- a/distrib/sets/lists/comp/gcc.alpha
+++ b/distrib/sets/lists/comp/gcc.alpha
@@ -4,29 +4,29 @@
 ./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/alpha-unknown-openbsd6.6
-./usr/include/g++/alpha-unknown-openbsd6.6/bits
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd6.7
+./usr/include/g++/alpha-unknown-openbsd6.7/bits
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.amd64 b/distrib/sets/lists/comp/gcc.amd64
index f93c6ee7d86..6a611d4a954 100644
--- a/distrib/sets/lists/comp/gcc.amd64
+++ b/distrib/sets/lists/comp/gcc.amd64
@@ -4,29 +4,29 @@
 ./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/amd64-unknown-openbsd6.6
-./usr/include/g++/amd64-unknown-openbsd6.6/bits
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd6.7
+./usr/include/g++/amd64-unknown-openbsd6.7/bits
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.hppa b/distrib/sets/lists/comp/gcc.hppa
index ac4ef0f5639..30bf28ece2c 100644
--- a/distrib/sets/lists/comp/gcc.hppa
+++ b/distrib/sets/lists/comp/gcc.hppa
@@ -485,29 +485,29 @@
 ./usr/include/g++/ext/vstring_util.h
 ./usr/include/g++/fstream
 ./usr/include/g++/functional
-./usr/include/g++/hppa-unknown-openbsd6.6
-./usr/include/g++/hppa-unknown-openbsd6.6/bits
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd6.7
+./usr/include/g++/hppa-unknown-openbsd6.7/bits
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/iomanip
 ./usr/include/g++/ios
 ./usr/include/g++/iosfwd
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.landisk b/distrib/sets/lists/comp/gcc.landisk
index d69e7d33f44..75caa2b1ac3 100644
--- a/distrib/sets/lists/comp/gcc.landisk
+++ b/distrib/sets/lists/comp/gcc.landisk
@@ -501,29 +501,29 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/queue
 ./usr/include/g++/set
-./usr/include/g++/sh-unknown-openbsd6.6
-./usr/include/g++/sh-unknown-openbsd6.6/bits
-./usr/include/g++/sh-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd6.7
+./usr/include/g++/sh-unknown-openbsd6.7/bits
+./usr/include/g++/sh-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/sstream
 ./usr/include/g++/stack
 ./usr/include/g++/stdexcept
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.loongson b/distrib/sets/lists/comp/gcc.loongson
index c272df72594..f05321d7d4b 100644
--- a/distrib/sets/lists/comp/gcc.loongson
+++ b/distrib/sets/lists/comp/gcc.loongson
@@ -496,29 +496,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64el-unknown-openbsd6.6
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.7
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.luna88k b/distrib/sets/lists/comp/gcc.luna88k
index 38cea32f203..39b6f6a3018 100644
--- a/distrib/sets/lists/comp/gcc.luna88k
+++ b/distrib/sets/lists/comp/gcc.luna88k
@@ -161,24 +161,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/list
 ./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd6.6
-./usr/include/g++/m88k-unknown-openbsd6.6/bits
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/codecvt_specializations.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd6.7
+./usr/include/g++/m88k-unknown-openbsd6.7/bits
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/map
 ./usr/include/g++/memory
 ./usr/include/g++/new
@@ -196,17 +196,17 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.6/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.7/3.3.6/specs
 ./usr/lib/libstdc++.a
 ./usr/lib/libsupc++.a
 ./usr/share/info/cpp.info
diff --git a/distrib/sets/lists/comp/gcc.macppc b/distrib/sets/lists/comp/gcc.macppc
index e22288ebb5f..fc4f431203c 100644
--- a/distrib/sets/lists/comp/gcc.macppc
+++ b/distrib/sets/lists/comp/gcc.macppc
@@ -499,29 +499,29 @@
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.6
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.7
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/queue
 ./usr/include/g++/set
 ./usr/include/g++/sstream
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.octeon b/distrib/sets/lists/comp/gcc.octeon
index 53a8b7fc246..78dfbb0ce20 100644
--- a/distrib/sets/lists/comp/gcc.octeon
+++ b/distrib/sets/lists/comp/gcc.octeon
@@ -496,29 +496,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64-unknown-openbsd6.6
-./usr/include/g++/mips64-unknown-openbsd6.6/bits
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.7
+./usr/include/g++/mips64-unknown-openbsd6.7/bits
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.sgi b/distrib/sets/lists/comp/gcc.sgi
index 53a8b7fc246..78dfbb0ce20 100644
--- a/distrib/sets/lists/comp/gcc.sgi
+++ b/distrib/sets/lists/comp/gcc.sgi
@@ -496,29 +496,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64-unknown-openbsd6.6
-./usr/include/g++/mips64-unknown-openbsd6.6/bits
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.7
+./usr/include/g++/mips64-unknown-openbsd6.7/bits
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.sparc64 b/distrib/sets/lists/comp/gcc.sparc64
index 642a37c590f..d0a67d44619 100644
--- a/distrib/sets/lists/comp/gcc.sparc64
+++ b/distrib/sets/lists/comp/gcc.sparc64
@@ -501,29 +501,29 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/queue
 ./usr/include/g++/set
-./usr/include/g++/sparc64-unknown-openbsd6.6
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.6/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.7
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.7/bits/time_members.h
 ./usr/include/g++/sstream
 ./usr/include/g++/stack
 ./usr/include/g++/stdexcept
@@ -590,10 +590,10 @@
 ./usr/include/g++/valarray
 ./usr/include/g++/vector
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.6/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7/4.2.1/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.7/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a