Now that all known users of cpp in base and X use tradcpp, move gcc

internals from the base set to the comp set consistently for all
platforms. ok deraadt@

19 files changed, 0 insertions, 82 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index b8e3186bbe0..a3ba26cfd11 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -61,11 +61,6 @@
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.6
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index a37aeaee4e3..f6ee4712321 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -67,11 +67,6 @@
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
 ./usr/bin/pctr
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.6
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 22a1cc65216..54135f24aa3 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -34,11 +34,6 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 2f5a3d24390..f04d7a92b4c 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -5,11 +5,6 @@
 ./etc/firmware/run-rt2870
 ./etc/firmware/run-rt3071
 ./sbin/kbd
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index cdc1c60fa8c..37ae99636dd 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1,9 +1,3 @@
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 1373bcb89eb..a745dee66fa 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -63,11 +63,6 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.6
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 6ccb180afe7..eed15b4441c 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -64,11 +64,6 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/gccbug
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.6
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.6/3.3.5
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.6/3.3.5/cc1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.6/3.3.5/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.6/3.3.5/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 8853c88e252..522ad6a34d6 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -69,11 +69,6 @@
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
 ./usr/bin/pctr
-./usr/lib/gcc-lib/i386-unknown-openbsd5.6
-./usr/lib/gcc-lib/i386-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/i386-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 4bb7cd67743..2d014726dc3 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -34,7 +34,6 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.6
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 2c4991490ab..ca69f63ca80 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1,12 +1,6 @@
 ./etc/examples/wsconsctl.conf
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.6/3.3.6/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index ed3fe29716d..8a2b8d59858 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -64,11 +64,6 @@
 ./sbin/kbd
 ./sbin/pdisk
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index c0a623aee8b..31b1936a306 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1,5 +1,4 @@
 ./etc/examples/wsconsctl.conf
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.6
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index d603a699cbe..7089d12d026 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -63,7 +63,6 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.6
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index d8a3ad5cf05..e70987c0a5b 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -57,11 +57,6 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index f7a90c29e10..09fab609f7e 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -7,11 +7,6 @@
 ./etc/firmware/tigon2
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.6
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 10441bac865..f47cf1e903e 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -65,11 +65,6 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.6
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index b12d1633bd1..1f661c7f100 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -2,12 +2,6 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/gccbug
-./usr/lib/gcc-lib/vax-unknown-openbsd5.6
-./usr/lib/gcc-lib/vax-unknown-openbsd5.6/3.3.6
-./usr/lib/gcc-lib/vax-unknown-openbsd5.6/3.3.6/cc1
-./usr/lib/gcc-lib/vax-unknown-openbsd5.6/3.3.6/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd5.6/3.3.6/include
-./usr/lib/gcc-lib/vax-unknown-openbsd5.6/3.3.6/specs
 ./usr/libdata/perl5/site_perl/vax-openbsd
 ./usr/libdata/perl5/site_perl/vax-openbsd/_h2ph_pre.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/a.out.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 1166e108323..17b57e0f129 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -32,11 +32,6 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.6/4.2.1/specs
 ./usr/lib/libc.so.77.2
 ./usr/lib/libcrypto.so.30.2
 ./usr/lib/libcurses.so.14.0
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 56451f350bd..d8f87630611 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -614,7 +614,6 @@
 ./usr/games
 ./usr/include
 ./usr/lib
-./usr/lib/gcc-lib
 ./usr/lib/locate
 ./usr/lib/locate/src.db
 ./usr/lib/pkgconfig