From 1172867bb49f21fb05755b09878394bcaf677449 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 6 Aug 2023 20:14:32 +0000 Subject: [PATCH] distrib/sets/lists: Fix libtsan entries. - No obsolete .so.N or .so.N.M entries. - libtsan.so for gcc. - libtsan.so.1* for gcc=10. - libtsan.so.2* for gcc=12. --- distrib/sets/lists/base/md.amd64 | 2 -- distrib/sets/lists/debug/ad.aarch64 | 2 +- distrib/sets/lists/debug/md.amd64 | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 41cce5686b55..d836e9146e41 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -23,8 +23,6 @@ ./usr/lib/libtsan.so base-sys-shlib cxx,gcc ./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/libtsan.so.1 base-sys-shlib cxx,obsolete,gcc=12 -./usr/lib/libtsan.so.1.0 base-sys-shlib cxx,obsolete,gcc=12 ./usr/lib/libtsan.so.2 base-sys-shlib cxx,gcc=12 ./usr/lib/libtsan.so.2.0 base-sys-shlib cxx,gcc=12 ./usr/lib/libx86_64.so base-sys-shlib pic diff --git a/distrib/sets/lists/debug/ad.aarch64 b/distrib/sets/lists/debug/ad.aarch64 index 0e7851970dca..e1a96bd49bae 100644 --- a/distrib/sets/lists/debug/ad.aarch64 +++ b/distrib/sets/lists/debug/ad.aarch64 @@ -20,7 +20,7 @@ ./usr/libdata/debug/usr/lib/eabi/libc_vfp.so.0.0.debug comp-sys-debug debug,compat,pic,llvm ./usr/libdata/debug/usr/lib/eabi/libproc.so.1.0.debug comp-sys-debug debug,compat,pic,llvm,dtrace ./usr/libdata/debug/usr/lib/eabi/librtld_db.so.0.0.debug comp-sys-debug debug,compat,pic,llvm,dtrace -./usr/libdata/debug/usr/lib/libtsan.so.1.0.debug comp-sys-debug debug,cxx,gcc=12 +./usr/libdata/debug/usr/lib/libtsan.so.2.0.debug comp-sys-debug debug,cxx,gcc=12 ./usr/libdata/debug/usr/lib/eabihf comp-sys-debug compat,llvm ./usr/libdata/debug/usr/lib/eabihf/i18n comp-sys-debug compat,llvm ./usr/libdata/debug/usr/lib/eabihf/libarm.so.0.0.debug comp-sys-debug debug,compat,pic,llvm diff --git a/distrib/sets/lists/debug/md.amd64 b/distrib/sets/lists/debug/md.amd64 index 8812e7c4718d..d224a2c99a0e 100644 --- a/distrib/sets/lists/debug/md.amd64 +++ b/distrib/sets/lists/debug/md.amd64 @@ -12,7 +12,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 +./usr/libdata/debug/usr/lib/libtsan.so.1.0.debug comp-sys-debug debug,cxx,gcc=10 +./usr/libdata/debug/usr/lib/libtsan.so.2.0.debug comp-sys-debug debug,cxx,gcc=12 ./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