disable base-gcc on i386, from daniel@, ok deraadt

4 files changed, 2 insertions, 620 deletions

diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index c641f33bb98..b1cc710dd6c 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -78,16 +78,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6/4.2.1
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6/4.2.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6/4.2.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6/4.2.1/specs
 ./usr/lib/libLLVM.so.1.0
 ./usr/lib/libc++.so.3.0
 ./usr/lib/libc++abi.so.1.0
 ./usr/lib/libcompiler_rt.a
-./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/i386-openbsd
 ./usr/libdata/perl5/i386-openbsd/.packlist
 ./usr/libdata/perl5/i386-openbsd/B
diff --git a/distrib/sets/lists/comp/gcc.i386 b/distrib/sets/lists/comp/gcc.i386
index 9de3b3329ba..7a3bffd0ee9 100644
--- a/distrib/sets/lists/comp/gcc.i386
+++ b/distrib/sets/lists/comp/gcc.i386
@@ -1,607 +1,2 @@
-./usr/bin/g++
-./usr/bin/gcc
-./usr/bin/gcov
 ./usr/bin/ld.bfd
-./usr/include/g++
-./usr/include/g++/algorithm
-./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/allocator.h
-./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/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/ostream_insert.h
-./usr/include/g++/bits/postypes.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_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_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_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/valarray_after.h
-./usr/include/g++/bits/valarray_array.h
-./usr/include/g++/bits/valarray_array.tcc
-./usr/include/g++/bits/valarray_before.h
-./usr/include/g++/bits/vector.tcc
-./usr/include/g++/bitset
-./usr/include/g++/cassert
-./usr/include/g++/cctype
-./usr/include/g++/cerrno
-./usr/include/g++/cfloat
-./usr/include/g++/ciso646
-./usr/include/g++/climits
-./usr/include/g++/clocale
-./usr/include/g++/cmath
-./usr/include/g++/complex
-./usr/include/g++/csetjmp
-./usr/include/g++/csignal
-./usr/include/g++/cstdarg
-./usr/include/g++/cstddef
-./usr/include/g++/cstdio
-./usr/include/g++/cstdlib
-./usr/include/g++/cstring
-./usr/include/g++/ctime
-./usr/include/g++/cwchar
-./usr/include/g++/cwctype
-./usr/include/g++/cxxabi.h
-./usr/include/g++/debug
-./usr/include/g++/debug/bitset
-./usr/include/g++/debug/debug.h
-./usr/include/g++/debug/deque
-./usr/include/g++/debug/formatter.h
-./usr/include/g++/debug/functions.h
-./usr/include/g++/debug/hash_map
-./usr/include/g++/debug/hash_map.h
-./usr/include/g++/debug/hash_multimap.h
-./usr/include/g++/debug/hash_multiset.h
-./usr/include/g++/debug/hash_set
-./usr/include/g++/debug/hash_set.h
-./usr/include/g++/debug/list
-./usr/include/g++/debug/macros.h
-./usr/include/g++/debug/map
-./usr/include/g++/debug/map.h
-./usr/include/g++/debug/multimap.h
-./usr/include/g++/debug/multiset.h
-./usr/include/g++/debug/safe_base.h
-./usr/include/g++/debug/safe_iterator.h
-./usr/include/g++/debug/safe_iterator.tcc
-./usr/include/g++/debug/safe_sequence.h
-./usr/include/g++/debug/set
-./usr/include/g++/debug/set.h
-./usr/include/g++/debug/string
-./usr/include/g++/debug/vector
-./usr/include/g++/deque
-./usr/include/g++/exception
-./usr/include/g++/exception_defines.h
-./usr/include/g++/ext
-./usr/include/g++/ext/algorithm
-./usr/include/g++/ext/array_allocator.h
-./usr/include/g++/ext/atomicity.h
-./usr/include/g++/ext/bitmap_allocator.h
-./usr/include/g++/ext/codecvt_specializations.h
-./usr/include/g++/ext/concurrence.h
-./usr/include/g++/ext/debug_allocator.h
-./usr/include/g++/ext/functional
-./usr/include/g++/ext/hash_fun.h
-./usr/include/g++/ext/hash_map
-./usr/include/g++/ext/hash_set
-./usr/include/g++/ext/hashtable.h
-./usr/include/g++/ext/iterator
-./usr/include/g++/ext/malloc_allocator.h
-./usr/include/g++/ext/memory
-./usr/include/g++/ext/mt_allocator.h
-./usr/include/g++/ext/new_allocator.h
-./usr/include/g++/ext/numeric
-./usr/include/g++/ext/numeric_traits.h
-./usr/include/g++/ext/pb_ds
-./usr/include/g++/ext/pb_ds/assoc_container.hpp
-./usr/include/g++/ext/pb_ds/detail
-./usr/include/g++/ext/pb_ds/detail/basic_tree_policy
-./usr/include/g++/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
-./usr/include/g++/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
-./usr/include/g++/ext/pb_ds/detail/basic_tree_policy/traits.hpp
-./usr/include/g++/ext/pb_ds/detail/basic_types.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/traits.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
-./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/cond_dealtor.hpp
-./usr/include/g++/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/container_base_dispatch.hpp
-./usr/include/g++/ext/pb_ds/detail/eq_fn
-./usr/include/g++/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
-./usr/include/g++/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
-./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn
-./usr/include/g++/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
-./usr/include/g++/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_policy
-./usr/include/g++/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
-./usr/include/g++/ext/pb_ds/detail/map_debug_base.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/traits.hpp
-./usr/include/g++/ext/pb_ds/detail/pairing_heap_
-./usr/include/g++/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
-./usr/include/g++/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/head.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/internal_node.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/leaf.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/node_base.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/traits.hpp
-./usr/include/g++/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/node.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/traits.hpp
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy
-./usr/include/g++/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
-./usr/include/g++/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/node.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/splay_tree_/traits.hpp
-./usr/include/g++/ext/pb_ds/detail/standard_policies.hpp
-./usr/include/g++/ext/pb_ds/detail/thin_heap_
-./usr/include/g++/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
-./usr/include/g++/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
-./usr/include/g++/ext/pb_ds/detail/tree_policy
-./usr/include/g++/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
-./usr/include/g++/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
-./usr/include/g++/ext/pb_ds/detail/tree_trace_base.hpp
-./usr/include/g++/ext/pb_ds/detail/trie_policy
-./usr/include/g++/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
-./usr/include/g++/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
-./usr/include/g++/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
-./usr/include/g++/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
-./usr/include/g++/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
-./usr/include/g++/ext/pb_ds/detail/type_utils.hpp
-./usr/include/g++/ext/pb_ds/detail/types_traits.hpp
-./usr/include/g++/ext/pb_ds/detail/unordered_iterator
-./usr/include/g++/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/unordered_iterator/iterator.hpp
-./usr/include/g++/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
-./usr/include/g++/ext/pb_ds/exception.hpp
-./usr/include/g++/ext/pb_ds/hash_policy.hpp
-./usr/include/g++/ext/pb_ds/list_update_policy.hpp
-./usr/include/g++/ext/pb_ds/priority_queue.hpp
-./usr/include/g++/ext/pb_ds/tag_and_trait.hpp
-./usr/include/g++/ext/pb_ds/tree_policy.hpp
-./usr/include/g++/ext/pb_ds/trie_policy.hpp
-./usr/include/g++/ext/pod_char_traits.h
-./usr/include/g++/ext/pool_allocator.h
-./usr/include/g++/ext/rb_tree
-./usr/include/g++/ext/rc_string_base.h
-./usr/include/g++/ext/rope
-./usr/include/g++/ext/ropeimpl.h
-./usr/include/g++/ext/slist
-./usr/include/g++/ext/sso_string_base.h
-./usr/include/g++/ext/stdio_filebuf.h
-./usr/include/g++/ext/stdio_sync_filebuf.h
-./usr/include/g++/ext/throw_allocator.h
-./usr/include/g++/ext/type_traits.h
-./usr/include/g++/ext/typelist.h
-./usr/include/g++/ext/vstring.h
-./usr/include/g++/ext/vstring.tcc
-./usr/include/g++/ext/vstring_fwd.h
-./usr/include/g++/ext/vstring_util.h
-./usr/include/g++/fstream
-./usr/include/g++/functional
-./usr/include/g++/i386-unknown-openbsd6.6
-./usr/include/g++/i386-unknown-openbsd6.6/bits
-./usr/include/g++/i386-unknown-openbsd6.6/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd6.6/bits/time_members.h
-./usr/include/g++/iomanip
-./usr/include/g++/ios
-./usr/include/g++/iosfwd
-./usr/include/g++/iostream
-./usr/include/g++/istream
-./usr/include/g++/iterator
-./usr/include/g++/limits
-./usr/include/g++/list
-./usr/include/g++/locale
-./usr/include/g++/map
-./usr/include/g++/memory
-./usr/include/g++/new
-./usr/include/g++/numeric
-./usr/include/g++/ostream
-./usr/include/g++/queue
-./usr/include/g++/set
-./usr/include/g++/sstream
-./usr/include/g++/stack
-./usr/include/g++/stdexcept
-./usr/include/g++/streambuf
-./usr/include/g++/string
-./usr/include/g++/tr1
-./usr/include/g++/tr1/array
-./usr/include/g++/tr1/bind_iterate.h
-./usr/include/g++/tr1/bind_repeat.h
-./usr/include/g++/tr1/boost_shared_ptr.h
-./usr/include/g++/tr1/cctype
-./usr/include/g++/tr1/cfenv
-./usr/include/g++/tr1/cfloat
-./usr/include/g++/tr1/cinttypes
-./usr/include/g++/tr1/climits
-./usr/include/g++/tr1/cmath
-./usr/include/g++/tr1/common.h
-./usr/include/g++/tr1/complex
-./usr/include/g++/tr1/cstdarg
-./usr/include/g++/tr1/cstdbool
-./usr/include/g++/tr1/cstdint
-./usr/include/g++/tr1/cstdio
-./usr/include/g++/tr1/cstdlib
-./usr/include/g++/tr1/ctgmath
-./usr/include/g++/tr1/ctime
-./usr/include/g++/tr1/ctype.h
-./usr/include/g++/tr1/cwchar
-./usr/include/g++/tr1/cwctype
-./usr/include/g++/tr1/fenv.h
-./usr/include/g++/tr1/float.h
-./usr/include/g++/tr1/functional
-./usr/include/g++/tr1/functional_hash.h
-./usr/include/g++/tr1/functional_iterate.h
-./usr/include/g++/tr1/hashtable
-./usr/include/g++/tr1/hashtable_policy.h
-./usr/include/g++/tr1/inttypes.h
-./usr/include/g++/tr1/limits.h
-./usr/include/g++/tr1/math.h
-./usr/include/g++/tr1/memory
-./usr/include/g++/tr1/mu_iterate.h
-./usr/include/g++/tr1/random
-./usr/include/g++/tr1/random.tcc
-./usr/include/g++/tr1/ref_fwd.h
-./usr/include/g++/tr1/ref_wrap_iterate.h
-./usr/include/g++/tr1/repeat.h
-./usr/include/g++/tr1/stdarg.h
-./usr/include/g++/tr1/stdbool.h
-./usr/include/g++/tr1/stdint.h
-./usr/include/g++/tr1/stdio.h
-./usr/include/g++/tr1/stdlib.h
-./usr/include/g++/tr1/tgmath.h
-./usr/include/g++/tr1/tuple
-./usr/include/g++/tr1/tuple_defs.h
-./usr/include/g++/tr1/tuple_iterate.h
-./usr/include/g++/tr1/type_traits
-./usr/include/g++/tr1/type_traits_fwd.h
-./usr/include/g++/tr1/unordered_map
-./usr/include/g++/tr1/unordered_set
-./usr/include/g++/tr1/utility
-./usr/include/g++/tr1/wchar.h
-./usr/include/g++/tr1/wctype.h
-./usr/include/g++/typeinfo
-./usr/include/g++/utility
-./usr/include/g++/valarray
-./usr/include/g++/vector
-./usr/lib/gcc-lib
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd6.6/4.2.1/libgcov.a
-./usr/lib/libstdc++.a
-./usr/lib/libstdc++_p.a
-./usr/lib/libsupc++.a
-./usr/lib/libsupc++_p.a
-./usr/share/info/cpp.info
-./usr/share/info/cppinternals.info
-./usr/share/info/gcc.info
-./usr/share/info/gccint.info
-./usr/share/man/man1/gcc.1
-./usr/share/man/man1/gcov.1
 ./usr/share/man/man1/ld.bfd.1
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 841e7b2a4e1..d988d81e50f 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -2,8 +2,6 @@
 ./usr/bin/as
 ./usr/bin/gdb
 ./usr/bin/readelf
-./usr/include/cpuid.h
-./usr/include/emmintrin.h
 ./usr/include/i386
 ./usr/include/i386/_float.h
 ./usr/include/i386/_types.h
@@ -84,11 +82,6 @@
 ./usr/include/i386/vmmvar.h
 ./usr/include/i386/vmparam.h
 ./usr/include/ieeefp.h
-./usr/include/mm_malloc.h
-./usr/include/mmintrin.h
-./usr/include/pmmintrin.h
-./usr/include/unwind.h
-./usr/include/xmmintrin.h
 ./usr/lib/libi386.a
 ./usr/lib/libi386_p.a
 ./usr/libdata/ldscripts
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 4e1e9792146..ebced2c1cc5 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.198 2019/07/01 15:20:16 visa Exp $
+#	$OpenBSD: bsd.own.mk,v 1.199 2019/08/27 15:32:33 sthen Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -43,7 +43,7 @@ BUILD_GCC3?=yes
 BUILD_GCC3?=no
 .endif
 .if !empty(GCC4_ARCH:M${_arch}) || ${MACHINE_ARCH} == "amd64" || \
-    ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "arm" || \
     ${MACHINE_ARCH} == "mips64"
 BUILD_GCC4?=yes
 .else