Switch vax to gcc 3.3.6.

17 files changed, 346 insertions, 280 deletions

diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index f25a843160d..a3079a291df 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1,12 +1,12 @@
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/bin/gccbug
 ./usr/lib/gcc-lib/vax-unknown-openbsd5.4
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/cc1
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/cpp0
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/specs
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/cc1
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/collect2
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/include
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/specs
 ./usr/libdata/perl5/site_perl/vax-openbsd
 ./usr/libdata/perl5/site_perl/vax-openbsd/_h2ph_pre.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/a.out.ph
@@ -879,108 +879,123 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/ftw.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/g++
 ./usr/libdata/perl5/site_perl/vax-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/PlotFile.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/SFile.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/_G_config.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/algo.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/algobase.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/alloc.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/builtinbuf.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/bvector.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/complex.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/defalloc.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/deque.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/editbuf.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/floatio.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/fstream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/function.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/hash_map.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/hash_set.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/hashtable.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/heap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/indstream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/iolibio.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/iomanip.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/iostdio.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/iostream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/iostreamP.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/istream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/iterator.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/libio.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/libioP.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/list.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/map.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/multimap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/multiset.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/new.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/ostream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/pair.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/parsestream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/pfstream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/procbuf.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/pthread_alloc.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/rope.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/ropeimpl.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/set.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/slist.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stack.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/bastring.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/complext.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/dcomplex.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/fcomplex.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/gslice.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/gslice_array.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/indirect_array.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/ldcomplex.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/mask_array.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/slice.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/slice_array.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/std_valarray.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/straits.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/valarray_array.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/std/valarray_meta.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stdiostream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_algo.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_algobase.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_alloc.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_bvector.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_config.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_construct.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_deque.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_function.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_hash_fun.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_hash_map.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_hash_set.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_hashtable.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_heap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_iterator.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_list.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_map.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_multimap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_multiset.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_numeric.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_pair.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_queue.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_raw_storage_iter.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_relops.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_rope.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_set.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_slist.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_stack.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_tempbuf.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_tree.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_uninitialized.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stl_vector.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/stream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/streambuf.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/strfile.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/strstream.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/tempbuf.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/tree.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/type_traits.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vector.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/algo.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/algobase.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/alloc.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/backward_warning.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/bvector.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/complex.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/defalloc.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/deque.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/fstream.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/function.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/hash_map.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/hash_set.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/hashtable.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/heap.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/iomanip.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/iostream.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/istream.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/iterator.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/list.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/map.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/multimap.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/multiset.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/new.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/ostream.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/pair.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/queue.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/rope.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/set.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/slist.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/stack.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/stream.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/streambuf.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/tempbuf.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/tree.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/backward/vector.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/basic_ios.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/basic_string.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/boost_concept_check.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/char_traits.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/codecvt.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/concept_check.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/cpp_type_traits.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/fpos.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/functexcept.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/gslice.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/gslice_array.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/indirect_array.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/ios_base.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/locale_classes.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/locale_facets.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/localefwd.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/mask_array.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/pthread_allocimpl.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/slice_array.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_algo.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_algobase.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_alloc.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_bvector.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_construct.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_deque.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_function.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_heap.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_iterator.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_iterator_base_funcs.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_iterator_base_types.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_list.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_map.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_multimap.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_multiset.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_numeric.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_pair.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_pthread_alloc.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_queue.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_raw_storage_iter.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_relops.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_set.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_stack.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_tempbuf.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_threads.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_tree.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_uninitialized.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stl_vector.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stream_iterator.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/streambuf_iterator.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/stringfwd.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/type_traits.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/valarray_array.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/bits/valarray_meta.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/cxxabi.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/exception_defines.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/enc_filebuf.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/ropeimpl.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/stdio_filebuf.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/stl_hash_fun.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/stl_hashtable.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/stl_rope.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.4/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/getopt.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/glob.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/grp.ph
@@ -1609,6 +1624,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/unistd.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/unwind.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/utime.ph
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index d6937175c75..9d4c0c6499e 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -3,116 +3,154 @@
 ./usr/bin/protoize
 ./usr/bin/readelf
 ./usr/bin/unprotoize
-./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++/ios
+./usr/include/g++/istream
+./usr/include/g++/limits
+./usr/include/g++/locale
+./usr/include/g++/ostream
+./usr/include/g++/streambuf
+./usr/include/g++/vax-unknown-openbsd5.4
+./usr/include/g++/vax-unknown-openbsd5.4/bits
+./usr/include/g++/vax-unknown-openbsd5.4/bits/atomicity.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/codecvt_specializations.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/vax-unknown-openbsd5.4/bits/time_members.h
+./usr/include/unwind.h
 ./usr/include/vax
 ./usr/include/vax/_float.h
 ./usr/include/vax/_types.h
@@ -176,19 +214,12 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/README
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/exception
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/float.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/limits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/new
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/new.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/libgcc.a
-./usr/lib/libstdc++_p.a
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/3.3.6/libgcc.a
+./usr/lib/libsupc++.a
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf32vax_obsd.x
 ./usr/libdata/ldscripts/elf32vax_obsd.xbn
diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index 897821374b9..9e92d84137d 100644
--- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.47 2007/11/03 10:32:56 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.48 2013/08/06 19:05:57 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -20,8 +20,13 @@ KRB5=--with-gssapi=/usr --enable-encryption
 KRB5=
 .endif
 
+LDFLAGS=${LDSTATIC}
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
+
 all:	config.status
-	${MAKE} ${GNUCFLAGS} LDFLAGS=${LDSTATIC} all info
+	${MAKE} ${GNUCFLAGS} LDFLAGS="${LDFLAGS}" all info
 
 .FORCE:	.IGNORE
 
diff --git a/gnu/usr.bin/lynx/Makefile.bsd-wrapper b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
index 7ad5d6fdee2..e1fd59bcf8b 100644
--- a/gnu/usr.bin/lynx/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.22 2013/02/19 05:42:50 brad Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.23 2013/08/06 19:05:57 miod Exp $
 
 MAN=	lynx.1
 CLEANFILES+= lynx.1
 DPADD=	${LIBSSL} ${LIBCRYPTO}
 
 .if (${MACHINE} == "vax")
-OPT=-O0
+LDFLAGS+=	-Wl,--no-keep-memory
 .endif
 
-GNUCFLAGS=	CC="${CC}" CFLAGS="${CFLAGS} ${COPTS} ${OPT}"
+GNUCFLAGS=	CC="${CC}" CFLAGS="${CFLAGS} ${COPTS} ${OPT}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS= --with-ssl=/usr --enable-widec --enable-ipv6 --enable-debug
 HTMLDIR=	/usr/share/doc/html
 HELPFILES=	keystrokes/alt_edit_help.html keystrokes/bookmark_help.html \
diff --git a/gnu/usr.sbin/sendmail/sendmail/Makefile b/gnu/usr.sbin/sendmail/sendmail/Makefile
index 227d01dea31..94e6602205d 100644
--- a/gnu/usr.sbin/sendmail/sendmail/Makefile
+++ b/gnu/usr.sbin/sendmail/sendmail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2008/08/20 22:19:49 dlg Exp $
+#	$OpenBSD: Makefile,v 1.29 2013/08/06 19:05:57 miod Exp $
 
 PROG=	sendmail
 
@@ -21,6 +21,10 @@ LDADD+= -lsasl2
 LDFLAGS+=-L/usr/local/lib
 .endif
 
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
+
 # Compile with milter support.
 ENVDEF+= -DMILTER
 
diff --git a/kerberosV/Makefile.inc b/kerberosV/Makefile.inc
index 5c17d7cea7a..a227403fd38 100644
--- a/kerberosV/Makefile.inc
+++ b/kerberosV/Makefile.inc
@@ -1,10 +1,13 @@
-# $OpenBSD: Makefile.inc,v 1.20 2013/07/22 14:13:46 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.21 2013/08/06 19:05:57 miod Exp $
 
 KRB5DIR=	${.CURDIR}/../../../kerberosV/src
 KRB5SUBST=	${KRB5DIR}/../varsub
 
 CPPFLAGS+=	-DHAVE_CONFIG_H -DNO_NTLM
 CPPFLAGS+=	-I${.CURDIR}/../../include -I/usr/include/kerberosV
+.if ${MACHINE} == "vax"
+LDFLAGS+=	-Wl,--no-keep-memory
+.endif
 
 LIBHEIMIPCC=	${.OBJDIR}/../../lib/libheimipcc/libheimipcc.a
 LIBHEIMIPCS=	${.OBJDIR}/../../lib/libheimipcs/libheimipcs.a
diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile
index a60cf283618..b65e83df7d7 100644
--- a/libexec/login_krb5-or-pwd/Makefile
+++ b/libexec/login_krb5-or-pwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2013/06/19 19:45:03 robert Exp $
+#	$OpenBSD: Makefile,v 1.17 2013/08/06 19:05:57 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -14,6 +14,9 @@ LDADD+=	-lkrb5 -lasn1 -lcrypto -lutil
 LDADD+=	-lwind -lroken -lcom_err -lheimbase
 CFLAGS+=-DKRB5
 .PATH:	${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 ${.CURDIR}/../../usr.bin/passwd
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
 .else
 DPADD+=  ${LIBUTIL}
 LDADD+=  -lutil
diff --git a/libexec/login_krb5/Makefile b/libexec/login_krb5/Makefile
index 9027b18ad96..57676948dd7 100644
--- a/libexec/login_krb5/Makefile
+++ b/libexec/login_krb5/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2013/06/19 19:45:03 robert Exp $
+#	$OpenBSD: Makefile,v 1.20 2013/08/06 19:05:57 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -14,6 +14,9 @@ DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 LDADD+=	-lkrb5 -lasn1 -lcrypto
 LDADD+= -lwind -lroken -lcom_err -lheimbase
 CFLAGS+=-DKRB5
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
 .endif
 
 DPADD+=	${LIBUTIL}
diff --git a/share/man/man1/gcc-local.1 b/share/man/man1/gcc-local.1
index 265fd384fa4..7cc7bc971a3 100644
--- a/share/man/man1/gcc-local.1
+++ b/share/man/man1/gcc-local.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gcc-local.1,v 1.37 2013/07/12 10:44:14 jmc Exp $
+.\" $OpenBSD: gcc-local.1,v 1.38 2013/08/06 19:05:57 miod Exp $
 .\"
 .\" Copyright (c) 2002 Marc Espie
 .\" Copyright (c) 2003 Anil Madhavapeddy
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 12 2013 $
+.Dd $Mdocdate: August 6 2013 $
 .Dt GCC-LOCAL 1
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Ox
 uses derivatives of
 .Xr gcc 1
-versions 2.95.3, 3.3.6 or 4.2.1,
+versions 3.3.6 or 4.2.1,
 depending on machine architecture.
 In all cases,
 the software comes with specific modifications for
@@ -86,13 +86,6 @@ option does not include the
 optimization as it is known to be broken in
 .Nm gcc 4.2.1 .
 .It
-The option
-.Fl fno-builtin-<function>
-was backported to
-.Nm gcc 2.95.3 ,
-and can be used without having to differentiate between
-compilers.
-.It
 .Nm gcc
 recognizes the extra format attribute syslog, to better match
 the definition of
@@ -100,7 +93,6 @@ the definition of
 and silence erroneous warnings when used with
 .Fl pedantic .
 .It
-Even in 2.95.3,
 .Nm gcc
 recognizes the attribute
 .Dv __nonnull__ ,
@@ -124,17 +116,6 @@ This exposes latent bugs for 64-bit architectures,
 where a terminating 0 will expand to a 32-bit int, and not a full-fledged
 64-bits pointer.
 .It
-On vax,
-.Nm gcc
-still uses
-.Xr setjmp 3 /
-.Xr longjmp 3 -
-style exceptions, and so needs extra fixes beyond the pure 2.95.3 release.
-.Po so-called
-.Dq sjlj
-exceptions are also used on aviion, luna88k and mvme88k
-.Pc
-.It
 On alpha,
 .Fl mieee
 is enabled by default to enable full compliance with
@@ -234,7 +215,6 @@ re-enabled with the
 .Fl Wpointer-sign
 flag.
 .It
-Even in 2.95.3,
 .Nm gcc
 recognizes the preprocessor flag
 .Fl CC
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 6763f6a0e67..994314b033a 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.140 2013/07/05 21:13:35 miod Exp $
+#	$OpenBSD: bsd.own.mk,v 1.141 2013/08/06 19:05:57 miod Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -24,8 +24,7 @@ DEBUGLIBS?=	no
 # Set toolchain to be able to know differences.
 ELF_TOOLCHAIN?=	yes
 
-GCC2_ARCH=vax
-GCC4_ARCH=alpha amd64 arm hppa hppa64 i386 ia64 mips64 mips64el powerpc sh sparc sparc64
+GCC3_ARCH=m68k m88k vax
 BINUTILS217_ARCH=hppa64 ia64
 
 # i386 PIE works; but there are RAMDISK fitting problems.
@@ -34,12 +33,10 @@ BINUTILS217_ARCH=hppa64 ia64
 PIE_ARCH=alpha amd64 hppa mips64 mips64el sh sparc64
 
 .for _arch in ${MACHINE_ARCH}
-.if !empty(GCC2_ARCH:M${_arch})
-COMPILER_VERSION?=gcc2
-.elif !empty(GCC4_ARCH:M${_arch})
-COMPILER_VERSION?=gcc4
-.else
+.if !empty(GCC3_ARCH:M${_arch})
 COMPILER_VERSION?=gcc3
+.else
+COMPILER_VERSION?=gcc4
 .endif
 
 .if !empty(BINUTILS217_ARCH:M${_arch})
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index bc9af47a2f0..e44581d76c6 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.35 2013/06/19 19:46:44 robert Exp $
+#	$OpenBSD: Makefile,v 1.36 2013/08/06 19:05:57 miod Exp $
 
 .include <bsd.own.mk>
 
@@ -23,6 +23,9 @@ CFLAGS+= -DKRB5
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 LDADD+=	-lkrb5 -lasn1 -lcrypto
 LDADD+= -lwind -lroken -lcom_err -lheimbase
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
 .endif
 
 BINMODE=4555
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 6ba11dd2ee7..b0df5b796d1 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.27 2013/06/19 19:46:43 robert Exp $
+#	$OpenBSD: Makefile,v 1.28 2013/08/06 19:05:57 miod Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -49,6 +49,9 @@ DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
 LDADD+= -lkrb5 -lasn1 -lcrypto
 LDADD+= -lwind -lroken -lcom_err -lheimbase
 SRCS+= kerberos5.c enc_des.c
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index 5b5180dc8ee..62d7849e4a2 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Apache 
-# $OpenBSD: Makefile.bsd-wrapper,v 1.72 2012/08/24 07:57:54 sthen Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.73 2013/08/06 19:05:57 miod Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -633,9 +633,14 @@ all: 	${.OBJDIR}/config.status
 
 BEFOREMAN=${.OBJDIR}/config.status
 
+EXTRA_LDFLAGS=-lpthread
+.if ${MACHINE} == "vax"
+EXTRA_LDFLAGS+=-Wl,--no-keep-memory
+.endif
+
 ${.OBJDIR}/config.status : ${.OBJDIR}/config.layout 
 	@cd ${.OBJDIR} && CC="${CC}" LD_SHLIB="${CC}" \
-		EXTRA_LDFLAGS="-lpthread" OPTIM="${CFLAGS} ${COPTS}" \
+		EXTRA_LDFLAGS="${EXTRA_LDFLAGS}" OPTIM="${CFLAGS} ${COPTS}" \
 		PATH="/sbin:/usr/sbin:/bin:/usr/bin" \
 			sh configure ${CONFIG_ARGS}
 	diff -u ${.CURDIR}/src/include/ap_config_auto.h ${.OBJDIR}/src/include/ap_config_auto.h.new
diff --git a/usr.sbin/ldapd/Makefile b/usr.sbin/ldapd/Makefile
index f89a57e244e..9774aeccde9 100644
--- a/usr.sbin/ldapd/Makefile
+++ b/usr.sbin/ldapd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2010/11/03 14:17:01 martinh Exp $
+#	$OpenBSD: Makefile,v 1.10 2013/08/06 19:05:57 miod Exp $
 
 PROG=		ldapd
 MAN=		ldapd.8 ldapd.conf.5
@@ -17,6 +17,10 @@ CFLAGS+=	-Wshadow -Wpointer-arith -Wcast-qual
 CFLAGS+=	-Wsign-compare
 CLEANFILES+=	y.tab.h parse.c
 
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
+
 SCHEMA_FILES=	core.schema \
 		inetorgperson.schema \
 		nis.schema
diff --git a/usr.sbin/nginx/Makefile.bsd-wrapper b/usr.sbin/nginx/Makefile.bsd-wrapper
index b4da62f4af7..29c9dbe1d89 100644
--- a/usr.sbin/nginx/Makefile.bsd-wrapper
+++ b/usr.sbin/nginx/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Nginx
-# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2013/06/19 16:21:12 reyk Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.13 2013/08/06 19:05:57 miod Exp $
 
 LNDIR=	/usr/bin/lndir
 
@@ -7,6 +7,7 @@ LNDIR=	/usr/bin/lndir
 
 .if (${MACHINE_ARCH} == "vax")
 CFLAGS=-O1 ${PIPE} ${DEBUG}
+CORE_LINK=-Wl,--no-keep-memory
 .endif
 
 CONFIGURE_ARGS=	--prefix=/var/www \
@@ -43,7 +44,7 @@ ${.OBJDIR}/objs/nginx.8: ${BEFOREMAN}
 	cd ${.OBJDIR} && ${MAKE} -f objs/Makefile manpage
 
 ${.OBJDIR}/objs/ngx_auto_config.h: ${.OBJDIR}/configure
-	@cd ${.OBJDIR} && CC="${CC}" LD_SHLIB="${CC}" \
+	@cd ${.OBJDIR} && CC="${CC}" CORE_LINK="${CORE_LINK}" \
 		OPTIM="${CFLAGS} ${COPTS}" \
 		PATH="/sbin:/usr/sbin:/bin:/usr/bin" \
 			sh configure ${CONFIGURE_ARGS}
diff --git a/usr.sbin/openssl/Makefile b/usr.sbin/openssl/Makefile
index b7bdf0e1f94..4e0b688e1fd 100644
--- a/usr.sbin/openssl/Makefile
+++ b/usr.sbin/openssl/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2013/07/22 14:40:45 naddy Exp $
+#	$OpenBSD: Makefile,v 1.22 2013/08/06 19:05:57 miod Exp $
 
 PROG=	openssl
 LDADD=	-lssl -lcrypto
@@ -13,6 +13,10 @@ CFLAGS+= -DMONOLITH -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_RC5
 CFLAGS+= -DOPENSSL_NO_SSL2
 CFLAGS+= -I${SSLEAY_SRC_TOP}
 
+.if ${MACHINE} == "vax"
+LDFLAGS+=-Wl,--no-keep-memory
+.endif
+
 SRCS=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \
 	pkcs7.c crl2p7.c crl.c ca.c \
 	rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \
diff --git a/usr.sbin/smtpd/smtpd/Makefile b/usr.sbin/smtpd/smtpd/Makefile
index c6ac4b63cfd..20813ce4d06 100644
--- a/usr.sbin/smtpd/smtpd/Makefile
+++ b/usr.sbin/smtpd/smtpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.65 2013/07/19 21:34:31 eric Exp $
+#	$OpenBSD: Makefile,v 1.66 2013/08/06 19:05:57 miod Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -49,4 +49,8 @@ CFLAGS+=	-DIO_SSL
 CFLAGS+=	-DQUEUE_PROFILING
 YFLAGS=
 
+.if ${MACHINE} == "vax"
+LDFLAGS+=	-Wl,--no-keep-memory
+.endif
+
 .include <bsd.prog.mk>