ensure the long-name version of ld is in the base set (rather than the

comp set), as it is supposed to be hard-linked.
found by Yoshihiro Kawamata

29 files changed, 15 insertions, 15 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 36a7b3f79a8..17971b5419b 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -62,6 +62,7 @@
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
+./usr/bin/ld.bfd
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 806ea33da61..409875e4722 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -70,6 +70,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.lld
 ./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 69cf03d0ba1..da63d6c3969 100644
--- a/distrib/sets/lists/base/md.arm64
+++ b/distrib/sets/lists/base/md.arm64
@@ -32,6 +32,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.lld
 ./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 011018bbf9f..b41e2091020 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -32,6 +32,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.lld
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 959fe67f04f..9bbde669dc0 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -64,6 +64,7 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/bin/ld.bfd
 ./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 5ab4c0b8842..fa2c302970d 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -72,6 +72,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.lld
 ./usr/bin/objcopy
 ./usr/bin/pctr
 ./usr/lib/crtbegin.o
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 4596365ac10..189e8638a93 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -29,6 +29,7 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/bin/ld.bfd
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index a05ff1f7ff8..c75578c9859 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -38,6 +38,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.bfd
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index fdea78b3e3d..f50f54e2458 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1,6 +1,7 @@
 ./etc/examples/wsconsctl.conf
 ./sbin/kbd
 ./sbin/wsconsctl
+./usr/bin/ld.bfd
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 26be7d6d6bc..a99ee04eeb1 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -68,6 +68,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.bfd
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 0aa1fc2fa6b..67fc89051bd 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -36,6 +36,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.bfd
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.powerpc64 b/distrib/sets/lists/base/md.powerpc64
index 850c39d4711..5bc0cecbcd1 100644
--- a/distrib/sets/lists/base/md.powerpc64
+++ b/distrib/sets/lists/base/md.powerpc64
@@ -4,6 +4,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.lld
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 8dee95e5c2d..c11dc582121 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -67,6 +67,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.bfd
 ./usr/bin/objcopy
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 8d66f860ff5..05d32620f34 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -69,6 +69,7 @@
 ./usr/bin/clang
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
+./usr/bin/ld.bfd
 ./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 334de02458e..dc45aaa6cc2 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -439,7 +439,6 @@
 ./usr/bin/lam
 ./usr/bin/last
 ./usr/bin/lastcomm
-./usr/bin/ld
 ./usr/bin/ldap
 ./usr/bin/ldd
 ./usr/bin/leave
@@ -6361,3 +6360,4 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
+./usr/bin/ld
diff --git a/distrib/sets/lists/comp/clang.amd64 b/distrib/sets/lists/comp/clang.amd64
index c123a56f4ff..c0898d9bcc6 100644
--- a/distrib/sets/lists/comp/clang.amd64
+++ b/distrib/sets/lists/comp/clang.amd64
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
 ./usr/bin/lldb
 ./usr/bin/lldb-server
 ./usr/bin/llvm-config
diff --git a/distrib/sets/lists/comp/clang.arm64 b/distrib/sets/lists/comp/clang.arm64
index b249e6e4b46..47de36c26ea 100644
--- a/distrib/sets/lists/comp/clang.arm64
+++ b/distrib/sets/lists/comp/clang.arm64
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
 ./usr/bin/lldb
 ./usr/bin/lldb-server
 ./usr/bin/llvm-config
diff --git a/distrib/sets/lists/comp/clang.armv7 b/distrib/sets/lists/comp/clang.armv7
index f694b9f75ad..01e234c1c49 100644
--- a/distrib/sets/lists/comp/clang.armv7
+++ b/distrib/sets/lists/comp/clang.armv7
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
 ./usr/bin/llvm-config
 ./usr/include/c++
 ./usr/include/c++/v1
diff --git a/distrib/sets/lists/comp/clang.i386 b/distrib/sets/lists/comp/clang.i386
index 4457bb7d15f..f54c857f66b 100644
--- a/distrib/sets/lists/comp/clang.i386
+++ b/distrib/sets/lists/comp/clang.i386
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
 ./usr/bin/llvm-config
 ./usr/include/c++
 ./usr/include/c++/v1
diff --git a/distrib/sets/lists/comp/clang.powerpc64 b/distrib/sets/lists/comp/clang.powerpc64
index b40623b5f35..c2c3a4412cd 100644
--- a/distrib/sets/lists/comp/clang.powerpc64
+++ b/distrib/sets/lists/comp/clang.powerpc64
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
 ./usr/bin/llvm-config
 ./usr/include/c++
 ./usr/include/c++/v1
diff --git a/distrib/sets/lists/comp/gcc.alpha b/distrib/sets/lists/comp/gcc.alpha
index a40fa43f13a..be94f5f7fe8 100644
--- a/distrib/sets/lists/comp/gcc.alpha
+++ b/distrib/sets/lists/comp/gcc.alpha
@@ -1,7 +1,6 @@
 ./usr/bin/g++
 ./usr/bin/gcc
 ./usr/bin/gcov
-./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
 ./usr/include/g++/alpha-unknown-openbsd6.9
diff --git a/distrib/sets/lists/comp/gcc.hppa b/distrib/sets/lists/comp/gcc.hppa
index c0afe247435..663a541c717 100644
--- a/distrib/sets/lists/comp/gcc.hppa
+++ b/distrib/sets/lists/comp/gcc.hppa
@@ -1,7 +1,6 @@
 ./usr/bin/g++
 ./usr/bin/gcc
 ./usr/bin/gcov
-./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
 ./usr/include/g++/backward
diff --git a/distrib/sets/lists/comp/gcc.landisk b/distrib/sets/lists/comp/gcc.landisk
index ccf285b6fb4..f6b28d3defb 100644
--- a/distrib/sets/lists/comp/gcc.landisk
+++ b/distrib/sets/lists/comp/gcc.landisk
@@ -1,7 +1,6 @@
 ./usr/bin/g++
 ./usr/bin/gcc
 ./usr/bin/gcov
-./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
 ./usr/include/g++/backward
diff --git a/distrib/sets/lists/comp/gcc.loongson b/distrib/sets/lists/comp/gcc.loongson
index 7a3bffd0ee9..f1ce5a6f314 100644
--- a/distrib/sets/lists/comp/gcc.loongson
+++ b/distrib/sets/lists/comp/gcc.loongson
@@ -1,2 +1 @@
-./usr/bin/ld.bfd
 ./usr/share/man/man1/ld.bfd.1
diff --git a/distrib/sets/lists/comp/gcc.luna88k b/distrib/sets/lists/comp/gcc.luna88k
index e15c1ce1f7d..510fc904913 100644
--- a/distrib/sets/lists/comp/gcc.luna88k
+++ b/distrib/sets/lists/comp/gcc.luna88k
@@ -2,7 +2,6 @@
 ./usr/bin/gcc
 ./usr/bin/gccbug
 ./usr/bin/gcov
-./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
 ./usr/include/g++/backward
diff --git a/distrib/sets/lists/comp/gcc.macppc b/distrib/sets/lists/comp/gcc.macppc
index 7a3bffd0ee9..f1ce5a6f314 100644
--- a/distrib/sets/lists/comp/gcc.macppc
+++ b/distrib/sets/lists/comp/gcc.macppc
@@ -1,2 +1 @@
-./usr/bin/ld.bfd
 ./usr/share/man/man1/ld.bfd.1
diff --git a/distrib/sets/lists/comp/gcc.octeon b/distrib/sets/lists/comp/gcc.octeon
index 7a3bffd0ee9..f1ce5a6f314 100644
--- a/distrib/sets/lists/comp/gcc.octeon
+++ b/distrib/sets/lists/comp/gcc.octeon
@@ -1,2 +1 @@
-./usr/bin/ld.bfd
 ./usr/share/man/man1/ld.bfd.1
diff --git a/distrib/sets/lists/comp/gcc.sgi b/distrib/sets/lists/comp/gcc.sgi
index 0e4be477fda..333e7f96a7f 100644
--- a/distrib/sets/lists/comp/gcc.sgi
+++ b/distrib/sets/lists/comp/gcc.sgi
@@ -1,7 +1,6 @@
 ./usr/bin/g++
 ./usr/bin/gcc
 ./usr/bin/gcov
-./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
 ./usr/include/g++/backward
diff --git a/distrib/sets/lists/comp/gcc.sparc64 b/distrib/sets/lists/comp/gcc.sparc64
index 2984ee74ed6..39d3a266c1a 100644
--- a/distrib/sets/lists/comp/gcc.sparc64
+++ b/distrib/sets/lists/comp/gcc.sparc64
@@ -1,7 +1,6 @@
 ./usr/bin/g++
 ./usr/bin/gcc
 ./usr/bin/gcov
-./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
 ./usr/include/g++/backward