On amd64, arm64, armv7, i386 and sparc64 /usr/bin/{cc,c++,clang++,clang-cpp}

and /usr/libexec/cpp are supposed to be hardlinks of /usr/bin/clang. The move
of /usr/bin/cc to the base set to allow kernel relinking resulted in it being
a copy and not a hardlink. Move the other files to the base set too to ensure
all are hardlinks.

Noticed by Anthony Coulter
OK deraadt

12 files changed, 17 insertions, 17 deletions

diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 8b4775171d4..f3fe4a2743d 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -66,6 +66,9 @@
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
+./usr/bin/clang
+./usr/bin/clang++
+./usr/bin/clang-cpp
 ./usr/bin/objcopy
 ./usr/bin/pctr
 ./usr/lib/crtbegin.o
diff --git a/distrib/sets/lists/base/md.arm64 b/distrib/sets/lists/base/md.arm64
index 5da76da0879..a39244bf2ed 100644
--- a/distrib/sets/lists/base/md.arm64
+++ b/distrib/sets/lists/base/md.arm64
@@ -29,6 +29,9 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/bin/clang
+./usr/bin/clang++
+./usr/bin/clang-cpp
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 0726966ea24..7e6751ced8b 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -29,6 +29,9 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/bin/clang
+./usr/bin/clang++
+./usr/bin/clang-cpp
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index f26937f11aa..187fb053840 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -68,6 +68,9 @@
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
+./usr/bin/clang
+./usr/bin/clang++
+./usr/bin/clang-cpp
 ./usr/bin/objcopy
 ./usr/bin/pctr
 ./usr/lib/crtbegin.o
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 6d99efc92d2..dd13219c3d4 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -65,6 +65,9 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/bin/clang
+./usr/bin/clang++
+./usr/bin/clang-cpp
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index f24d666f8f4..b100af44a04 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -329,6 +329,7 @@
 ./usr/bin/bc
 ./usr/bin/bgplgsh
 ./usr/bin/biff
+./usr/bin/c++
 ./usr/bin/c2ph
 ./usr/bin/cal
 ./usr/bin/calendar
@@ -2185,6 +2186,7 @@
 ./usr/libexec/auth/login_token
 ./usr/libexec/auth/login_yubikey
 ./usr/libexec/comsat
+./usr/libexec/cpp
 ./usr/libexec/cvs
 ./usr/libexec/cvs/contrib
 ./usr/libexec/cvs/contrib/clmerge
diff --git a/distrib/sets/lists/comp/clang.amd64 b/distrib/sets/lists/comp/clang.amd64
index 826d62d4eaa..f5814b09350 100644
--- a/distrib/sets/lists/comp/clang.amd64
+++ b/distrib/sets/lists/comp/clang.amd64
@@ -1,6 +1,3 @@
-./usr/bin/clang
-./usr/bin/clang++
-./usr/bin/clang-cpp
 ./usr/bin/ld.lld
 ./usr/include/c++
 ./usr/include/c++/v1
diff --git a/distrib/sets/lists/comp/clang.arm64 b/distrib/sets/lists/comp/clang.arm64
index f58fa71d96e..fbd3869005d 100644
--- a/distrib/sets/lists/comp/clang.arm64
+++ b/distrib/sets/lists/comp/clang.arm64
@@ -1,6 +1,3 @@
-./usr/bin/clang
-./usr/bin/clang++
-./usr/bin/clang-cpp
 ./usr/bin/ld.lld
 ./usr/include/c++
 ./usr/include/c++/v1
diff --git a/distrib/sets/lists/comp/clang.armv7 b/distrib/sets/lists/comp/clang.armv7
index f58fa71d96e..fbd3869005d 100644
--- a/distrib/sets/lists/comp/clang.armv7
+++ b/distrib/sets/lists/comp/clang.armv7
@@ -1,6 +1,3 @@
-./usr/bin/clang
-./usr/bin/clang++
-./usr/bin/clang-cpp
 ./usr/bin/ld.lld
 ./usr/include/c++
 ./usr/include/c++/v1
diff --git a/distrib/sets/lists/comp/clang.i386 b/distrib/sets/lists/comp/clang.i386
index 826d62d4eaa..f5814b09350 100644
--- a/distrib/sets/lists/comp/clang.i386
+++ b/distrib/sets/lists/comp/clang.i386
@@ -1,6 +1,3 @@
-./usr/bin/clang
-./usr/bin/clang++
-./usr/bin/clang-cpp
 ./usr/bin/ld.lld
 ./usr/include/c++
 ./usr/include/c++/v1
diff --git a/distrib/sets/lists/comp/clang.sparc64 b/distrib/sets/lists/comp/clang.sparc64
index bab263ef072..55bcd97486c 100644
--- a/distrib/sets/lists/comp/clang.sparc64
+++ b/distrib/sets/lists/comp/clang.sparc64
@@ -1,6 +1,3 @@
-./usr/bin/clang
-./usr/bin/clang++
-./usr/bin/clang-cpp
 ./usr/bin/ld.lld
 ./usr/include/c++
 ./usr/include/c++/v1
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 62321647109..149c88fa6ef 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,5 +1,4 @@
 ./sys
-./usr/bin/c++
 ./usr/bin/c++filt
 ./usr/bin/cpp
 ./usr/bin/ctfdump
@@ -1512,7 +1511,6 @@
 ./usr/lib/libz.a
 ./usr/lib/libz_p.a
 ./usr/lib/rcrt0.o
-./usr/libexec/cpp
 ./usr/sbin/kgmon
 ./usr/share/info/binutils.info
 ./usr/share/man/man1/addr2line.1