cleanup some md vs mi differences that accumulated

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 17971b5..6664c2f 100644 (file)
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -63,11 +63,6 @@
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
 ./usr/bin/ld.bfd
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/alpha-unknown-openbsd6.9
 ./usr/lib/gcc-lib/alpha-unknown-openbsd6.9/4.2.1
 ./usr/lib/gcc-lib/alpha-unknown-openbsd6.9/4.2.1/collect2

diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 4c25e52..084e8c8 100644 (file)
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -71,12 +71,7 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.lld
-./usr/bin/objcopy
 ./usr/bin/pctr
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.arm64 b/distrib/sets/lists/base/md.arm64
index 0ff7a07..34b1e5b 100644 (file)
--- a/distrib/sets/lists/base/md.arm64
+++ b/distrib/sets/lists/base/md.arm64
@@ -33,11 +33,6 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.lld
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 7043cc7..8a921c8 100644 (file)
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -33,11 +33,6 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.lld
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 9bbde66..4b85a47 100644 (file)
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -65,11 +65,6 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/ld.bfd
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/hppa-unknown-openbsd6.9
 ./usr/lib/gcc-lib/hppa-unknown-openbsd6.9/4.2.1
 ./usr/lib/gcc-lib/hppa-unknown-openbsd6.9/4.2.1/collect2

diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 851969d..f110399 100644 (file)
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -73,12 +73,7 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.lld
-./usr/bin/objcopy
 ./usr/bin/pctr
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 189e863..23af28b 100644 (file)
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -30,11 +30,6 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/ld.bfd
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/sh-unknown-openbsd6.9
 ./usr/lib/gcc-lib/sh-unknown-openbsd6.9/4.2.1
 ./usr/lib/gcc-lib/sh-unknown-openbsd6.9/4.2.1/collect2

diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 6f5b882..02fc7e2 100644 (file)
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -39,11 +39,6 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.bfd
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index f50f54e..4d1f433 100644 (file)
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -2,11 +2,6 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/ld.bfd
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/m88k-unknown-openbsd6.9
 ./usr/lib/gcc-lib/m88k-unknown-openbsd6.9/3.3.6/fPIC/libgcc.a
 ./usr/lib/gcc-lib/m88k-unknown-openbsd6.9/3.3.6/fpic/libgcc.a

diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index c96b474..aa676fa 100644 (file)
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -69,11 +69,6 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.bfd
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 12af95c..e470ddd 100644 (file)
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -37,11 +37,6 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.bfd
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.powerpc64 b/distrib/sets/lists/base/md.powerpc64
index 29e623d..9f76d4f 100644 (file)
--- a/distrib/sets/lists/base/md.powerpc64
+++ b/distrib/sets/lists/base/md.powerpc64
@@ -5,11 +5,6 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.lld
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.riscv64 b/distrib/sets/lists/base/md.riscv64
index 97a436a..648f5ca 100644 (file)
--- a/distrib/sets/lists/base/md.riscv64
+++ b/distrib/sets/lists/base/md.riscv64
@@ -5,11 +5,6 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.lld
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/libLLVM.so.5.0
 ./usr/lib/libc++.so.8.0
 ./usr/lib/libc++abi.so.5.0

diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index bade95a..469e342 100644 (file)
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -70,11 +70,6 @@
 ./usr/bin/clang++
 ./usr/bin/clang-cpp
 ./usr/bin/ld.bfd
-./usr/bin/objcopy
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd6.9
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd6.9/4.2.1
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd6.9/4.2.1/collect2

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 7944ec7..be8f01a 100644 (file)
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -640,6 +640,10 @@
 ./usr/games
 ./usr/include
 ./usr/lib
+./usr/lib/crtbegin.o
+./usr/lib/crtbeginS.o
+./usr/lib/crtend.o
+./usr/lib/crtendS.o
 ./usr/lib/libagentx.so.1.0
 ./usr/lib/libc.so.96.1
 ./usr/lib/libcbor.so.1.0

diff --git a/distrib/sets/lists/comp/clang.amd64 b/distrib/sets/lists/comp/clang.amd64
index 2eb8ef4..d194df6 100644 (file)
--- a/distrib/sets/lists/comp/clang.amd64
+++ b/distrib/sets/lists/comp/clang.amd64
@@ -1836,8 +1836,8 @@
 ./usr/lib/clang/11.1.0/include/avxintrin.h
 ./usr/lib/clang/11.1.0/include/bmi2intrin.h
 ./usr/lib/clang/11.1.0/include/bmiintrin.h
-./usr/lib/clang/11.1.0/include/cetintrin.h
 ./usr/lib/clang/11.1.0/include/cet.h
+./usr/lib/clang/11.1.0/include/cetintrin.h
 ./usr/lib/clang/11.1.0/include/cldemoteintrin.h
 ./usr/lib/clang/11.1.0/include/clflushoptintrin.h
 ./usr/lib/clang/11.1.0/include/clwbintrin.h

diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index b548214..1b9cb70 100644 (file)
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -8,6 +8,7 @@
 ./usr/bin/lex
 ./usr/bin/libtool
 ./usr/bin/lorder
+./usr/bin/objcopy
 ./usr/bin/objdump
 ./usr/bin/ranlib
 ./usr/bin/rpcgen