summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2017-04-17 19:45:02 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2017-04-17 19:45:02 +0000
commitd047aa3ca2ece0747e939d4fd26e954354148311 (patch)
tree7e2918338e82d62bc5ccb1c1dff0bb8eb3f125c3
parent4f2b4552387f6cc79aa67ba6e8e9ea120ede017f (diff)
create a gross mechanism that can handle gcc-only, clang-only,
and gcc+clang architectures with kettenis
-rw-r--r--distrib/sets/checkflist8
-rw-r--r--distrib/sets/lists/base/md.alpha2
-rw-r--r--distrib/sets/lists/base/md.amd644
-rw-r--r--distrib/sets/lists/base/md.armv72
-rw-r--r--distrib/sets/lists/base/md.hppa2
-rw-r--r--distrib/sets/lists/base/md.i3864
-rw-r--r--distrib/sets/lists/base/md.landisk2
-rw-r--r--distrib/sets/lists/base/md.loongson2
-rw-r--r--distrib/sets/lists/base/md.luna88k2
-rw-r--r--distrib/sets/lists/base/md.macppc2
-rw-r--r--distrib/sets/lists/base/md.octeon2
-rw-r--r--distrib/sets/lists/base/md.sgi2
-rw-r--r--distrib/sets/lists/base/md.socppc2
-rw-r--r--distrib/sets/lists/base/md.sparc642
-rw-r--r--distrib/sets/lists/base/mi2
-rw-r--r--distrib/sets/lists/comp/clang.amd64230
-rw-r--r--distrib/sets/lists/comp/clang.i386230
-rw-r--r--distrib/sets/lists/comp/gcc.alpha79
-rw-r--r--distrib/sets/lists/comp/gcc.amd6479
-rw-r--r--distrib/sets/lists/comp/gcc.armv779
-rw-r--r--distrib/sets/lists/comp/gcc.hppa79
-rw-r--r--distrib/sets/lists/comp/gcc.i38679
-rw-r--r--distrib/sets/lists/comp/gcc.landisk79
-rw-r--r--distrib/sets/lists/comp/gcc.loongson79
-rw-r--r--distrib/sets/lists/comp/gcc.luna88k79
-rw-r--r--distrib/sets/lists/comp/gcc.macppc79
-rw-r--r--distrib/sets/lists/comp/gcc.octeon79
-rw-r--r--distrib/sets/lists/comp/gcc.sgi79
-rw-r--r--distrib/sets/lists/comp/gcc.socppc79
-rw-r--r--distrib/sets/lists/comp/gcc.sparc6479
-rw-r--r--distrib/sets/lists/comp/md.amd644
-rw-r--r--distrib/sets/lists/comp/md.i3864
-rw-r--r--distrib/sets/lists/comp/mi71
-rw-r--r--distrib/sets/lists/man/mi11
-rw-r--r--distrib/sets/maketars11
35 files changed, 1542 insertions, 86 deletions
diff --git a/distrib/sets/checkflist b/distrib/sets/checkflist
index 9536d97bc67..d14365d638f 100644
--- a/distrib/sets/checkflist
+++ b/distrib/sets/checkflist
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: checkflist,v 1.12 2014/08/26 20:19:26 rpe Exp $
+# $OpenBSD: checkflist,v 1.13 2017/04/17 19:44:59 deraadt Exp $
#
# Copyright (c) 2001 Theo de Raadt
# All rights reserved.
@@ -38,6 +38,12 @@ arch=`machine`
for i in base comp etc game man; do
cat ./lists/$i/mi ./lists/$i/md.${arch}
+ if [ $i = comp ]; then
+ [ -f ./lists/comp/gcc.${arch} ] && \
+ cat ./lists/comp/gcc.${arch}
+ [ -f ./lists/comp/clang.${arch} ] && \
+ cat ./lists/comp/clang.${arch}
+ fi
done | sort >$TMP1
( cd $DESTDIR ; find . \( -type d -o -type f -o -type l \) ) | \
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index de2d874ae4b..018eb865dbe 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -508,3 +508,5 @@
./usr/share/misc/pcvtfonts/vt220l.810
./usr/share/misc/pcvtfonts/vt220l.814
./usr/share/misc/pcvtfonts/vt220l.816
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 6f3047af9e3..244f2edae58 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -528,3 +528,7 @@
./usr/share/misc/pcvtfonts/vt220l.810
./usr/share/misc/pcvtfonts/vt220l.814
./usr/share/misc/pcvtfonts/vt220l.816
+./usr/lib/libc++.so.0.0
+./usr/lib/libc++abi.so.0.0
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index dbdb63f5014..16710b51e89 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -449,3 +449,5 @@
./usr/sbin/hotplugd
./usr/sbin/mkuboot
./usr/sbin/wsconscfg
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 390f1418bc6..1b2202ddf59 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -488,3 +488,5 @@
./usr/sbin/pcidump
./usr/sbin/wsconscfg
./usr/sbin/wsfontload
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 5ee038bc376..fac46ef66ed 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -528,3 +528,7 @@
./usr/share/misc/pcvtfonts/vt220l.810
./usr/share/misc/pcvtfonts/vt220l.814
./usr/share/misc/pcvtfonts/vt220l.816
+./usr/lib/libc++.so.0.0
+./usr/lib/libc++abi.so.0.0
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 790527cd162..0c9d313c873 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -449,3 +449,5 @@
./usr/sbin/hotplugd
./usr/sbin/pcidump
./usr/sbin/wsconscfg
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index b5648494d79..eb80d8d0cb3 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -458,3 +458,5 @@
./usr/sbin/wsconscfg
./usr/sbin/wsfontload
./usr/sbin/zzz
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index ce72dd2777e..6077377d604 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -416,3 +416,5 @@
./usr/local/libdata/perl5/site_perl/m88k-openbsd
./usr/mdec/boot
./usr/sbin/wsconscfg
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index d4b13f2ef78..484e207e4bb 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -491,3 +491,5 @@
./usr/sbin/pcidump
./usr/sbin/wsconscfg
./usr/sbin/zzz
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 156fc183722..013237a3c89 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -448,3 +448,5 @@
./usr/local/libdata/perl5/site_perl/mips64-openbsd
./usr/sbin/eeprom
./usr/sbin/pcidump
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index b57ad749587..7385f6b0226 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -490,3 +490,5 @@
./usr/sbin/hotplugd
./usr/sbin/pcidump
./usr/sbin/wsconscfg
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 4759567019b..50710077d54 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -478,3 +478,5 @@
./usr/sbin/hotplugd
./usr/sbin/pcidump
./usr/sbin/wsconscfg
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index c31265388c9..8d663f2ca10 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -495,3 +495,5 @@
./usr/sbin/pcidump
./usr/sbin/wsconscfg
./usr/sbin/zzz
+./usr/lib/libstdc++.so.57.0
+./usr/lib/libobjc.so.6.0
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index f3112ee05a0..07ac8bdf5eb 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -631,7 +631,6 @@
./usr/lib/libmenuw.so.6.0
./usr/lib/libncurses.so.14.0
./usr/lib/libncursesw.so.14.0
-./usr/lib/libobjc.so.6.0
./usr/lib/libossaudio.so.4.0
./usr/lib/libpanel.so.6.0
./usr/lib/libpanelw.so.6.0
@@ -644,7 +643,6 @@
./usr/lib/libskey.so.6.0
./usr/lib/libsndio.so.6.1
./usr/lib/libssl.so.43.2
-./usr/lib/libstdc++.so.57.0
./usr/lib/libtermcap.so.14.0
./usr/lib/libtermlib.so.14.0
./usr/lib/libtls.so.15.5
diff --git a/distrib/sets/lists/comp/clang.amd64 b/distrib/sets/lists/comp/clang.amd64
new file mode 100644
index 00000000000..a9a6c8fded4
--- /dev/null
+++ b/distrib/sets/lists/comp/clang.amd64
@@ -0,0 +1,230 @@
+./usr/include/c++
+./usr/include/c++/v1
+./usr/include/c++/v1/__bit_reference
+./usr/include/c++/v1/__bsd_locale_defaults.h
+./usr/include/c++/v1/__bsd_locale_fallbacks.h
+./usr/include/c++/v1/__config
+./usr/include/c++/v1/__cxxabi_config.h
+./usr/include/c++/v1/__debug
+./usr/include/c++/v1/__functional_03
+./usr/include/c++/v1/__functional_base
+./usr/include/c++/v1/__functional_base_03
+./usr/include/c++/v1/__hash_table
+./usr/include/c++/v1/__libunwind_config.h
+./usr/include/c++/v1/__locale
+./usr/include/c++/v1/__mutex_base
+./usr/include/c++/v1/__nullptr
+./usr/include/c++/v1/__refstring
+./usr/include/c++/v1/__split_buffer
+./usr/include/c++/v1/__sso_allocator
+./usr/include/c++/v1/__std_stream
+./usr/include/c++/v1/__threading_support
+./usr/include/c++/v1/__tree
+./usr/include/c++/v1/__tuple
+./usr/include/c++/v1/__undef___deallocate
+./usr/include/c++/v1/__undef_min_max
+./usr/include/c++/v1/algorithm
+./usr/include/c++/v1/array
+./usr/include/c++/v1/atomic
+./usr/include/c++/v1/bitset
+./usr/include/c++/v1/cassert
+./usr/include/c++/v1/ccomplex
+./usr/include/c++/v1/cctype
+./usr/include/c++/v1/cerrno
+./usr/include/c++/v1/cfenv
+./usr/include/c++/v1/cfloat
+./usr/include/c++/v1/chrono
+./usr/include/c++/v1/cinttypes
+./usr/include/c++/v1/ciso646
+./usr/include/c++/v1/climits
+./usr/include/c++/v1/clocale
+./usr/include/c++/v1/cmath
+./usr/include/c++/v1/codecvt
+./usr/include/c++/v1/complex
+./usr/include/c++/v1/complex.h
+./usr/include/c++/v1/condition_variable
+./usr/include/c++/v1/csetjmp
+./usr/include/c++/v1/csignal
+./usr/include/c++/v1/cstdarg
+./usr/include/c++/v1/cstdbool
+./usr/include/c++/v1/cstddef
+./usr/include/c++/v1/cstdint
+./usr/include/c++/v1/cstdio
+./usr/include/c++/v1/cstdlib
+./usr/include/c++/v1/cstring
+./usr/include/c++/v1/ctgmath
+./usr/include/c++/v1/ctime
+./usr/include/c++/v1/ctype.h
+./usr/include/c++/v1/cwchar
+./usr/include/c++/v1/cwctype
+./usr/include/c++/v1/cxxabi.h
+./usr/include/c++/v1/deque
+./usr/include/c++/v1/errno.h
+./usr/include/c++/v1/exception
+./usr/include/c++/v1/experimental
+./usr/include/c++/v1/experimental/__config
+./usr/include/c++/v1/experimental/__memory
+./usr/include/c++/v1/experimental/algorithm
+./usr/include/c++/v1/experimental/any
+./usr/include/c++/v1/experimental/chrono
+./usr/include/c++/v1/experimental/deque
+./usr/include/c++/v1/experimental/dynarray
+./usr/include/c++/v1/experimental/filesystem
+./usr/include/c++/v1/experimental/forward_list
+./usr/include/c++/v1/experimental/functional
+./usr/include/c++/v1/experimental/iterator
+./usr/include/c++/v1/experimental/list
+./usr/include/c++/v1/experimental/map
+./usr/include/c++/v1/experimental/memory_resource
+./usr/include/c++/v1/experimental/optional
+./usr/include/c++/v1/experimental/propagate_const
+./usr/include/c++/v1/experimental/ratio
+./usr/include/c++/v1/experimental/regex
+./usr/include/c++/v1/experimental/set
+./usr/include/c++/v1/experimental/string
+./usr/include/c++/v1/experimental/string_view
+./usr/include/c++/v1/experimental/system_error
+./usr/include/c++/v1/experimental/tuple
+./usr/include/c++/v1/experimental/type_traits
+./usr/include/c++/v1/experimental/unordered_map
+./usr/include/c++/v1/experimental/unordered_set
+./usr/include/c++/v1/experimental/utility
+./usr/include/c++/v1/experimental/vector
+./usr/include/c++/v1/ext
+./usr/include/c++/v1/ext/__hash
+./usr/include/c++/v1/ext/hash_map
+./usr/include/c++/v1/ext/hash_set
+./usr/include/c++/v1/float.h
+./usr/include/c++/v1/forward_list
+./usr/include/c++/v1/fstream
+./usr/include/c++/v1/functional
+./usr/include/c++/v1/future
+./usr/include/c++/v1/initializer_list
+./usr/include/c++/v1/inttypes.h
+./usr/include/c++/v1/iomanip
+./usr/include/c++/v1/ios
+./usr/include/c++/v1/iosfwd
+./usr/include/c++/v1/iostream
+./usr/include/c++/v1/istream
+./usr/include/c++/v1/iterator
+./usr/include/c++/v1/libunwind.h
+./usr/include/c++/v1/limits
+./usr/include/c++/v1/list
+./usr/include/c++/v1/locale
+./usr/include/c++/v1/mach-o
+./usr/include/c++/v1/mach-o/compact_unwind_encoding.h
+./usr/include/c++/v1/map
+./usr/include/c++/v1/math.h
+./usr/include/c++/v1/memory
+./usr/include/c++/v1/mutex
+./usr/include/c++/v1/new
+./usr/include/c++/v1/numeric
+./usr/include/c++/v1/ostream
+./usr/include/c++/v1/queue
+./usr/include/c++/v1/random
+./usr/include/c++/v1/ratio
+./usr/include/c++/v1/regex
+./usr/include/c++/v1/scoped_allocator
+./usr/include/c++/v1/set
+./usr/include/c++/v1/setjmp.h
+./usr/include/c++/v1/shared_mutex
+./usr/include/c++/v1/sstream
+./usr/include/c++/v1/stack
+./usr/include/c++/v1/stdbool.h
+./usr/include/c++/v1/stddef.h
+./usr/include/c++/v1/stdexcept
+./usr/include/c++/v1/stdio.h
+./usr/include/c++/v1/stdlib.h
+./usr/include/c++/v1/streambuf
+./usr/include/c++/v1/string
+./usr/include/c++/v1/string.h
+./usr/include/c++/v1/strstream
+./usr/include/c++/v1/support
+./usr/include/c++/v1/support/newlib
+./usr/include/c++/v1/support/newlib/xlocale.h
+./usr/include/c++/v1/support/xlocale
+./usr/include/c++/v1/support/xlocale/__nop_locale_mgmt.h
+./usr/include/c++/v1/support/xlocale/__posix_l_fallback.h
+./usr/include/c++/v1/support/xlocale/__strtonum_fallback.h
+./usr/include/c++/v1/support/xlocale/xlocale.h
+./usr/include/c++/v1/system_error
+./usr/include/c++/v1/tgmath.h
+./usr/include/c++/v1/thread
+./usr/include/c++/v1/tuple
+./usr/include/c++/v1/type_traits
+./usr/include/c++/v1/typeindex
+./usr/include/c++/v1/typeinfo
+./usr/include/c++/v1/unordered_map
+./usr/include/c++/v1/unordered_set
+./usr/include/c++/v1/unwind.h
+./usr/include/c++/v1/utility
+./usr/include/c++/v1/valarray
+./usr/include/c++/v1/vector
+./usr/include/c++/v1/wchar.h
+./usr/include/c++/v1/wctype.h
+./usr/lib/clang
+./usr/lib/clang/4.0.0
+./usr/lib/clang/4.0.0/include
+./usr/lib/clang/4.0.0/include/__wmmintrin_aes.h
+./usr/lib/clang/4.0.0/include/__wmmintrin_pclmul.h
+./usr/lib/clang/4.0.0/include/adxintrin.h
+./usr/lib/clang/4.0.0/include/ammintrin.h
+./usr/lib/clang/4.0.0/include/avx2intrin.h
+./usr/lib/clang/4.0.0/include/avx512bwintrin.h
+./usr/lib/clang/4.0.0/include/avx512cdintrin.h
+./usr/lib/clang/4.0.0/include/avx512dqintrin.h
+./usr/lib/clang/4.0.0/include/avx512erintrin.h
+./usr/lib/clang/4.0.0/include/avx512fintrin.h
+./usr/lib/clang/4.0.0/include/avx512vlbwintrin.h
+./usr/lib/clang/4.0.0/include/avx512vldqintrin.h
+./usr/lib/clang/4.0.0/include/avx512vlintrin.h
+./usr/lib/clang/4.0.0/include/avxintrin.h
+./usr/lib/clang/4.0.0/include/bmi2intrin.h
+./usr/lib/clang/4.0.0/include/bmiintrin.h
+./usr/lib/clang/4.0.0/include/cpuid.h
+./usr/lib/clang/4.0.0/include/emmintrin.h
+./usr/lib/clang/4.0.0/include/f16cintrin.h
+./usr/lib/clang/4.0.0/include/fma4intrin.h
+./usr/lib/clang/4.0.0/include/fmaintrin.h
+./usr/lib/clang/4.0.0/include/fxsrintrin.h
+./usr/lib/clang/4.0.0/include/ia32intrin.h
+./usr/lib/clang/4.0.0/include/immintrin.h
+./usr/lib/clang/4.0.0/include/lzcntintrin.h
+./usr/lib/clang/4.0.0/include/mm3dnow.h
+./usr/lib/clang/4.0.0/include/mm_malloc.h
+./usr/lib/clang/4.0.0/include/mmintrin.h
+./usr/lib/clang/4.0.0/include/module.modulemap
+./usr/lib/clang/4.0.0/include/nmmintrin.h
+./usr/lib/clang/4.0.0/include/pkuintrin.h
+./usr/lib/clang/4.0.0/include/pmmintrin.h
+./usr/lib/clang/4.0.0/include/popcntintrin.h
+./usr/lib/clang/4.0.0/include/prfchwintrin.h
+./usr/lib/clang/4.0.0/include/rdseedintrin.h
+./usr/lib/clang/4.0.0/include/rtmintrin.h
+./usr/lib/clang/4.0.0/include/shaintrin.h
+./usr/lib/clang/4.0.0/include/smmintrin.h
+./usr/lib/clang/4.0.0/include/stdalign.h
+./usr/lib/clang/4.0.0/include/stdatomic.h
+./usr/lib/clang/4.0.0/include/stdnoreturn.h
+./usr/lib/clang/4.0.0/include/tbmintrin.h
+./usr/lib/clang/4.0.0/include/tgmath.h
+./usr/lib/clang/4.0.0/include/tmmintrin.h
+./usr/lib/clang/4.0.0/include/unwind.h
+./usr/lib/clang/4.0.0/include/varargs.h
+./usr/lib/clang/4.0.0/include/wmmintrin.h
+./usr/lib/clang/4.0.0/include/x86intrin.h
+./usr/lib/clang/4.0.0/include/xmmintrin.h
+./usr/lib/clang/4.0.0/include/xopintrin.h
+./usr/lib/clang/4.0.0/include/xsavecintrin.h
+./usr/lib/clang/4.0.0/include/xsaveintrin.h
+./usr/lib/clang/4.0.0/include/xsaveoptintrin.h
+./usr/lib/clang/4.0.0/include/xsavesintrin.h
+./usr/lib/clang/4.0.0/include/xtestintrin.h
+./usr/share/man/man1/clang++.1
+./usr/share/man/man1/clang-cpp.1
+./usr/share/man/man1/clang.1
+./usr/lib/libc++.a
+./usr/lib/libc++_p.a
+./usr/lib/libc++abi.a
+./usr/lib/libc++abi_p.a
+./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/comp/clang.i386 b/distrib/sets/lists/comp/clang.i386
new file mode 100644
index 00000000000..a9a6c8fded4
--- /dev/null
+++ b/distrib/sets/lists/comp/clang.i386
@@ -0,0 +1,230 @@
+./usr/include/c++
+./usr/include/c++/v1
+./usr/include/c++/v1/__bit_reference
+./usr/include/c++/v1/__bsd_locale_defaults.h
+./usr/include/c++/v1/__bsd_locale_fallbacks.h
+./usr/include/c++/v1/__config
+./usr/include/c++/v1/__cxxabi_config.h
+./usr/include/c++/v1/__debug
+./usr/include/c++/v1/__functional_03
+./usr/include/c++/v1/__functional_base
+./usr/include/c++/v1/__functional_base_03
+./usr/include/c++/v1/__hash_table
+./usr/include/c++/v1/__libunwind_config.h
+./usr/include/c++/v1/__locale
+./usr/include/c++/v1/__mutex_base
+./usr/include/c++/v1/__nullptr
+./usr/include/c++/v1/__refstring
+./usr/include/c++/v1/__split_buffer
+./usr/include/c++/v1/__sso_allocator
+./usr/include/c++/v1/__std_stream
+./usr/include/c++/v1/__threading_support
+./usr/include/c++/v1/__tree
+./usr/include/c++/v1/__tuple
+./usr/include/c++/v1/__undef___deallocate
+./usr/include/c++/v1/__undef_min_max
+./usr/include/c++/v1/algorithm
+./usr/include/c++/v1/array
+./usr/include/c++/v1/atomic
+./usr/include/c++/v1/bitset
+./usr/include/c++/v1/cassert
+./usr/include/c++/v1/ccomplex
+./usr/include/c++/v1/cctype
+./usr/include/c++/v1/cerrno
+./usr/include/c++/v1/cfenv
+./usr/include/c++/v1/cfloat
+./usr/include/c++/v1/chrono
+./usr/include/c++/v1/cinttypes
+./usr/include/c++/v1/ciso646
+./usr/include/c++/v1/climits
+./usr/include/c++/v1/clocale
+./usr/include/c++/v1/cmath
+./usr/include/c++/v1/codecvt
+./usr/include/c++/v1/complex
+./usr/include/c++/v1/complex.h
+./usr/include/c++/v1/condition_variable
+./usr/include/c++/v1/csetjmp
+./usr/include/c++/v1/csignal
+./usr/include/c++/v1/cstdarg
+./usr/include/c++/v1/cstdbool
+./usr/include/c++/v1/cstddef
+./usr/include/c++/v1/cstdint
+./usr/include/c++/v1/cstdio
+./usr/include/c++/v1/cstdlib
+./usr/include/c++/v1/cstring
+./usr/include/c++/v1/ctgmath
+./usr/include/c++/v1/ctime
+./usr/include/c++/v1/ctype.h
+./usr/include/c++/v1/cwchar
+./usr/include/c++/v1/cwctype
+./usr/include/c++/v1/cxxabi.h
+./usr/include/c++/v1/deque
+./usr/include/c++/v1/errno.h
+./usr/include/c++/v1/exception
+./usr/include/c++/v1/experimental
+./usr/include/c++/v1/experimental/__config
+./usr/include/c++/v1/experimental/__memory
+./usr/include/c++/v1/experimental/algorithm
+./usr/include/c++/v1/experimental/any
+./usr/include/c++/v1/experimental/chrono
+./usr/include/c++/v1/experimental/deque
+./usr/include/c++/v1/experimental/dynarray
+./usr/include/c++/v1/experimental/filesystem
+./usr/include/c++/v1/experimental/forward_list
+./usr/include/c++/v1/experimental/functional
+./usr/include/c++/v1/experimental/iterator
+./usr/include/c++/v1/experimental/list
+./usr/include/c++/v1/experimental/map
+./usr/include/c++/v1/experimental/memory_resource
+./usr/include/c++/v1/experimental/optional
+./usr/include/c++/v1/experimental/propagate_const
+./usr/include/c++/v1/experimental/ratio
+./usr/include/c++/v1/experimental/regex
+./usr/include/c++/v1/experimental/set
+./usr/include/c++/v1/experimental/string
+./usr/include/c++/v1/experimental/string_view
+./usr/include/c++/v1/experimental/system_error
+./usr/include/c++/v1/experimental/tuple
+./usr/include/c++/v1/experimental/type_traits
+./usr/include/c++/v1/experimental/unordered_map
+./usr/include/c++/v1/experimental/unordered_set
+./usr/include/c++/v1/experimental/utility
+./usr/include/c++/v1/experimental/vector
+./usr/include/c++/v1/ext
+./usr/include/c++/v1/ext/__hash
+./usr/include/c++/v1/ext/hash_map
+./usr/include/c++/v1/ext/hash_set
+./usr/include/c++/v1/float.h
+./usr/include/c++/v1/forward_list
+./usr/include/c++/v1/fstream
+./usr/include/c++/v1/functional
+./usr/include/c++/v1/future
+./usr/include/c++/v1/initializer_list
+./usr/include/c++/v1/inttypes.h
+./usr/include/c++/v1/iomanip
+./usr/include/c++/v1/ios
+./usr/include/c++/v1/iosfwd
+./usr/include/c++/v1/iostream
+./usr/include/c++/v1/istream
+./usr/include/c++/v1/iterator
+./usr/include/c++/v1/libunwind.h
+./usr/include/c++/v1/limits
+./usr/include/c++/v1/list
+./usr/include/c++/v1/locale
+./usr/include/c++/v1/mach-o
+./usr/include/c++/v1/mach-o/compact_unwind_encoding.h
+./usr/include/c++/v1/map
+./usr/include/c++/v1/math.h
+./usr/include/c++/v1/memory
+./usr/include/c++/v1/mutex
+./usr/include/c++/v1/new
+./usr/include/c++/v1/numeric
+./usr/include/c++/v1/ostream
+./usr/include/c++/v1/queue
+./usr/include/c++/v1/random
+./usr/include/c++/v1/ratio
+./usr/include/c++/v1/regex
+./usr/include/c++/v1/scoped_allocator
+./usr/include/c++/v1/set
+./usr/include/c++/v1/setjmp.h
+./usr/include/c++/v1/shared_mutex
+./usr/include/c++/v1/sstream
+./usr/include/c++/v1/stack
+./usr/include/c++/v1/stdbool.h
+./usr/include/c++/v1/stddef.h
+./usr/include/c++/v1/stdexcept
+./usr/include/c++/v1/stdio.h
+./usr/include/c++/v1/stdlib.h
+./usr/include/c++/v1/streambuf
+./usr/include/c++/v1/string
+./usr/include/c++/v1/string.h
+./usr/include/c++/v1/strstream
+./usr/include/c++/v1/support
+./usr/include/c++/v1/support/newlib
+./usr/include/c++/v1/support/newlib/xlocale.h
+./usr/include/c++/v1/support/xlocale
+./usr/include/c++/v1/support/xlocale/__nop_locale_mgmt.h
+./usr/include/c++/v1/support/xlocale/__posix_l_fallback.h
+./usr/include/c++/v1/support/xlocale/__strtonum_fallback.h
+./usr/include/c++/v1/support/xlocale/xlocale.h
+./usr/include/c++/v1/system_error
+./usr/include/c++/v1/tgmath.h
+./usr/include/c++/v1/thread
+./usr/include/c++/v1/tuple
+./usr/include/c++/v1/type_traits
+./usr/include/c++/v1/typeindex
+./usr/include/c++/v1/typeinfo
+./usr/include/c++/v1/unordered_map
+./usr/include/c++/v1/unordered_set
+./usr/include/c++/v1/unwind.h
+./usr/include/c++/v1/utility
+./usr/include/c++/v1/valarray
+./usr/include/c++/v1/vector
+./usr/include/c++/v1/wchar.h
+./usr/include/c++/v1/wctype.h
+./usr/lib/clang
+./usr/lib/clang/4.0.0
+./usr/lib/clang/4.0.0/include
+./usr/lib/clang/4.0.0/include/__wmmintrin_aes.h
+./usr/lib/clang/4.0.0/include/__wmmintrin_pclmul.h
+./usr/lib/clang/4.0.0/include/adxintrin.h
+./usr/lib/clang/4.0.0/include/ammintrin.h
+./usr/lib/clang/4.0.0/include/avx2intrin.h
+./usr/lib/clang/4.0.0/include/avx512bwintrin.h
+./usr/lib/clang/4.0.0/include/avx512cdintrin.h
+./usr/lib/clang/4.0.0/include/avx512dqintrin.h
+./usr/lib/clang/4.0.0/include/avx512erintrin.h
+./usr/lib/clang/4.0.0/include/avx512fintrin.h
+./usr/lib/clang/4.0.0/include/avx512vlbwintrin.h
+./usr/lib/clang/4.0.0/include/avx512vldqintrin.h
+./usr/lib/clang/4.0.0/include/avx512vlintrin.h
+./usr/lib/clang/4.0.0/include/avxintrin.h
+./usr/lib/clang/4.0.0/include/bmi2intrin.h
+./usr/lib/clang/4.0.0/include/bmiintrin.h
+./usr/lib/clang/4.0.0/include/cpuid.h
+./usr/lib/clang/4.0.0/include/emmintrin.h
+./usr/lib/clang/4.0.0/include/f16cintrin.h
+./usr/lib/clang/4.0.0/include/fma4intrin.h
+./usr/lib/clang/4.0.0/include/fmaintrin.h
+./usr/lib/clang/4.0.0/include/fxsrintrin.h
+./usr/lib/clang/4.0.0/include/ia32intrin.h
+./usr/lib/clang/4.0.0/include/immintrin.h
+./usr/lib/clang/4.0.0/include/lzcntintrin.h
+./usr/lib/clang/4.0.0/include/mm3dnow.h
+./usr/lib/clang/4.0.0/include/mm_malloc.h
+./usr/lib/clang/4.0.0/include/mmintrin.h
+./usr/lib/clang/4.0.0/include/module.modulemap
+./usr/lib/clang/4.0.0/include/nmmintrin.h
+./usr/lib/clang/4.0.0/include/pkuintrin.h
+./usr/lib/clang/4.0.0/include/pmmintrin.h
+./usr/lib/clang/4.0.0/include/popcntintrin.h
+./usr/lib/clang/4.0.0/include/prfchwintrin.h
+./usr/lib/clang/4.0.0/include/rdseedintrin.h
+./usr/lib/clang/4.0.0/include/rtmintrin.h
+./usr/lib/clang/4.0.0/include/shaintrin.h
+./usr/lib/clang/4.0.0/include/smmintrin.h
+./usr/lib/clang/4.0.0/include/stdalign.h
+./usr/lib/clang/4.0.0/include/stdatomic.h
+./usr/lib/clang/4.0.0/include/stdnoreturn.h
+./usr/lib/clang/4.0.0/include/tbmintrin.h
+./usr/lib/clang/4.0.0/include/tgmath.h
+./usr/lib/clang/4.0.0/include/tmmintrin.h
+./usr/lib/clang/4.0.0/include/unwind.h
+./usr/lib/clang/4.0.0/include/varargs.h
+./usr/lib/clang/4.0.0/include/wmmintrin.h
+./usr/lib/clang/4.0.0/include/x86intrin.h
+./usr/lib/clang/4.0.0/include/xmmintrin.h
+./usr/lib/clang/4.0.0/include/xopintrin.h
+./usr/lib/clang/4.0.0/include/xsavecintrin.h
+./usr/lib/clang/4.0.0/include/xsaveintrin.h
+./usr/lib/clang/4.0.0/include/xsaveoptintrin.h
+./usr/lib/clang/4.0.0/include/xsavesintrin.h
+./usr/lib/clang/4.0.0/include/xtestintrin.h
+./usr/share/man/man1/clang++.1
+./usr/share/man/man1/clang-cpp.1
+./usr/share/man/man1/clang.1
+./usr/lib/libc++.a
+./usr/lib/libc++_p.a
+./usr/lib/libc++abi.a
+./usr/lib/libc++abi_p.a
+./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/comp/gcc.alpha b/distrib/sets/lists/comp/gcc.alpha
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.alpha
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.amd64 b/distrib/sets/lists/comp/gcc.amd64
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.amd64
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.armv7 b/distrib/sets/lists/comp/gcc.armv7
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.armv7
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.hppa b/distrib/sets/lists/comp/gcc.hppa
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.hppa
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.i386 b/distrib/sets/lists/comp/gcc.i386
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.i386
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.landisk b/distrib/sets/lists/comp/gcc.landisk
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.landisk
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.loongson b/distrib/sets/lists/comp/gcc.loongson
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.loongson
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.luna88k b/distrib/sets/lists/comp/gcc.luna88k
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.luna88k
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.macppc b/distrib/sets/lists/comp/gcc.macppc
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.macppc
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.octeon b/distrib/sets/lists/comp/gcc.octeon
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.octeon
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.sgi b/distrib/sets/lists/comp/gcc.sgi
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.sgi
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.socppc b/distrib/sets/lists/comp/gcc.socppc
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.socppc
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/gcc.sparc64 b/distrib/sets/lists/comp/gcc.sparc64
new file mode 100644
index 00000000000..2ac3eb0c8fd
--- /dev/null
+++ b/distrib/sets/lists/comp/gcc.sparc64
@@ -0,0 +1,79 @@
+./usr/bin/as
+./usr/bin/gcov
+./usr/bin/gdb
+./usr/share/info/gcc.info
+./usr/share/info/gccint.info
+./usr/share/info/gdb.info
+./usr/share/info/gdbint.info
+./usr/share/info/annotate.info
+./usr/share/info/as.info
+./usr/share/info/cpp.info
+./usr/share/info/cppinternals.info
+./usr/share/info/ld.info
+./usr/share/info/stabs.info
+./usr/bin/gcc
+./usr/bin/g++
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/lib/libstdc++.a
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/include/g++/algorithm
+./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++/deque
+./usr/include/g++/exception
+./usr/include/g++/fstream
+./usr/include/g++/functional
+./usr/include/g++/iomanip
+./usr/include/g++/iosfwd
+./usr/include/g++/iostream
+./usr/include/g++/iterator
+./usr/include/g++/list
+./usr/include/g++/map
+./usr/include/g++/memory
+./usr/include/g++/new
+./usr/include/g++/numeric
+./usr/include/g++/queue
+./usr/include/g++/set
+./usr/include/g++/sstream
+./usr/include/g++/stack
+./usr/include/g++/stdexcept
+./usr/include/g++/string
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/valarray
+./usr/include/g++/vector
+./usr/lib/gcc-lib
+./usr/share/man/man1/gcc.1
+./usr/share/man/man1/gcov.1
+./usr/share/man/man1/gdb.1
+./usr/share/man/man1/as.1
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index bfba0eac2fe..bac3f7603f8 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -693,3 +693,7 @@
./usr/libdata/ldscripts/elf_x86_64_obsd.xw
./usr/libdata/ldscripts/elf_x86_64_obsd.xz
./usr/share/info/bfd.info
+./usr/bin/clang
+./usr/bin/clang++
+./usr/bin/clang-cpp
+./usr/bin/ld.lld
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 621a75a78cd..f3f107938a2 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -663,3 +663,7 @@
./usr/libdata/ldscripts/elf_i386_obsd.xw
./usr/libdata/ldscripts/elf_i386_obsd.xz
./usr/share/info/bfd.info
+./usr/bin/clang
+./usr/bin/clang++
+./usr/bin/clang-cpp
+./usr/bin/ld.lld
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 83416dd5694..6a4a95c336e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,14 +1,9 @@
./sys
-./usr/bin/as
./usr/bin/c++
./usr/bin/c++filt
./usr/bin/cpp
./usr/bin/flex
./usr/bin/flex++
-./usr/bin/g++
-./usr/bin/gcc
-./usr/bin/gcov
-./usr/bin/gdb
./usr/bin/gprof
./usr/bin/lex
./usr/bin/libtool
@@ -851,51 +846,6 @@
./usr/include/fuse_opt.h
./usr/include/g++
./usr/include/g++/FlexLexer.h
-./usr/include/g++/algorithm
-./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++/deque
-./usr/include/g++/exception
-./usr/include/g++/fstream
-./usr/include/g++/functional
-./usr/include/g++/iomanip
-./usr/include/g++/iosfwd
-./usr/include/g++/iostream
-./usr/include/g++/iterator
-./usr/include/g++/list
-./usr/include/g++/map
-./usr/include/g++/memory
-./usr/include/g++/new
-./usr/include/g++/numeric
-./usr/include/g++/queue
-./usr/include/g++/set
-./usr/include/g++/sstream
-./usr/include/g++/stack
-./usr/include/g++/std
-./usr/include/g++/stdexcept
-./usr/include/g++/string
-./usr/include/g++/typeinfo
-./usr/include/g++/utility
-./usr/include/g++/valarray
-./usr/include/g++/vector
./usr/include/getopt.h
./usr/include/glob.h
./usr/include/grp.h
@@ -1079,18 +1029,6 @@
./usr/include/ntfs/ntfs_subr.h
./usr/include/ntfs/ntfs_vfsops.h
./usr/include/ntfs/ntfsmount.h
-./usr/include/objc
-./usr/include/objc/NXConstStr.h
-./usr/include/objc/Object.h
-./usr/include/objc/Protocol.h
-./usr/include/objc/encoding.h
-./usr/include/objc/hash.h
-./usr/include/objc/objc-api.h
-./usr/include/objc/objc-list.h
-./usr/include/objc/objc.h
-./usr/include/objc/sarray.h
-./usr/include/objc/thr.h
-./usr/include/objc/typedstream.h
./usr/include/ohash.h
./usr/include/openssl
./usr/include/openssl/aes.h
@@ -1478,7 +1416,6 @@
./usr/include/zlib.h
./usr/lib/crt0.o
./usr/lib/debug
-./usr/lib/gcc-lib
./usr/lib/gcrt0.o
./usr/lib/libc.a
./usr/lib/libc_p.a
@@ -1518,8 +1455,6 @@
./usr/lib/libncurses_p.a
./usr/lib/libncursesw.a
./usr/lib/libncursesw_p.a
-./usr/lib/libobjc.a
-./usr/lib/libobjc_p.a
./usr/lib/libossaudio.a
./usr/lib/libossaudio_p.a
./usr/lib/libpanel.a
@@ -1543,7 +1478,6 @@
./usr/lib/libsndio_p.a
./usr/lib/libssl.a
./usr/lib/libssl_p.a
-./usr/lib/libstdc++.a
./usr/lib/libtermcap.a
./usr/lib/libtermcap_p.a
./usr/lib/libtermlib.a
@@ -1563,14 +1497,10 @@
./usr/sbin/kgmon
./usr/share/man/man1/addr2line.1
./usr/share/man/man1/ar.1
-./usr/share/man/man1/as.1
./usr/share/man/man1/c++filt.1
./usr/share/man/man1/clang-local.1
./usr/share/man/man1/flex.1
./usr/share/man/man1/gcc-local.1
-./usr/share/man/man1/gcc.1
-./usr/share/man/man1/gcov.1
-./usr/share/man/man1/gdb.1
./usr/share/man/man1/gprof.1
./usr/share/man/man1/ld.1
./usr/share/man/man1/libtool.1
@@ -2914,3 +2844,4 @@
./usr/share/misc/gprof.flat
./usr/share/misc/operator
./var/db/libc.tags
+./usr/share/info/binutils.info
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index c48831872ff..dde6443fcaf 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,24 +1,13 @@
./usr/share/doc/mg/tutorial
./usr/share/info/amdref.info
-./usr/share/info/annotate.info
-./usr/share/info/as.info
-./usr/share/info/binutils.info
-./usr/share/info/cpp.info
-./usr/share/info/cppinternals.info
./usr/share/info/cvs.info
./usr/share/info/cvsclient.info
./usr/share/info/dir
-./usr/share/info/gcc.info
-./usr/share/info/gccint.info
-./usr/share/info/gdb.info
-./usr/share/info/gdbint.info
./usr/share/info/history.info
./usr/share/info/info-stnd.info
./usr/share/info/info.info
-./usr/share/info/ld.info
./usr/share/info/libiberty.info
./usr/share/info/readline.info
-./usr/share/info/stabs.info
./usr/share/info/texinfo
./usr/share/man/man1/acme-client.1
./usr/share/man/man1/amd64/fdformat.1
diff --git a/distrib/sets/maketars b/distrib/sets/maketars
index f35955cb02a..b912d7b4423 100644
--- a/distrib/sets/maketars
+++ b/distrib/sets/maketars
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: maketars,v 1.25 2016/11/20 11:00:19 tb Exp $
+# $OpenBSD: maketars,v 1.26 2017/04/17 19:44:59 deraadt Exp $
#
# Copyright (c) 2001 Theo de Raadt
# All rights reserved.
@@ -55,7 +55,14 @@ cd $fsdir
for i in base comp game man; do
echo -n "$i: "
- sort ${lists}/$i/mi ${lists}/$i/md.${arch} > $TMP
+ cat ${lists}/$i/mi ${lists}/$i/md.${arch} > $TMP2
+ if [ $i = comp ]; then
+ [ -f ${lists}/$i/gcc.${arch} ] && \
+ cat ${lists}/$i/gcc.${arch} >> $TMP2
+ [ -f ${lists}/$i/clang.${arch} ] && \
+ cat ${lists}/$i/clang.${arch} >> $TMP2
+ fi
+ sort $TMP2 > $TMP
cat $TMP | grep '^./usr/lib/lib' > $TMP2
cat $TMP | grep -v '^./usr/lib/lib' >> $TMP2
cat $TMP2 | pax -w -d | gzip > ${tardir}/$i${RELEASE}.tgz