Split the PLIST stuff into separate languages, and add support for a

`no-runtime' configuration.

9 files changed, 245 insertions, 165 deletions

diff --git a/cross/COMMON/PLIST-egcs b/cross/COMMON/PLIST-egcs
index 65e49831f63..d16c7be3462 100644
--- a/cross/COMMON/PLIST-egcs
+++ b/cross/COMMON/PLIST-egcs
@@ -1,158 +1,18 @@
-@comment $NetBSD: PLIST-egcs,v 1.1 1999/01/04 22:37:30 tv Exp $
-${TARGET_ARCH}/bin/c++
-${TARGET_ARCH}/bin/c++filt
+@comment $NetBSD: PLIST-egcs,v 1.2 1999/01/06 01:14:20 tv Exp $
 ${TARGET_ARCH}/bin/cc
-${TARGET_ARCH}/bin/f77
-${TARGET_ARCH}/bin/fort77
-${TARGET_ARCH}/bin/g++
-${TARGET_ARCH}/bin/g77
 ${TARGET_ARCH}/bin/gcc
-${TARGET_ARCH}/lib/libstdc++.a
-bin/${TARGET_ARCH}-c++
-bin/${TARGET_ARCH}-c++filt
 bin/${TARGET_ARCH}-cc
-bin/${TARGET_ARCH}-f77
-bin/${TARGET_ARCH}-fort77
-bin/${TARGET_ARCH}-g++
-bin/${TARGET_ARCH}-g77
 bin/${TARGET_ARCH}-gcc
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cc1
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cc1obj
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cc1plus
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/collect2
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cpp
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/f771
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/README
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/exception
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/float.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/algo.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/algobase.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/algorithm
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/alloc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/bvector.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cassert
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cctype
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cerrno
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cfloat
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/ciso646
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/climits
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/clocale
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cmath
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/complex
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/complex.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/csetjmp
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/csignal
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cstdarg
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cstddef
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cstdio
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cstdlib
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cstring
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/ctime
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cwchar
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/cwctype
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/defalloc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/deque
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/deque.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/fstream
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/function.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/functional
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/hash_map
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/hash_map.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/hash_set
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/hash_set.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/hashtable.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/heap.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/iomanip
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/iosfwd
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/iostream
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/iterator
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/iterator.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/list
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/list.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/map
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/map.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/memory
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/multimap.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/multiset.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/numeric
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/pair.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/pthread_alloc
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/pthread_alloc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/queue
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/rope
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/rope.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/ropeimpl.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/set
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/set.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/slist
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/slist.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stack
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stack.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std/bastring.cc
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std/bastring.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std/complext.cc
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std/complext.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std/dcomplex.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std/fcomplex.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std/ldcomplex.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std/straits.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stdexcept
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_algo.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_algobase.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_alloc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_bvector.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_config.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_construct.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_deque.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_function.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_hash_fun.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_hash_map.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_hash_set.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_hashtable.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_heap.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_iterator.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_list.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_map.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_multimap.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_multiset.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_numeric.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_pair.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_queue.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_raw_storage_iter.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_relops.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_rope.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_set.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_slist.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_stack.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_tempbuf.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_tree.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_uninitialized.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/stl_vector.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/string
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/strstream
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/tempbuf.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/tree.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/type_traits.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/utility
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/vector
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/vector.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g2c.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/iso646.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/limits.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/new
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/new.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/NXConstStr.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/Object.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/Protocol.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/encoding.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/hash.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc-api.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc-list.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/sarray.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/thr.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/typedstream.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/proto.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/stdarg.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/stdbool.h
@@ -178,12 +38,8 @@ lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-sparc.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-spur.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/va-v850.h
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/varargs.h
-lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/libg2c.a
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/libgcc.a
 lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/specs
-@dirrm lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc
-@dirrm lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std
-@dirrm lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++
 @dirrm lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include
 @dirrm lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}
 @dirrm lib/gcc-lib/${TARGET_ARCH}
diff --git a/cross/COMMON/PLIST-egcs-cxx b/cross/COMMON/PLIST-egcs-cxx
new file mode 100644
index 00000000000..79a9523ec94
--- /dev/null
+++ b/cross/COMMON/PLIST-egcs-cxx
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST-egcs-cxx,v 1.1 1999/01/06 01:14:20 tv Exp $
+${TARGET_ARCH}/bin/c++
+${TARGET_ARCH}/bin/c++filt
+${TARGET_ARCH}/bin/g++
+bin/${TARGET_ARCH}-c++
+bin/${TARGET_ARCH}-c++filt
+bin/${TARGET_ARCH}-g++
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cc1plus
diff --git a/cross/COMMON/PLIST-egcs-cxx-runtime b/cross/COMMON/PLIST-egcs-cxx-runtime
new file mode 100644
index 00000000000..299251b0487
--- /dev/null
+++ b/cross/COMMON/PLIST-egcs-cxx-runtime
@@ -0,0 +1,116 @@
+@comment $NetBSD: PLIST-egcs-cxx-runtime,v 1.1 1999/01/06 01:14:20 tv Exp $
+${TARGET_ARCH}/include/g++/algo.h
+${TARGET_ARCH}/include/g++/algobase.h
+${TARGET_ARCH}/include/g++/algorithm
+${TARGET_ARCH}/include/g++/alloc.h
+${TARGET_ARCH}/include/g++/bvector.h
+${TARGET_ARCH}/include/g++/cassert
+${TARGET_ARCH}/include/g++/cctype
+${TARGET_ARCH}/include/g++/cerrno
+${TARGET_ARCH}/include/g++/cfloat
+${TARGET_ARCH}/include/g++/ciso646
+${TARGET_ARCH}/include/g++/climits
+${TARGET_ARCH}/include/g++/clocale
+${TARGET_ARCH}/include/g++/cmath
+${TARGET_ARCH}/include/g++/complex
+${TARGET_ARCH}/include/g++/complex.h
+${TARGET_ARCH}/include/g++/csetjmp
+${TARGET_ARCH}/include/g++/csignal
+${TARGET_ARCH}/include/g++/cstdarg
+${TARGET_ARCH}/include/g++/cstddef
+${TARGET_ARCH}/include/g++/cstdio
+${TARGET_ARCH}/include/g++/cstdlib
+${TARGET_ARCH}/include/g++/cstring
+${TARGET_ARCH}/include/g++/ctime
+${TARGET_ARCH}/include/g++/cwchar
+${TARGET_ARCH}/include/g++/cwctype
+${TARGET_ARCH}/include/g++/defalloc.h
+${TARGET_ARCH}/include/g++/deque
+${TARGET_ARCH}/include/g++/deque.h
+${TARGET_ARCH}/include/g++/fstream
+${TARGET_ARCH}/include/g++/function.h
+${TARGET_ARCH}/include/g++/functional
+${TARGET_ARCH}/include/g++/hash_map
+${TARGET_ARCH}/include/g++/hash_map.h
+${TARGET_ARCH}/include/g++/hash_set
+${TARGET_ARCH}/include/g++/hash_set.h
+${TARGET_ARCH}/include/g++/hashtable.h
+${TARGET_ARCH}/include/g++/heap.h
+${TARGET_ARCH}/include/g++/iomanip
+${TARGET_ARCH}/include/g++/iosfwd
+${TARGET_ARCH}/include/g++/iostream
+${TARGET_ARCH}/include/g++/iterator
+${TARGET_ARCH}/include/g++/iterator.h
+${TARGET_ARCH}/include/g++/list
+${TARGET_ARCH}/include/g++/list.h
+${TARGET_ARCH}/include/g++/map
+${TARGET_ARCH}/include/g++/map.h
+${TARGET_ARCH}/include/g++/memory
+${TARGET_ARCH}/include/g++/multimap.h
+${TARGET_ARCH}/include/g++/multiset.h
+${TARGET_ARCH}/include/g++/numeric
+${TARGET_ARCH}/include/g++/pair.h
+${TARGET_ARCH}/include/g++/pthread_alloc
+${TARGET_ARCH}/include/g++/pthread_alloc.h
+${TARGET_ARCH}/include/g++/queue
+${TARGET_ARCH}/include/g++/rope
+${TARGET_ARCH}/include/g++/rope.h
+${TARGET_ARCH}/include/g++/ropeimpl.h
+${TARGET_ARCH}/include/g++/set
+${TARGET_ARCH}/include/g++/set.h
+${TARGET_ARCH}/include/g++/slist
+${TARGET_ARCH}/include/g++/slist.h
+${TARGET_ARCH}/include/g++/stack
+${TARGET_ARCH}/include/g++/stack.h
+${TARGET_ARCH}/include/g++/std/bastring.cc
+${TARGET_ARCH}/include/g++/std/bastring.h
+${TARGET_ARCH}/include/g++/std/complext.cc
+${TARGET_ARCH}/include/g++/std/complext.h
+${TARGET_ARCH}/include/g++/std/dcomplex.h
+${TARGET_ARCH}/include/g++/std/fcomplex.h
+${TARGET_ARCH}/include/g++/std/ldcomplex.h
+${TARGET_ARCH}/include/g++/std/straits.h
+${TARGET_ARCH}/include/g++/stdexcept
+${TARGET_ARCH}/include/g++/stl.h
+${TARGET_ARCH}/include/g++/stl_algo.h
+${TARGET_ARCH}/include/g++/stl_algobase.h
+${TARGET_ARCH}/include/g++/stl_alloc.h
+${TARGET_ARCH}/include/g++/stl_bvector.h
+${TARGET_ARCH}/include/g++/stl_config.h
+${TARGET_ARCH}/include/g++/stl_construct.h
+${TARGET_ARCH}/include/g++/stl_deque.h
+${TARGET_ARCH}/include/g++/stl_function.h
+${TARGET_ARCH}/include/g++/stl_hash_fun.h
+${TARGET_ARCH}/include/g++/stl_hash_map.h
+${TARGET_ARCH}/include/g++/stl_hash_set.h
+${TARGET_ARCH}/include/g++/stl_hashtable.h
+${TARGET_ARCH}/include/g++/stl_heap.h
+${TARGET_ARCH}/include/g++/stl_iterator.h
+${TARGET_ARCH}/include/g++/stl_list.h
+${TARGET_ARCH}/include/g++/stl_map.h
+${TARGET_ARCH}/include/g++/stl_multimap.h
+${TARGET_ARCH}/include/g++/stl_multiset.h
+${TARGET_ARCH}/include/g++/stl_numeric.h
+${TARGET_ARCH}/include/g++/stl_pair.h
+${TARGET_ARCH}/include/g++/stl_queue.h
+${TARGET_ARCH}/include/g++/stl_raw_storage_iter.h
+${TARGET_ARCH}/include/g++/stl_relops.h
+${TARGET_ARCH}/include/g++/stl_rope.h
+${TARGET_ARCH}/include/g++/stl_set.h
+${TARGET_ARCH}/include/g++/stl_slist.h
+${TARGET_ARCH}/include/g++/stl_stack.h
+${TARGET_ARCH}/include/g++/stl_tempbuf.h
+${TARGET_ARCH}/include/g++/stl_tree.h
+${TARGET_ARCH}/include/g++/stl_uninitialized.h
+${TARGET_ARCH}/include/g++/stl_vector.h
+${TARGET_ARCH}/include/g++/string
+${TARGET_ARCH}/include/g++/strstream
+${TARGET_ARCH}/include/g++/tempbuf.h
+${TARGET_ARCH}/include/g++/tree.h
+${TARGET_ARCH}/include/g++/type_traits.h
+${TARGET_ARCH}/include/g++/utility
+${TARGET_ARCH}/include/g++/vector
+${TARGET_ARCH}/include/g++/vector.h
+${TARGET_ARCH}/lib/libstdc++.a
+@dirrm ${TARGET_ARCH}/include/g++/std
+@dirrm ${TARGET_ARCH}/include/g++
diff --git a/cross/COMMON/PLIST-egcs-f77 b/cross/COMMON/PLIST-egcs-f77
new file mode 100644
index 00000000000..3b3ede1cf2a
--- /dev/null
+++ b/cross/COMMON/PLIST-egcs-f77
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST-egcs-f77,v 1.1 1999/01/06 01:14:20 tv Exp $
+${TARGET_ARCH}/bin/f77
+${TARGET_ARCH}/bin/fort77
+${TARGET_ARCH}/bin/g77
+bin/${TARGET_ARCH}-f77
+bin/${TARGET_ARCH}-fort77
+bin/${TARGET_ARCH}-g77
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/f771
diff --git a/cross/COMMON/PLIST-egcs-f77-runtime b/cross/COMMON/PLIST-egcs-f77-runtime
new file mode 100644
index 00000000000..bec96bb095b
--- /dev/null
+++ b/cross/COMMON/PLIST-egcs-f77-runtime
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST-egcs-f77-runtime,v 1.1 1999/01/06 01:14:20 tv Exp $
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g2c.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/libg2c.a
diff --git a/cross/COMMON/PLIST-egcs-objc b/cross/COMMON/PLIST-egcs-objc
new file mode 100644
index 00000000000..9a526243e46
--- /dev/null
+++ b/cross/COMMON/PLIST-egcs-objc
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST-egcs-objc,v 1.1 1999/01/06 01:14:20 tv Exp $
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/cc1obj
diff --git a/cross/COMMON/PLIST-egcs-objc-runtime b/cross/COMMON/PLIST-egcs-objc-runtime
new file mode 100644
index 00000000000..548774662a0
--- /dev/null
+++ b/cross/COMMON/PLIST-egcs-objc-runtime
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST-egcs-objc-runtime,v 1.1 1999/01/06 01:14:20 tv Exp $
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/NXConstStr.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/Object.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/Protocol.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/encoding.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/hash.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc-api.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc-list.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/objc.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/sarray.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/thr.h
+lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc/typedstream.h
+@dirrm lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/objc
diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index b618c5e05a9..324f2f5e872 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: cross.mk,v 1.4 1999/01/04 22:37:30 tv Exp $
+#	$NetBSD: cross.mk,v 1.5 1999/01/06 01:14:20 tv Exp $
 
 # Shared definitions for building a cross-compile environment.
 
@@ -62,14 +62,14 @@ binutils-build:
 		${MAKE_PROGRAM} ${MAKE_FLAGS} all
 	@cd ${BINUTILS_WRKSRC}/gas && ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} as-new
-	${LINK.c} -o ${WRKDIR}/ar \
+	test -x ${WRKDIR}/ar || ${LINK.c} -o ${WRKDIR}/ar \
 		-DPREFIX=\"${PREFIX}\" \
 		-DGNUTARGET=\"${BINUTILS_GNUTARGET}\" \
 		${COMMON_DIR}/buwrapper.c
 	@cd ${WRKDIR} && \
 		${LN} -f ar nm && \
 		${LN} -f ar ranlib
-	${LINK.c} -o ${WRKDIR}/ld \
+	test -x ${WRKDIR}/ld || ${LINK.c} -o ${WRKDIR}/ld \
 		-DPREFIX=\"${PREFIX}\" \
 		-DGNUTARGET=\"${BINUTILS_GNUTARGET}\" \
 		-DLDEMULATION=\"${BINUTILS_LDEMULATION}\" \
@@ -94,19 +94,50 @@ EGCS_DISTDIR=		releases/${EGCS_DISTNAME}
 EGCS_INTVERSION=	egcs-2.91.60
 EGCS_PATCHBUNDLE=	${EGCS_DISTNAME}-NetBSD-19980104.diff.gz
 EGCS_WRKSRC=		${WRKDIR}/${EGCS_DISTNAME}
-# XXX PLIST support for fewer languages not yet complete
-EGCS_LANGUAGES?=	c c++ f77 objc
+EGCS_LANGUAGES=		c # add to these below
 
+.if defined(EGCS_NO_RUNTIME) || defined(EGCS_FAKE_RUNTIME)
+EGCS_NO_CXX_RUNTIME=	yes
+EGCS_NO_F77_RUNTIME=	yes
+EGCS_NO_OBJC_RUNTIME=	yes
+.endif
+
+.if !defined(EGCS_NO_CXX)
+EGCS_LANGUAGES+=	c++
+PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-cxx
+.if !defined(EGCS_NO_CXX_RUNTIME)
+PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-cxx-runtime
+.endif
+.endif
+
+.if !defined(EGCS_NO_F77)
+EGCS_LANGUAGES+=	f77
+PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-f77
+.if !defined(EGCS_NO_F77_RUNTIME)
+PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-f77-runtime
+.endif
+.endif
+
+.if !defined(EGCS_NO_OBJC)
+EGCS_LANGUAGES+=	objc
+PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-objc
+.if !defined(EGCS_NO_OBJC_RUNTIME)
+PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs-objc-runtime
+.endif
+.endif
+
+# the main PLIST needs to go last to get the @dirrm's right
+PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs
 CROSS_DISTFILES+=	${EGCS_DISTNAME}.tar.gz ${EGCS_PATCHBUNDLE}
 MASTER_SITES+=		ftp://egcs.cygnus.com/pub/egcs/${EGCS_DISTDIR}/ \
 			${MASTER_SITE_LOCAL}
-PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs
 USE_GMAKE=		yes
 
 CC_FOR_TARGET=		${EGCS_WRKSRC}/gcc/xgcc -B${EGCS_WRKSRC}/gcc/ ${CFLAGS_FOR_TARGET}
 CXX_FOR_TARGET=		${CC_FOR_TARGET}
 
-EGCS_MAKE_FLAGS=	CC_FOR_TARGET="${CC_FOR_TARGET}" \
+EGCS_MAKE_FLAGS=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+			CC_FOR_TARGET="${CC_FOR_TARGET}" \
 			GCC_FOR_TARGET="${CC_FOR_TARGET}" \
 			CXX_FOR_TARGET="${CXX_FOR_TARGET}" \
 			AS_FOR_TARGET="${AS_FOR_TARGET}" \
@@ -117,10 +148,15 @@ EGCS_MAKE_FLAGS=	CC_FOR_TARGET="${CC_FOR_TARGET}" \
 			LANGUAGES="${EGCS_LANGUAGES}" \
 			INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
 			INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+EGCS_MAKE=		${SETENV} ${MAKE_ENV} \
+	                ${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS}
 
+.if defined(EGCS_FAKE_RUNTIME)
+SYS_INCLUDE=		${WRKDIR}/include
+.endif
 .if defined(SYS_INCLUDE)
 CFLAGS_FOR_TARGET+=	-idirafter ${SYS_INCLUDE}
-MAKE_FLAGS+=		SYSTEM_HEADER_DIR="${SYS_INCLUDE}"
+EGCS_MAKE_FLAGS+=	SYSTEM_HEADER_DIR="${SYS_INCLUDE}"
 .endif
 .if defined(SYS_LIB)
 LDFLAGS_FOR_TARGET+=	-L${SYS_LIB}
@@ -144,32 +180,53 @@ egcs-configure:
 		INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		./configure --prefix=${PREFIX} \
-		--host=${MACHINE_GNU_ARCH}--netbsd --target=${TARGET_ARCH} \
-		--enable-version-specific-runtime-libs
+		--host=${MACHINE_GNU_ARCH}--netbsd --target=${TARGET_ARCH}
+.if defined(EGCS_FAKE_RUNTIME)
+	@${MKDIR} ${SYS_INCLUDE} ${SYS_INCLUDE}/machine ${SYS_INCLUDE}/sys
+	@cd ${SYS_INCLUDE} && ${TOUCH} ${TOUCH_FLAGS} machine/ansi.h \
+		sys/time.h stdlib.h unistd.h
+.endif
 
 egcs-build:
 	@${LN} -sf ${AS_FOR_TARGET} ${EGCS_WRKSRC}/gcc/as
 	@${LN} -sf ${LD_FOR_TARGET} ${EGCS_WRKSRC}/gcc/ld
-	@cd ${EGCS_WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS} all
+	@cd ${EGCS_WRKSRC}/gcc && ${EGCS_MAKE} all
+.if !defined(EGCS_NO_CXX) && !defined(EGCS_NO_CXX_RUNTIME)
+	@cd ${EGCS_WRKSRC} && ${EGCS_MAKE} configure-target-libio configure-target-libstdc++ all-target-libio all-target-libstdc++
+.endif
+.if !defined(EGCS_NO_F77) && !defined(EGCS_NO_F77_RUNTIME)
+	@cd ${EGCS_WRKSRC} && ${EGCS_MAKE} configure-target-libf2c all-target-libf2c
+.endif
+.if !defined(EGCS_NO_OBJC) && !defined(EGCS_NO_OBJC_RUNTIME)
+	@cd ${EGCS_WRKSRC}/gcc && ${EGCS_MAKE} objc-runtime
+.endif
 
 egcs-install:
 	@cd ${EGCS_WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS} \
 		install-common install-headers install-libgcc install-driver
 	chown -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}
-	@cd ${EGCS_WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS} install-target-libf2c
-	@${MKDIR} ${PREFIX}/lib/gcc-lib/${TARGET_ARCH}/${EGCS_INTVERSION}/include/g++/std
-	@cd ${EGCS_WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${EGCS_MAKE_FLAGS} install-target-libstdc++
-	${LN} -f ${TARGET_DIR}/bin/gcc ${TARGET_DIR}/bin/cc
 	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${PREFIX}/bin/${TARGET_ARCH}-cc
+	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-gcc ${TARGET_DIR}/bin/cc
+.if !defined(EGCS_NO_F77)
+.if !defined(EGCS_NO_F77_RUNTIME)
+	@cd ${EGCS_WRKSRC} && ${EGCS_MAKE} install-target-libf2c
+.endif
 	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-g77 ${PREFIX}/bin/${TARGET_ARCH}-f77
 	${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-g77 ${PREFIX}/bin/${TARGET_ARCH}-fort77
-	for file in cc c++ c++filt f77 fort77 g++ g77; do \
+	for file in f77 fort77 g77; do \
 		${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
 	done
+.endif
+.if !defined(EGCS_NO_CXX)
+.if !defined(EGCS_NO_CXX_RUNTIME)
+	@${MKDIR} ${TARGET_DIR}/include/g++/std
+	@cd ${EGCS_WRKSRC} && ${EGCS_MAKE} install-target-libstdc++
+.endif
+	for file in c++ c++filt g++; do \
+		${LN} -f ${PREFIX}/bin/${TARGET_ARCH}-$$file ${TARGET_DIR}/bin/$$file; \
+	done
+.endif
 	@${RMDIR} -p ${PREFIX}/info 2>/dev/null || ${TRUE}
 	@${RMDIR} -p ${PREFIX}/man/man1 2>/dev/null || ${TRUE}
 .endif
@@ -183,7 +240,7 @@ EXTRACT_ONLY=		${DISTFILES:N*.diff.gz}
 .endif
 .endif
 
-.if defined(SYS_INCLUDE)
+.if defined(SYS_INCLUDE) && !defined(EGCS_FAKE_RUNTIME)
 pre-install: pre-install-includes
 pre-install-includes:
 	cd ${SYS_INCLUDE} && pax -rw . ${TARGET_DIR}/include
@@ -201,7 +258,9 @@ post-install-plist:
 		-e 's|$${EGCS_INTVERSION}|${EGCS_INTVERSION}|' \
 		${PLIST_PRE} >${PLIST_SRC}
 	@${ECHO} '@dirrm ${TARGET_ARCH}/bin' >>${PLIST_SRC}
+	@${ECHO} '@exec mkdir -p ${TARGET_ARCH}/include' >>${PLIST_SRC}
 	@${ECHO} '@dirrm ${TARGET_ARCH}/include' >>${PLIST_SRC}
+	@${ECHO} '@exec mkdir -p ${TARGET_ARCH}/lib' >>${PLIST_SRC}
 	@${ECHO} '@dirrm ${TARGET_ARCH}/lib' >>${PLIST_SRC}
 	@${ECHO} '@dirrm ${TARGET_ARCH}' >>${PLIST_SRC}
 
diff --git a/cross/COMMON/patches-egcs/patch-ab b/cross/COMMON/patches-egcs/patch-ab
new file mode 100644
index 00000000000..61bf2d78f51
--- /dev/null
+++ b/cross/COMMON/patches-egcs/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 1999/01/06 01:14:21 tv Exp $
+
+--- gcc/objc/Make-lang.in.orig	Tue Jan  5 19:01:14 1999
++++ gcc/objc/Make-lang.in	Tue Jan  5 19:01:28 1999
+@@ -50,8 +50,8 @@
+ 
+ #
+ # Define the names for selecting Objective-C in LANGUAGES.
+-OBJC objc: cc1obj$(exeext) objc-runtime
+-OBJECTIVE-C objective-c: cc1obj$(exeext) objc-runtime
++OBJC objc: cc1obj$(exeext)
++OBJECTIVE-C objective-c: cc1obj$(exeext)
+ 
+ # Tell GNU make to ignore these if they exist.
+ .PHONY: objective-c objc ObjC