KAWAMATA Yoshihiro <k...@on.rim.or.jp> wrote:
> When I was looking at the snapshot package, I found that /usr/bin/ld
> and /usr/bin/ld.lld have the same contents and properties, but they
> are independent.
>
> Upon further investigation, it seems that this is due to the fact that
> /usr/bin/ld is contained in base69.tgz and /usr/bin/ld.ld is contained
> in comp69.tgz. It is likely that ld is included in base.tgz in order
> to run KARL.
>
> Since ld and ld.lld are identical, I think it would be preferable to
> include both in base.tgz. This will reduce the total size by about
> 40MB.
>
> If you build from the source tree, ld and ld.lld will be installed
> hard-linked.
true.
A diff to do that probably looks like the following. I will test it in
snapshots, and refine it if needed.
Index: checkflist
===================================================================
RCS file: /cvs/src/distrib/sets/checkflist,v
retrieving revision 1.13
diff -u -p -u -r1.13 checkflist
--- checkflist 17 Apr 2017 19:44:59 -0000 1.13
+++ checkflist 23 Mar 2021 17:04:03 -0000
@@ -38,11 +38,11 @@ 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}
+ if [ $i = comp -o $i = base ]; then
+ [ -f ./lists/$i/gcc.${arch} ] && \
+ cat ./lists/$i/gcc.${arch}
+ [ -f ./lists/$i/clang.${arch} ] && \
+ cat ./lists/$i/clang.${arch}
fi
done | sort >$TMP1
Index: lists/base/clang.amd64
===================================================================
RCS file: lists/base/clang.amd64
diff -N lists/base/clang.amd64
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.amd64 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.arm64
===================================================================
RCS file: lists/base/clang.arm64
diff -N lists/base/clang.arm64
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.arm64 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.armv7
===================================================================
RCS file: lists/base/clang.armv7
diff -N lists/base/clang.armv7
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.armv7 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.i386
===================================================================
RCS file: lists/base/clang.i386
diff -N lists/base/clang.i386
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.i386 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.loongson
===================================================================
RCS file: lists/base/clang.loongson
diff -N lists/base/clang.loongson
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.loongson 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.macppc
===================================================================
RCS file: lists/base/clang.macppc
diff -N lists/base/clang.macppc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.macppc 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.octeon
===================================================================
RCS file: lists/base/clang.octeon
diff -N lists/base/clang.octeon
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.octeon 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.powerpc64
===================================================================
RCS file: lists/base/clang.powerpc64
diff -N lists/base/clang.powerpc64
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.powerpc64 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.sgi
===================================================================
RCS file: lists/base/clang.sgi
diff -N lists/base/clang.sgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.sgi 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/clang.sparc64
===================================================================
RCS file: lists/base/clang.sparc64
diff -N lists/base/clang.sparc64
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/clang.sparc64 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.lld
Index: lists/base/gcc.alpha
===================================================================
RCS file: lists/base/gcc.alpha
diff -N lists/base/gcc.alpha
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.alpha 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.amd64
===================================================================
RCS file: lists/base/gcc.amd64
diff -N lists/base/gcc.amd64
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.amd64 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.armv7
===================================================================
RCS file: lists/base/gcc.armv7
diff -N lists/base/gcc.armv7
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.armv7 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.hppa
===================================================================
RCS file: lists/base/gcc.hppa
diff -N lists/base/gcc.hppa
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.hppa 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.i386
===================================================================
RCS file: lists/base/gcc.i386
diff -N lists/base/gcc.i386
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.i386 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.landisk
===================================================================
RCS file: lists/base/gcc.landisk
diff -N lists/base/gcc.landisk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.landisk 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.loongson
===================================================================
RCS file: lists/base/gcc.loongson
diff -N lists/base/gcc.loongson
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.loongson 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.luna88k
===================================================================
RCS file: lists/base/gcc.luna88k
diff -N lists/base/gcc.luna88k
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.luna88k 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.macppc
===================================================================
RCS file: lists/base/gcc.macppc
diff -N lists/base/gcc.macppc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.macppc 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.octeon
===================================================================
RCS file: lists/base/gcc.octeon
diff -N lists/base/gcc.octeon
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.octeon 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.sgi
===================================================================
RCS file: lists/base/gcc.sgi
diff -N lists/base/gcc.sgi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.sgi 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/base/gcc.sparc64
===================================================================
RCS file: lists/base/gcc.sparc64
diff -N lists/base/gcc.sparc64
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lists/base/gcc.sparc64 23 Mar 2021 17:05:04 -0000
@@ -0,0 +1 @@
+./usr/bin/ld.bfd
Index: lists/comp/clang.amd64
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.amd64,v
retrieving revision 1.33
diff -u -p -u -r1.33 clang.amd64
--- lists/comp/clang.amd64 9 Feb 2021 21:58:46 -0000 1.33
+++ lists/comp/clang.amd64 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/lldb
./usr/bin/lldb-server
./usr/bin/llvm-config
Index: lists/comp/clang.arm64
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.arm64,v
retrieving revision 1.26
diff -u -p -u -r1.26 clang.arm64
--- lists/comp/clang.arm64 9 Feb 2021 21:58:47 -0000 1.26
+++ lists/comp/clang.arm64 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/lldb
./usr/bin/lldb-server
./usr/bin/llvm-config
Index: lists/comp/clang.armv7
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.armv7,v
retrieving revision 1.26
diff -u -p -u -r1.26 clang.armv7
--- lists/comp/clang.armv7 16 Feb 2021 14:21:53 -0000 1.26
+++ lists/comp/clang.armv7 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/llvm-config
./usr/include/c++
./usr/include/c++/v1
Index: lists/comp/clang.i386
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.i386,v
retrieving revision 1.34
diff -u -p -u -r1.34 clang.i386
--- lists/comp/clang.i386 11 Feb 2021 04:08:17 -0000 1.34
+++ lists/comp/clang.i386 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/llvm-config
./usr/include/c++
./usr/include/c++/v1
Index: lists/comp/clang.loongson
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.loongson,v
retrieving revision 1.18
diff -u -p -u -r1.18 clang.loongson
--- lists/comp/clang.loongson 11 Feb 2021 04:08:17 -0000 1.18
+++ lists/comp/clang.loongson 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/llvm-config
./usr/include/c++
./usr/include/c++/v1
Index: lists/comp/clang.macppc
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.macppc,v
retrieving revision 1.13
diff -u -p -u -r1.13 clang.macppc
--- lists/comp/clang.macppc 11 Feb 2021 04:08:17 -0000 1.13
+++ lists/comp/clang.macppc 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/llvm-config
./usr/include/c++
./usr/include/c++/v1
Index: lists/comp/clang.octeon
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.octeon,v
retrieving revision 1.18
diff -u -p -u -r1.18 clang.octeon
--- lists/comp/clang.octeon 11 Feb 2021 04:08:17 -0000 1.18
+++ lists/comp/clang.octeon 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/llvm-config
./usr/include/c++
./usr/include/c++/v1
Index: lists/comp/clang.powerpc64
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.powerpc64,v
retrieving revision 1.7
diff -u -p -u -r1.7 clang.powerpc64
--- lists/comp/clang.powerpc64 11 Feb 2021 04:08:17 -0000 1.7
+++ lists/comp/clang.powerpc64 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/llvm-config
./usr/include/c++
./usr/include/c++/v1
Index: lists/comp/clang.sgi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.sgi,v
retrieving revision 1.17
diff -u -p -u -r1.17 clang.sgi
--- lists/comp/clang.sgi 11 Feb 2021 04:08:17 -0000 1.17
+++ lists/comp/clang.sgi 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/llvm-config
./usr/include/c++
./usr/include/c++/v1
Index: lists/comp/clang.sparc64
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/clang.sparc64,v
retrieving revision 1.21
diff -u -p -u -r1.21 clang.sparc64
--- lists/comp/clang.sparc64 11 Feb 2021 04:08:17 -0000 1.21
+++ lists/comp/clang.sparc64 23 Mar 2021 17:05:29 -0000
@@ -1,4 +1,3 @@
-./usr/bin/ld.lld
./usr/bin/llvm-config
./usr/include/c++
./usr/include/c++/v1
Index: lists/comp/gcc.alpha
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.alpha,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.alpha
--- lists/comp/gcc.alpha 7 Feb 2021 01:24:40 -0000 1.15
+++ lists/comp/gcc.alpha 23 Mar 2021 17:05:29 -0000
@@ -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
Index: lists/comp/gcc.amd64
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.amd64,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.amd64
--- lists/comp/gcc.amd64 7 Feb 2021 01:24:40 -0000 1.15
+++ lists/comp/gcc.amd64 23 Mar 2021 17:05:29 -0000
@@ -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++/amd64-unknown-openbsd6.9
Index: lists/comp/gcc.armv7
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.armv7,v
retrieving revision 1.14
diff -u -p -u -r1.14 gcc.armv7
--- lists/comp/gcc.armv7 6 Sep 2019 15:07:19 -0000 1.14
+++ lists/comp/gcc.armv7 23 Mar 2021 17:05:29 -0000
@@ -1,2 +1 @@
-./usr/bin/ld.bfd
./usr/share/man/man1/ld.bfd.1
Index: lists/comp/gcc.hppa
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.hppa,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.hppa
--- lists/comp/gcc.hppa 7 Feb 2021 01:24:40 -0000 1.15
+++ lists/comp/gcc.hppa 23 Mar 2021 17:05:29 -0000
@@ -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
Index: lists/comp/gcc.i386
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.i386,v
retrieving revision 1.13
diff -u -p -u -r1.13 gcc.i386
--- lists/comp/gcc.i386 27 Aug 2019 15:32:33 -0000 1.13
+++ lists/comp/gcc.i386 23 Mar 2021 17:05:29 -0000
@@ -1,2 +1 @@
-./usr/bin/ld.bfd
./usr/share/man/man1/ld.bfd.1
Index: lists/comp/gcc.landisk
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.landisk,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.landisk
--- lists/comp/gcc.landisk 7 Feb 2021 01:24:40 -0000 1.15
+++ lists/comp/gcc.landisk 23 Mar 2021 17:05:29 -0000
@@ -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
Index: lists/comp/gcc.loongson
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.loongson,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.loongson
--- lists/comp/gcc.loongson 10 Jan 2021 09:14:18 -0000 1.15
+++ lists/comp/gcc.loongson 23 Mar 2021 17:05:29 -0000
@@ -1,2 +1 @@
-./usr/bin/ld.bfd
./usr/share/man/man1/ld.bfd.1
Index: lists/comp/gcc.luna88k
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.luna88k,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.luna88k
--- lists/comp/gcc.luna88k 7 Feb 2021 01:24:40 -0000 1.15
+++ lists/comp/gcc.luna88k 23 Mar 2021 17:05:29 -0000
@@ -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
Index: lists/comp/gcc.macppc
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.macppc,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.macppc
--- lists/comp/gcc.macppc 29 Jan 2021 16:40:07 -0000 1.15
+++ lists/comp/gcc.macppc 23 Mar 2021 17:05:29 -0000
@@ -1,2 +1 @@
-./usr/bin/ld.bfd
./usr/share/man/man1/ld.bfd.1
Index: lists/comp/gcc.octeon
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.octeon,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.octeon
--- lists/comp/gcc.octeon 10 Jan 2021 09:14:18 -0000 1.15
+++ lists/comp/gcc.octeon 23 Mar 2021 17:05:29 -0000
@@ -1,2 +1 @@
-./usr/bin/ld.bfd
./usr/share/man/man1/ld.bfd.1
Index: lists/comp/gcc.sgi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.sgi,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.sgi
--- lists/comp/gcc.sgi 7 Feb 2021 01:24:40 -0000 1.15
+++ lists/comp/gcc.sgi 23 Mar 2021 17:05:29 -0000
@@ -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
Index: lists/comp/gcc.sparc64
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/gcc.sparc64,v
retrieving revision 1.15
diff -u -p -u -r1.15 gcc.sparc64
--- lists/comp/gcc.sparc64 7 Feb 2021 01:24:40 -0000 1.15
+++ lists/comp/gcc.sparc64 23 Mar 2021 17:05:29 -0000
@@ -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
