sync

26 files changed, 417 insertions, 417 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index e6b70c4625b..2aa79d02d12 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -66,11 +66,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3/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 48b46ae2589..8b4775171d4 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -72,11 +72,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libc++.so.1.0
 ./usr/lib/libc++abi.so.0.0
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index ea01a698a09..0726966ea24 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -34,11 +34,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libc++.so.1.0
 ./usr/lib/libc++abi.so.0.0
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index e730d0c413d..2791b27202e 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -68,11 +68,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3/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.i386 b/distrib/sets/lists/base/md.i386
index 283eccca2e6..f26937f11aa 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -74,11 +74,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libc++.so.1.0
 ./usr/lib/libc++abi.so.0.0
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 4ee1b4d7f23..cdcf21873fb 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.2
-./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3/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 3ed3f56e10c..0edd3cdb001 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -39,11 +39,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/mips64el-openbsd
 ./usr/libdata/perl5/mips64el-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index d5666c0c558..76e9906d48a 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.2
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/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 0616b085186..abdaa7f6602 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -69,11 +69,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/powerpc-openbsd
 ./usr/libdata/perl5/powerpc-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index a2ef7d85c20..8c680a358f6 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -37,11 +37,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/mips64-openbsd
 ./usr/libdata/perl5/mips64-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 2554e393dfb..229141f6565 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -68,11 +68,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/mips64-openbsd
 ./usr/libdata/perl5/mips64-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 6978698358a..9e64009cec1 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -62,11 +62,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/powerpc-openbsd
 ./usr/libdata/perl5/powerpc-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 2d0b8eaa59e..6d99efc92d2 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -70,11 +70,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3/4.2.1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3/4.2.1/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3/4.2.1/specs
 ./usr/lib/libc++.so.1.0
 ./usr/lib/libc++abi.so.0.0
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/comp/gcc.alpha b/distrib/sets/lists/comp/gcc.alpha
index 0fbfdabfa8f..6d7af968310 100644
--- a/distrib/sets/lists/comp/gcc.alpha
+++ b/distrib/sets/lists/comp/gcc.alpha
@@ -3,29 +3,29 @@
 ./usr/bin/gcov
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/alpha-unknown-openbsd6.2
-./usr/include/g++/alpha-unknown-openbsd6.2/bits
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd6.3
+./usr/include/g++/alpha-unknown-openbsd6.3/bits
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.3/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 6e4375a985a..e5ed0e7ea50 100644
--- a/distrib/sets/lists/comp/gcc.amd64
+++ b/distrib/sets/lists/comp/gcc.amd64
@@ -3,29 +3,29 @@
 ./usr/bin/gcov
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/amd64-unknown-openbsd6.2
-./usr/include/g++/amd64-unknown-openbsd6.2/bits
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd6.3
+./usr/include/g++/amd64-unknown-openbsd6.3/bits
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.3/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.armv7 b/distrib/sets/lists/comp/gcc.armv7
index 1eeeeb61ee6..9ce88bee84f 100644
--- a/distrib/sets/lists/comp/gcc.armv7
+++ b/distrib/sets/lists/comp/gcc.armv7
@@ -3,29 +3,29 @@
 ./usr/bin/gcov
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/arm-unknown-openbsd6.2
-./usr/include/g++/arm-unknown-openbsd6.2/bits
-./usr/include/g++/arm-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd6.3
+./usr/include/g++/arm-unknown-openbsd6.3/bits
+./usr/include/g++/arm-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd6.3/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 81c1657eea7..d23b58d86f6 100644
--- a/distrib/sets/lists/comp/gcc.hppa
+++ b/distrib/sets/lists/comp/gcc.hppa
@@ -484,29 +484,29 @@
 ./usr/include/g++/ext/vstring_util.h
 ./usr/include/g++/fstream
 ./usr/include/g++/functional
-./usr/include/g++/hppa-unknown-openbsd6.2
-./usr/include/g++/hppa-unknown-openbsd6.2/bits
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd6.3
+./usr/include/g++/hppa-unknown-openbsd6.3/bits
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/iomanip
 ./usr/include/g++/ios
 ./usr/include/g++/iosfwd
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.3/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.i386 b/distrib/sets/lists/comp/gcc.i386
index 6775d95a38d..f1a7a61fdb4 100644
--- a/distrib/sets/lists/comp/gcc.i386
+++ b/distrib/sets/lists/comp/gcc.i386
@@ -484,29 +484,29 @@
 ./usr/include/g++/ext/vstring_util.h
 ./usr/include/g++/fstream
 ./usr/include/g++/functional
-./usr/include/g++/i386-unknown-openbsd6.2
-./usr/include/g++/i386-unknown-openbsd6.2/bits
-./usr/include/g++/i386-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd6.3
+./usr/include/g++/i386-unknown-openbsd6.3/bits
+./usr/include/g++/i386-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/iomanip
 ./usr/include/g++/ios
 ./usr/include/g++/iosfwd
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd6.3/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 df0b82c37d6..a907b1ebf58 100644
--- a/distrib/sets/lists/comp/gcc.landisk
+++ b/distrib/sets/lists/comp/gcc.landisk
@@ -500,29 +500,29 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/queue
 ./usr/include/g++/set
-./usr/include/g++/sh-unknown-openbsd6.2
-./usr/include/g++/sh-unknown-openbsd6.2/bits
-./usr/include/g++/sh-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd6.3
+./usr/include/g++/sh-unknown-openbsd6.3/bits
+./usr/include/g++/sh-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/sstream
 ./usr/include/g++/stack
 ./usr/include/g++/stdexcept
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd6.3/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 c275b81628f..3b353639f3c 100644
--- a/distrib/sets/lists/comp/gcc.loongson
+++ b/distrib/sets/lists/comp/gcc.loongson
@@ -495,29 +495,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64el-unknown-openbsd6.2
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.3
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.3/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 b30dc50f7a2..6e2ccfddef7 100644
--- a/distrib/sets/lists/comp/gcc.luna88k
+++ b/distrib/sets/lists/comp/gcc.luna88k
@@ -160,24 +160,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/list
 ./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd6.2
-./usr/include/g++/m88k-unknown-openbsd6.2/bits
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/codecvt_specializations.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd6.3
+./usr/include/g++/m88k-unknown-openbsd6.3/bits
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/map
 ./usr/include/g++/memory
 ./usr/include/g++/new
@@ -207,17 +207,17 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.3/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 b533dfcdbaa..e1667996aa8 100644
--- a/distrib/sets/lists/comp/gcc.macppc
+++ b/distrib/sets/lists/comp/gcc.macppc
@@ -498,29 +498,29 @@
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.2
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.3
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/queue
 ./usr/include/g++/set
 ./usr/include/g++/sstream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/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 090daba77f5..3791e9e8426 100644
--- a/distrib/sets/lists/comp/gcc.octeon
+++ b/distrib/sets/lists/comp/gcc.octeon
@@ -495,29 +495,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64-unknown-openbsd6.2
-./usr/include/g++/mips64-unknown-openbsd6.2/bits
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.3
+./usr/include/g++/mips64-unknown-openbsd6.3/bits
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/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 090daba77f5..3791e9e8426 100644
--- a/distrib/sets/lists/comp/gcc.sgi
+++ b/distrib/sets/lists/comp/gcc.sgi
@@ -495,29 +495,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64-unknown-openbsd6.2
-./usr/include/g++/mips64-unknown-openbsd6.2/bits
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.3
+./usr/include/g++/mips64-unknown-openbsd6.3/bits
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.3/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.socppc b/distrib/sets/lists/comp/gcc.socppc
index b533dfcdbaa..e1667996aa8 100644
--- a/distrib/sets/lists/comp/gcc.socppc
+++ b/distrib/sets/lists/comp/gcc.socppc
@@ -498,29 +498,29 @@
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.2
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.3
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/queue
 ./usr/include/g++/set
 ./usr/include/g++/sstream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.3/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 d3613598c92..513e9e6828f 100644
--- a/distrib/sets/lists/comp/gcc.sparc64
+++ b/distrib/sets/lists/comp/gcc.sparc64
@@ -500,29 +500,29 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/queue
 ./usr/include/g++/set
-./usr/include/g++/sparc64-unknown-openbsd6.2
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.2/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.3
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.3/bits/time_members.h
 ./usr/include/g++/sstream
 ./usr/include/g++/stack
 ./usr/include/g++/stdexcept
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3/4.2.1/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.3/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a