sync (a few comp tools move to base, to support library boot-randomization)

36 files changed, 88 insertions, 84 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 4613fb62b3c..0fef6889948 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -61,6 +61,11 @@
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.9
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/alpha-openbsd
 ./usr/libdata/perl5/alpha-openbsd/5.20.2
 ./usr/libdata/perl5/alpha-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index fdba1677a16..e387aa63ff3 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -67,6 +67,11 @@
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
 ./usr/bin/pctr
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.9
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/amd64-openbsd
 ./usr/libdata/perl5/amd64-openbsd/5.20.2
 ./usr/libdata/perl5/amd64-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index a09988bec9e..cbacd8e59b6 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -34,6 +34,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/arm-openbsd
 ./usr/libdata/perl5/arm-openbsd/5.20.2
 ./usr/libdata/perl5/arm-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index e7dc77454a0..8e6becbc5e9 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -29,6 +29,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/arm-openbsd
 ./usr/libdata/perl5/arm-openbsd/5.20.2
 ./usr/libdata/perl5/arm-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 79c31ae3079..91a8fe70aaf 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -63,6 +63,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.9
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/hppa-openbsd
 ./usr/libdata/perl5/hppa-openbsd/5.20.2
 ./usr/libdata/perl5/hppa-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 0fa73fe5663..ca17f432eb6 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1,3 +1,8 @@
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/4.2.1/specs
 ./etc/examples/wsconsctl.conf
 ./etc/firmware/3c990
 ./etc/firmware/3c990-license
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index cf6ca052de6..db57c19b4bd 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -69,6 +69,11 @@
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
 ./usr/bin/pctr
+./usr/lib/gcc-lib/i386-unknown-openbsd5.9
+./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/i386-openbsd
 ./usr/libdata/perl5/i386-openbsd/5.20.2
 ./usr/libdata/perl5/i386-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 8b9ea57a3c1..ce2f341526a 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -29,6 +29,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/sh-unknown-openbsd5.9
+./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/sh-openbsd
 ./usr/libdata/perl5/sh-openbsd/5.20.2
 ./usr/libdata/perl5/sh-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index c1a5f21b8a7..ee015dabc67 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -34,6 +34,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/mips64el-openbsd
 ./usr/libdata/perl5/mips64el-openbsd/5.20.2
 ./usr/libdata/perl5/mips64el-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index dc5709a94f3..4d79ce71bb9 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1,6 +1,10 @@
 ./etc/examples/wsconsctl.conf
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.9
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/libgcc.a
 ./usr/libdata/perl5/m88k-openbsd
 ./usr/libdata/perl5/m88k-openbsd/5.20.2
 ./usr/libdata/perl5/m88k-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 225f946c1b4..cdbc6a251f1 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -64,6 +64,11 @@
 ./sbin/kbd
 ./sbin/pdisk
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/powerpc-openbsd
 ./usr/libdata/perl5/powerpc-openbsd/5.20.2
 ./usr/libdata/perl5/powerpc-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 6f1b81e8cc8..ecbf7f07ab9 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1,4 +1,9 @@
 ./etc/examples/wsconsctl.conf
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/mips64-openbsd
 ./usr/libdata/perl5/mips64-openbsd/5.20.2
 ./usr/libdata/perl5/mips64-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 5a9a0a274c4..15a50360040 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -63,6 +63,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/mips64-openbsd
 ./usr/libdata/perl5/mips64-openbsd/5.20.2
 ./usr/libdata/perl5/mips64-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 3dac0194a83..e8530eadc31 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -57,6 +57,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/powerpc-openbsd
 ./usr/libdata/perl5/powerpc-openbsd/5.20.2
 ./usr/libdata/perl5/powerpc-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 0e6c73c64ac..bd8b193ba73 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -7,6 +7,11 @@
 ./etc/firmware/tigon2
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.9
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/site_perl/sparc-openbsd
 ./usr/libdata/perl5/site_perl/sparc-openbsd/_h2ph_pre.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/a.out.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index ae78170352e..a46820df03c 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -65,6 +65,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/_h2ph_pre.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/a.out.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 26d5ef4cacc..fecf3db9252 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -32,6 +32,11 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
 ./usr/libdata/perl5/arm-openbsd
 ./usr/libdata/perl5/arm-openbsd/5.20.2
 ./usr/libdata/perl5/arm-openbsd/5.20.2/.packlist
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index da8263f3118..cd7b152f6ba 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -302,6 +302,7 @@
 ./usr/bin/a2p
 ./usr/bin/apply
 ./usr/bin/apropos
+./usr/bin/ar
 ./usr/bin/arch
 ./usr/bin/at
 ./usr/bin/atq
@@ -322,6 +323,7 @@
 ./usr/bin/calendar
 ./usr/bin/cap_mkdb
 ./usr/bin/captoinfo
+./usr/bin/cc
 ./usr/bin/cdio
 ./usr/bin/chflags
 ./usr/bin/chfn
@@ -410,6 +412,7 @@
 ./usr/bin/lam
 ./usr/bin/last
 ./usr/bin/lastcomm
+./usr/bin/ld
 ./usr/bin/ldd
 ./usr/bin/leave
 ./usr/bin/less
@@ -608,6 +611,7 @@
 ./usr/include
 ./usr/lib
 ./usr/lib/libc.so.86.0
+./usr/lib/libc.so.86.0.a
 ./usr/lib/libcrypto.so.37.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 05c0f45b18c..35bd0068331 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -605,15 +605,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libalpha.a
 ./usr/lib/libalpha_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index f25e3bc5a9a..d63e16357ae 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -634,15 +634,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libamd64.a
 ./usr/lib/libamd64_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.armish b/distrib/sets/lists/comp/md.armish
index 0b8f54717f3..dfc74e1506c 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -647,15 +647,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.armv7 b/distrib/sets/lists/comp/md.armv7
index adce9ea6a7d..9cf6efec9b3 100644
--- a/distrib/sets/lists/comp/md.armv7
+++ b/distrib/sets/lists/comp/md.armv7
@@ -650,15 +650,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 7d3b3ef7607..8b0c12fda68 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -605,15 +605,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 03b9f92de2f..6e04a1ba6f7 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -208,7 +208,6 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/SYSCALLS.c.X
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/cc1
@@ -217,7 +216,6 @@
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/collect2
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/include
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/libgcc.a
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/specs
 ./usr/lib/libsupc++.a
 ./usr/libdata/ldscripts
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index dcae7cfaea6..c87d798cd03 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -635,15 +635,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libi386.a
 ./usr/lib/libi386_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk
index 116111da90d..36ee1dc6232 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -652,15 +652,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.loongson b/distrib/sets/lists/comp/md.loongson
index 9fe76a8aa75..503d5e19821 100644
--- a/distrib/sets/lists/comp/md.loongson
+++ b/distrib/sets/lists/comp/md.loongson
@@ -654,15 +654,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 60632af23b4..67979f197a3 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -253,7 +253,6 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/cc1
@@ -261,12 +260,9 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/cc1plus
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/collect2
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fPIC/libgcc.a
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fpic/libgcc.a
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/include
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/libgcc.a
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/specs
 ./usr/lib/libsupc++.a
 ./usr/libdata/ldscripts
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 39e641d269d..0558afb503e 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -649,15 +649,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.octeon b/distrib/sets/lists/comp/md.octeon
index 4cfe11c2e58..c07501666b9 100644
--- a/distrib/sets/lists/comp/md.octeon
+++ b/distrib/sets/lists/comp/md.octeon
@@ -652,15 +652,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index e4be7174d40..fe223be7e0a 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -652,15 +652,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc
index f65e534384d..1a4acbdbbdf 100644
--- a/distrib/sets/lists/comp/md.socppc
+++ b/distrib/sets/lists/comp/md.socppc
@@ -643,15 +643,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index b446b8dcbbb..de0f3f0db23 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -609,15 +609,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 4123ef0192f..96da39ba989 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -611,15 +611,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index d0917627cbc..11636a50c88 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -647,15 +647,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1obj
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
 ./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcov.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 8522c80aa1c..c1ab44c3f84 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,9 +1,7 @@
 ./sys
-./usr/bin/ar
 ./usr/bin/as
 ./usr/bin/c++
 ./usr/bin/c++filt
-./usr/bin/cc
 ./usr/bin/cpp
 ./usr/bin/flex
 ./usr/bin/flex++
@@ -12,7 +10,6 @@
 ./usr/bin/gcov
 ./usr/bin/gdb
 ./usr/bin/gprof
-./usr/bin/ld
 ./usr/bin/lex
 ./usr/bin/libtool
 ./usr/bin/lorder