2 files changed, 294 insertions, 236 deletions

diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 8d2b1b3255e..0666c730854 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -42,6 +42,7 @@
 ./sbin/mount_ntfs
 ./sbin/wicontrol
 ./sbin/wsconsctl
+./usr/bin/gccbug
 ./usr/bin/ldd
 ./usr/bin/pctr
 ./usr/lib/apache/modules/libproxy.so
@@ -65,11 +66,10 @@
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.6
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/cpp0
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/include
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.34.2
 ./usr/lib/libcom_err.so.15.0
@@ -100,7 +100,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libssl.so.9.0
-./usr/lib/libstdc++.so.33.0
+./usr/lib/libstdc++.so.34.0
 ./usr/lib/libtermcap.so.10.0
 ./usr/lib/libtermlib.so.10.0
 ./usr/lib/libusbhid.so.3.0
@@ -1378,115 +1378,130 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/ftw.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/PlotFile.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/SFile.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/_G_config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/algo.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/algobase.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/alloc.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/builtinbuf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/bvector.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/complex.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/algo.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/algobase.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/alloc.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/backward_warning.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/bvector.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/complex.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/defalloc.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/deque.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/fstream.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/function.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/hash_map.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/hash_set.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/hashtable.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/heap.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/iomanip.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/iostream.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/istream.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/iterator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/list.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/map.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/multimap.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/multiset.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/new.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/ostream.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/pair.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/queue.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/rope.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/set.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/slist.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/stack.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/stream.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/streambuf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/tempbuf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/tree.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/vector.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/basic_ios.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/basic_string.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/boost_concept_check.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/char_traits.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/codecvt.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/concept_check.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/cpp_type_traits.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/fpos.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/functexcept.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/gslice.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/gslice_array.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/indirect_array.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/ios_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/locale_classes.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/locale_facets.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/localefwd.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/mask_array.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/pthread_allocimpl.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/slice_array.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_algo.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_algobase.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_alloc.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_bvector.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_construct.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_deque.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_function.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_heap.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_iterator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_iterator_base_funcs.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_iterator_base_types.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_list.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_map.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_multimap.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_multiset.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_numeric.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_pair.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_pthread_alloc.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_queue.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_raw_storage_iter.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_relops.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_set.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_stack.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_tempbuf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_threads.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_tree.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_uninitialized.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_vector.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stream_iterator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/streambuf_iterator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stringfwd.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/type_traits.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/valarray_array.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/valarray_meta.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/cursesapp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/cursesf.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/cursesm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/cursesp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/cursesw.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/cursslk.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/defalloc.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/deque.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/editbuf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/cxxabi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/etip.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/floatio.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/fstream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/function.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/hash_map.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/hash_set.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/hashtable.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/heap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/indstream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/iolibio.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/iomanip.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/iostdio.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/iostream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/iostreamP.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/istream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/iterator.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/libio.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/libioP.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/list.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/map.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/multimap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/multiset.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/new.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/ostream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/pair.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/parsestream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/pfstream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/procbuf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/pthread_alloc.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/rope.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/ropeimpl.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/set.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/slist.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stack.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/bastring.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/complext.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/dcomplex.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/fcomplex.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/gslice.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/gslice_array.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/indirect_array.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/ldcomplex.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/mask_array.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/slice.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/slice_array.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/std_valarray.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/straits.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/valarray_array.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/std/valarray_meta.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stdiostream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_algo.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_algobase.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_alloc.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_bvector.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_construct.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_deque.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_function.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_hash_fun.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_hash_map.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_hash_set.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_hashtable.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_heap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_iterator.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_list.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_map.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_multimap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_multiset.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_numeric.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_pair.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_queue.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_raw_storage_iter.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_relops.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_rope.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_set.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_slist.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_stack.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_tempbuf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_tree.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_uninitialized.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stl_vector.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/stream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/streambuf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/strfile.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/strstream.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/tempbuf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/tree.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/type_traits.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/vector.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/exception_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/enc_filebuf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/ropeimpl.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stdio_filebuf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hash_fun.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hashtable.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_rope.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/c++config.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/c++io.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/gthr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.6/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/getopt.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/glob.ph
@@ -1645,6 +1660,9 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/umapfs/umap.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/union
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/union/union.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/emmintrin.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/mmintrin.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/pmmintrin.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/ncurses.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/ndbm.ph
@@ -2165,6 +2183,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/unistd.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/unwind.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/utime.ph
@@ -2223,6 +2242,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/xfs/xfs_vfsops.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/xfs/xfs_vnodeops.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/xfs/xfs_vopdefs.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/xmmintrin.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/zlib.ph
 ./usr/libexec/ld.so
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index c1dacac6dde..e45968dfa83 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -4,116 +4,153 @@
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
 ./usr/include/dis-asm.h
-./usr/include/g++/PlotFile.h
-./usr/include/g++/SFile.h
-./usr/include/g++/_G_config.h
-./usr/include/g++/algo.h
-./usr/include/g++/algobase.h
-./usr/include/g++/alloc.h
-./usr/include/g++/builtinbuf.h
-./usr/include/g++/bvector.h
-./usr/include/g++/complex.h
-./usr/include/g++/defalloc.h
-./usr/include/g++/deque.h
-./usr/include/g++/editbuf.h
-./usr/include/g++/floatio.h
-./usr/include/g++/fstream.h
-./usr/include/g++/function.h
-./usr/include/g++/hash_map
-./usr/include/g++/hash_map.h
-./usr/include/g++/hash_set
-./usr/include/g++/hash_set.h
-./usr/include/g++/hashtable.h
-./usr/include/g++/heap.h
-./usr/include/g++/indstream.h
-./usr/include/g++/iolibio.h
-./usr/include/g++/iomanip.h
-./usr/include/g++/iostdio.h
-./usr/include/g++/iostream.h
-./usr/include/g++/iostreamP.h
-./usr/include/g++/istream.h
-./usr/include/g++/iterator.h
-./usr/include/g++/libio.h
-./usr/include/g++/libioP.h
-./usr/include/g++/list.h
-./usr/include/g++/map.h
-./usr/include/g++/multimap.h
-./usr/include/g++/multiset.h
-./usr/include/g++/new.h
-./usr/include/g++/ostream.h
-./usr/include/g++/pair.h
-./usr/include/g++/parsestream.h
-./usr/include/g++/pfstream.h
-./usr/include/g++/procbuf.h
-./usr/include/g++/pthread_alloc
-./usr/include/g++/pthread_alloc.h
-./usr/include/g++/rope
-./usr/include/g++/rope.h
-./usr/include/g++/ropeimpl.h
-./usr/include/g++/set.h
-./usr/include/g++/slist
-./usr/include/g++/slist.h
-./usr/include/g++/stack.h
-./usr/include/g++/std/bastring.cc
-./usr/include/g++/std/bastring.h
-./usr/include/g++/std/complext.cc
-./usr/include/g++/std/complext.h
-./usr/include/g++/std/dcomplex.h
-./usr/include/g++/std/fcomplex.h
-./usr/include/g++/std/gslice.h
-./usr/include/g++/std/gslice_array.h
-./usr/include/g++/std/indirect_array.h
-./usr/include/g++/std/ldcomplex.h
-./usr/include/g++/std/mask_array.h
-./usr/include/g++/std/slice.h
-./usr/include/g++/std/slice_array.h
-./usr/include/g++/std/std_valarray.h
-./usr/include/g++/std/straits.h
-./usr/include/g++/std/valarray_array.h
-./usr/include/g++/std/valarray_array.tcc
-./usr/include/g++/std/valarray_meta.h
-./usr/include/g++/stdiostream.h
-./usr/include/g++/stl.h
-./usr/include/g++/stl_algo.h
-./usr/include/g++/stl_algobase.h
-./usr/include/g++/stl_alloc.h
-./usr/include/g++/stl_bvector.h
-./usr/include/g++/stl_config.h
-./usr/include/g++/stl_construct.h
-./usr/include/g++/stl_deque.h
-./usr/include/g++/stl_function.h
-./usr/include/g++/stl_hash_fun.h
-./usr/include/g++/stl_hash_map.h
-./usr/include/g++/stl_hash_set.h
-./usr/include/g++/stl_hashtable.h
-./usr/include/g++/stl_heap.h
-./usr/include/g++/stl_iterator.h
-./usr/include/g++/stl_list.h
-./usr/include/g++/stl_map.h
-./usr/include/g++/stl_multimap.h
-./usr/include/g++/stl_multiset.h
-./usr/include/g++/stl_numeric.h
-./usr/include/g++/stl_pair.h
-./usr/include/g++/stl_queue.h
-./usr/include/g++/stl_raw_storage_iter.h
-./usr/include/g++/stl_relops.h
-./usr/include/g++/stl_rope.h
-./usr/include/g++/stl_set.h
-./usr/include/g++/stl_slist.h
-./usr/include/g++/stl_stack.h
-./usr/include/g++/stl_tempbuf.h
-./usr/include/g++/stl_tree.h
-./usr/include/g++/stl_uninitialized.h
-./usr/include/g++/stl_vector.h
-./usr/include/g++/stream.h
-./usr/include/g++/streambuf.h
-./usr/include/g++/strfile.h
-./usr/include/g++/strstream
-./usr/include/g++/strstream.h
-./usr/include/g++/tempbuf.h
-./usr/include/g++/tree.h
-./usr/include/g++/type_traits.h
-./usr/include/g++/vector.h
+./usr/include/g++/backward
+./usr/include/g++/backward/algo.h
+./usr/include/g++/backward/algobase.h
+./usr/include/g++/backward/alloc.h
+./usr/include/g++/backward/backward_warning.h
+./usr/include/g++/backward/bvector.h
+./usr/include/g++/backward/complex.h
+./usr/include/g++/backward/defalloc.h
+./usr/include/g++/backward/deque.h
+./usr/include/g++/backward/fstream.h
+./usr/include/g++/backward/function.h
+./usr/include/g++/backward/hash_map.h
+./usr/include/g++/backward/hash_set.h
+./usr/include/g++/backward/hashtable.h
+./usr/include/g++/backward/heap.h
+./usr/include/g++/backward/iomanip.h
+./usr/include/g++/backward/iostream.h
+./usr/include/g++/backward/istream.h
+./usr/include/g++/backward/iterator.h
+./usr/include/g++/backward/list.h
+./usr/include/g++/backward/map.h
+./usr/include/g++/backward/multimap.h
+./usr/include/g++/backward/multiset.h
+./usr/include/g++/backward/new.h
+./usr/include/g++/backward/ostream.h
+./usr/include/g++/backward/pair.h
+./usr/include/g++/backward/queue.h
+./usr/include/g++/backward/rope.h
+./usr/include/g++/backward/set.h
+./usr/include/g++/backward/slist.h
+./usr/include/g++/backward/stack.h
+./usr/include/g++/backward/stream.h
+./usr/include/g++/backward/streambuf.h
+./usr/include/g++/backward/strstream
+./usr/include/g++/backward/tempbuf.h
+./usr/include/g++/backward/tree.h
+./usr/include/g++/backward/vector.h
+./usr/include/g++/bits
+./usr/include/g++/bits/basic_ios.h
+./usr/include/g++/bits/basic_ios.tcc
+./usr/include/g++/bits/basic_string.h
+./usr/include/g++/bits/basic_string.tcc
+./usr/include/g++/bits/boost_concept_check.h
+./usr/include/g++/bits/char_traits.h
+./usr/include/g++/bits/cmath.tcc
+./usr/include/g++/bits/codecvt.h
+./usr/include/g++/bits/concept_check.h
+./usr/include/g++/bits/cpp_type_traits.h
+./usr/include/g++/bits/deque.tcc
+./usr/include/g++/bits/fpos.h
+./usr/include/g++/bits/fstream.tcc
+./usr/include/g++/bits/functexcept.h
+./usr/include/g++/bits/gslice.h
+./usr/include/g++/bits/gslice_array.h
+./usr/include/g++/bits/indirect_array.h
+./usr/include/g++/bits/ios_base.h
+./usr/include/g++/bits/istream.tcc
+./usr/include/g++/bits/list.tcc
+./usr/include/g++/bits/locale_classes.h
+./usr/include/g++/bits/locale_facets.h
+./usr/include/g++/bits/locale_facets.tcc
+./usr/include/g++/bits/localefwd.h
+./usr/include/g++/bits/mask_array.h
+./usr/include/g++/bits/ostream.tcc
+./usr/include/g++/bits/pthread_allocimpl.h
+./usr/include/g++/bits/slice_array.h
+./usr/include/g++/bits/sstream.tcc
+./usr/include/g++/bits/stl_algo.h
+./usr/include/g++/bits/stl_algobase.h
+./usr/include/g++/bits/stl_alloc.h
+./usr/include/g++/bits/stl_bvector.h
+./usr/include/g++/bits/stl_construct.h
+./usr/include/g++/bits/stl_deque.h
+./usr/include/g++/bits/stl_function.h
+./usr/include/g++/bits/stl_heap.h
+./usr/include/g++/bits/stl_iterator.h
+./usr/include/g++/bits/stl_iterator_base_funcs.h
+./usr/include/g++/bits/stl_iterator_base_types.h
+./usr/include/g++/bits/stl_list.h
+./usr/include/g++/bits/stl_map.h
+./usr/include/g++/bits/stl_multimap.h
+./usr/include/g++/bits/stl_multiset.h
+./usr/include/g++/bits/stl_numeric.h
+./usr/include/g++/bits/stl_pair.h
+./usr/include/g++/bits/stl_pthread_alloc.h
+./usr/include/g++/bits/stl_queue.h
+./usr/include/g++/bits/stl_raw_storage_iter.h
+./usr/include/g++/bits/stl_relops.h
+./usr/include/g++/bits/stl_set.h
+./usr/include/g++/bits/stl_stack.h
+./usr/include/g++/bits/stl_tempbuf.h
+./usr/include/g++/bits/stl_threads.h
+./usr/include/g++/bits/stl_tree.h
+./usr/include/g++/bits/stl_uninitialized.h
+./usr/include/g++/bits/stl_vector.h
+./usr/include/g++/bits/stream_iterator.h
+./usr/include/g++/bits/streambuf.tcc
+./usr/include/g++/bits/streambuf_iterator.h
+./usr/include/g++/bits/stringfwd.h
+./usr/include/g++/bits/type_traits.h
+./usr/include/g++/bits/valarray_array.h
+./usr/include/g++/bits/valarray_array.tcc
+./usr/include/g++/bits/valarray_meta.h
+./usr/include/g++/bits/vector.tcc
+./usr/include/g++/cxxabi.h
+./usr/include/g++/exception_defines.h
+./usr/include/g++/ext
+./usr/include/g++/ext/algorithm
+./usr/include/g++/ext/enc_filebuf.h
+./usr/include/g++/ext/functional
+./usr/include/g++/ext/hash_map
+./usr/include/g++/ext/hash_set
+./usr/include/g++/ext/iterator
+./usr/include/g++/ext/memory
+./usr/include/g++/ext/numeric
+./usr/include/g++/ext/rb_tree
+./usr/include/g++/ext/rope
+./usr/include/g++/ext/ropeimpl.h
+./usr/include/g++/ext/slist
+./usr/include/g++/ext/stdio_filebuf.h
+./usr/include/g++/ext/stl_hash_fun.h
+./usr/include/g++/ext/stl_hashtable.h
+./usr/include/g++/ext/stl_rope.h
+./usr/include/g++/i386-unknown-openbsd3.6
+./usr/include/g++/i386-unknown-openbsd3.6/bits
+./usr/include/g++/i386-unknown-openbsd3.6/bits/atomicity.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/codecvt_specializations.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd3.6/bits/time_members.h
+./usr/include/g++/ios
+./usr/include/g++/istream
+./usr/include/g++/limits
+./usr/include/g++/locale
+./usr/include/g++/ostream
+./usr/include/g++/streambuf
 ./usr/include/i386
 ./usr/include/i386/ansi.h
 ./usr/include/i386/apicvar.h
@@ -187,26 +224,28 @@
 ./usr/include/i386/vm86.h
 ./usr/include/i386/vmparam.h
 ./usr/include/ieeefp.h
+./usr/include/emmintrin.h
+./usr/include/mmintrin.h
+./usr/include/pmmintrin.h
+./usr/include/unwind.h
+./usr/include/xmmintrin.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/fpic
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include/README
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include/exception
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include/new
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/i386-unknown-openbsd3.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/fpic
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd3.6/3.3.5/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libbfd.la
@@ -246,8 +285,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
-./usr/lib/libstdc++_p.a
-./usr/lib/libstdc++_pic.a
+./usr/lib/libsupc++.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
 ./usr/lib/libusbhid_pic.a