Module Name: src
Committed By: skrll
Date: Sat Oct 16 07:01:03 UTC 2021
Modified Files:
src/distrib/sets/lists/base: md.amd64 shl.mi
src/distrib/sets/lists/comp: md.amd64 shl.mi
src/distrib/sets/lists/debug: md.amd64 shl.mi
Log Message:
Move tsan entries marked machine=amd64 from .mi files into md.amd64
To generate a diff of this commit:
cvs rdiff -u -r1.285 -r1.286 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.928 -r1.929 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.288 -r1.289 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.347 -r1.348 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.285 -r1.286 src/distrib/sets/lists/debug/shl.mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.285 src/distrib/sets/lists/base/md.amd64:1.286
--- src/distrib/sets/lists/base/md.amd64:1.285 Wed Jun 23 18:30:32 2021
+++ src/distrib/sets/lists/base/md.amd64 Sat Oct 16 07:01:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.285 2021/06/23 18:30:32 christos Exp $
+# $NetBSD: md.amd64,v 1.286 2021/10/16 07:01:02 skrll Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -11,6 +11,12 @@
./usr/lib/i386/libproc.so.1.0 base-compat-shlib compat,pic,dtrace
./usr/lib/i386/librtld_db.so.0 base-compat-shlib compat,pic,dtrace
./usr/lib/i386/librtld_db.so.0.0 base-compat-shlib compat,pic,dtrace
+./usr/lib/libtsan.so base-sys-shlib cxx,gcc=9
+./usr/lib/libtsan.so.1 base-sys-shlib cxx,gcc=9
+./usr/lib/libtsan.so.1.0 base-sys-shlib cxx,gcc=9
+./usr/lib/libtsan.so base-sys-shlib cxx,gcc=10
+./usr/lib/libtsan.so.1 base-sys-shlib cxx,gcc=10
+./usr/lib/libtsan.so.1.0 base-sys-shlib cxx,gcc=10
./usr/lib/libx86_64.so base-sys-shlib pic
./usr/lib/libx86_64.so.0 base-sys-shlib pic
./usr/lib/libx86_64.so.0.0 base-sys-shlib pic
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.928 src/distrib/sets/lists/base/shl.mi:1.929
--- src/distrib/sets/lists/base/shl.mi:1.928 Thu Sep 30 02:00:19 2021
+++ src/distrib/sets/lists/base/shl.mi Sat Oct 16 07:01:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.928 2021/09/30 02:00:19 yamaguchi Exp $
+# $NetBSD: shl.mi,v 1.929 2021/10/16 07:01:02 skrll Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -911,12 +911,6 @@
./usr/lib/libtre.so base-sys-shlib compatfile
./usr/lib/libtre.so.0 base-sys-shlib compatfile
./usr/lib/libtre.so.0.8 base-sys-shlib compatfile
-./usr/lib/libtsan.so base-sys-shlib arch64,cxx,gcc=9,machine=amd64
-./usr/lib/libtsan.so.1 base-sys-shlib arch64,cxx,gcc=9,machine=amd64
-./usr/lib/libtsan.so.1.0 base-sys-shlib arch64,cxx,gcc=9,machine=amd64
-./usr/lib/libtsan.so base-sys-shlib arch64,cxx,gcc=10,machine=amd64
-./usr/lib/libtsan.so.1 base-sys-shlib arch64,cxx,gcc=10,machine=amd64
-./usr/lib/libtsan.so.1.0 base-sys-shlib arch64,cxx,gcc=10,machine=amd64
./usr/lib/libtspi.so base-sys-shlib compatfile,tpm
./usr/lib/libtspi.so.3 base-sys-shlib compatfile,tpm
./usr/lib/libtspi.so.3.0 base-sys-shlib compatfile,tpm
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.288 src/distrib/sets/lists/comp/md.amd64:1.289
--- src/distrib/sets/lists/comp/md.amd64:1.288 Thu Sep 16 23:32:49 2021
+++ src/distrib/sets/lists/comp/md.amd64 Sat Oct 16 07:01:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.288 2021/09/16 23:32:49 christos Exp $
+# $NetBSD: md.amd64,v 1.289 2021/10/16 07:01:03 skrll Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1429,6 +1429,8 @@
./usr/lib/i386/libi386.so comp-sys-shlib compat,pic
./usr/lib/i386/libi386_p.a comp-c-proflib compat,profile
./usr/lib/i386/libi386_pic.a comp-c-piclib compat,pic,picinstall
+./usr/lib/libtsan_pic.a comp-c-piclib picinstall,cxx,gcc=9
+./usr/lib/libtsan_pic.a comp-c-piclib picinstall,cxx,gcc=10
./usr/lib/libx86_64.a comp-c-lib
./usr/lib/libx86_64_p.a comp-c-proflib profile
./usr/lib/libx86_64_pic.a comp-c-piclib pic,picinstall
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.347 src/distrib/sets/lists/comp/shl.mi:1.348
--- src/distrib/sets/lists/comp/shl.mi:1.347 Wed Jul 14 03:19:24 2021
+++ src/distrib/sets/lists/comp/shl.mi Sat Oct 16 07:01:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.347 2021/07/14 03:19:24 ozaki-r Exp $
+# $NetBSD: shl.mi,v 1.348 2021/10/16 07:01:03 skrll Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -277,8 +277,6 @@
./usr/lib/libtermlib_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libtpm_unseal_pic.a comp-tpm-lib compatfile,picinstall,tpm
./usr/lib/libtre_pic.a comp-c-piclib compatfile,picinstall
-./usr/lib/libtsan_pic.a comp-c-piclib arch64,picinstall,cxx,gcc=9,machine=amd64
-./usr/lib/libtsan_pic.a comp-c-piclib arch64,picinstall,cxx,gcc=10,machine=amd64
./usr/lib/libtspi_pic.a comp-c-piclib compatfile,picinstall,tpm
./usr/lib/libubsan_pic.a comp-c-piclib compatfile,picinstall,cxx,gcc
./usr/lib/libukfs_pic.a comp-c-piclib compatfile,picinstall,rump
Index: src/distrib/sets/lists/debug/md.amd64
diff -u src/distrib/sets/lists/debug/md.amd64:1.115 src/distrib/sets/lists/debug/md.amd64:1.116
--- src/distrib/sets/lists/debug/md.amd64:1.115 Wed Jun 23 18:30:33 2021
+++ src/distrib/sets/lists/debug/md.amd64 Sat Oct 16 07:01:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.115 2021/06/23 18:30:33 christos Exp $
+# $NetBSD: md.amd64,v 1.116 2021/10/16 07:01:03 skrll Exp $
./usr/libdata/debug/usr/bin/gdbserver.debug base-util-debug gdb,debug
./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx
./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat
@@ -11,6 +11,8 @@
./usr/libdata/debug/usr/lib/i386/libpam.so.4.1.debug comp-compat-shlib compat,pic,debug,pam
./usr/libdata/debug/usr/lib/i386/libproc.so.1.0.debug comp-compat-shlib compat,pic,debug,dtrace
./usr/libdata/debug/usr/lib/i386/librtld_db.so.0.0.debug comp-compat-shlib compat,pic,debug,dtrace
+./usr/libdata/debug/usr/lib/libtsan.so.1.0.debug comp-sys-debug debug,cxx,gcc=9
+./usr/libdata/debug/usr/lib/libtsan.so.1.0.debug comp-sys-debug debug,cxx,gcc=10
./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug comp-sys-shlib pic,debug
./usr/libdata/debug/usr/libexec/ld.elf_so-i386 comp-obsolete obsolete
./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.285 src/distrib/sets/lists/debug/shl.mi:1.286
--- src/distrib/sets/lists/debug/shl.mi:1.285 Thu Sep 30 02:00:19 2021
+++ src/distrib/sets/lists/debug/shl.mi Sat Oct 16 07:01:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.285 2021/09/30 02:00:19 yamaguchi Exp $
+# $NetBSD: shl.mi,v 1.286 2021/10/16 07:01:03 skrll Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
@@ -317,8 +317,6 @@
./usr/libdata/debug/usr/lib/libterminfo.so.2.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libtpm_unseal.so.1.0.debug comp-tpm-debug debug,compatfile,tpm
./usr/libdata/debug/usr/lib/libtre.so.0.8.debug comp-sys-debug debug,compatfile
-./usr/libdata/debug/usr/lib/libtsan.so.1.0.debug comp-sys-debug debug,arch64,cxx,gcc=9,machine=amd64
-./usr/libdata/debug/usr/lib/libtsan.so.1.0.debug comp-sys-debug debug,arch64,cxx,gcc=10,machine=amd64
./usr/libdata/debug/usr/lib/libtspi.so.3.0.debug comp-tpm-debug debug,compatfile,tpm
./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug comp-sys-debug debug,compatfile,cxx,gcc=9
./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug comp-sys-debug debug,compatfile,cxx,gcc=10
