Module Name:    src
Committed By:   mrg
Date:           Fri Aug  4 08:54:00 UTC 2023

Modified Files:
        src/distrib/sets/lists/base: ad.aarch64 ad.mips md.amd64 shl.mi
        src/distrib/sets/lists/comp: ad.aarch64 ad.m68k md.amd64 md.ia64 mi
            shl.mi
        src/distrib/sets/lists/debug: ad.aarch64 md.amd64 mi shl.mi

Log Message:
more updates for sets and GCC 12

- renable sanitizer, add new shlib versions, enable tsan for arm64,
  including moving some stuff into the per-cpu/arch dir from 'mi'.
- fix mips64, 68k, and ia64
- mark many any-gcc-version things just as "gcc" and remove dups
- mark many gcc=9 only things as obsolete
- mark many gcc=10 only things as obsolete with gcc=12 (more could
  be done here.)


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.293 -r1.294 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.958 -r1.959 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/comp/ad.aarch64
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/comp/ad.m68k
cvs rdiff -u -r1.297 -r1.298 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/md.ia64
cvs rdiff -u -r1.2443 -r1.2444 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.352 -r1.353 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.413 -r1.414 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.319 -r1.320 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/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.43 src/distrib/sets/lists/base/ad.aarch64:1.44
--- src/distrib/sets/lists/base/ad.aarch64:1.43	Sat May 27 02:28:46 2023
+++ src/distrib/sets/lists/base/ad.aarch64	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.43 2023/05/27 02:28:46 riastradh Exp $
+# $NetBSD: ad.aarch64,v 1.44 2023/08/04 08:54:00 mrg Exp $
 ./lib/eabi					base-compat-lib		compat,llvm
 ./lib/eabi/npf					base-compat-lib		compat,llvm
 ./lib/eabihf					base-compat-lib		compat,llvm
@@ -26,6 +26,9 @@
 ./usr/lib/eabi/openssl/modules			base-compat-lib		compat,llvm
 ./usr/lib/eabi/openssl/modules/legacy.so	base-compat-lib		compat,llvm
 ./usr/lib/eabi/security				base-compat-lib		compat,llvm
+./usr/lib/libtsan.so				base-sys-shlib		cxx,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/eabihf				base-compat-lib		compat,llvm
 ./usr/lib/eabihf/i18n				base-compat-lib		compat,llvm
 ./usr/lib/eabihf/libarm.so.0			base-compat-shlib	compat,pic,llvm

Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.91 src/distrib/sets/lists/base/ad.mips:1.92
--- src/distrib/sets/lists/base/ad.mips:1.91	Tue Aug  1 06:35:55 2023
+++ src/distrib/sets/lists/base/ad.mips	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.91 2023/08/01 06:35:55 mrg Exp $
+# $NetBSD: ad.mips,v 1.92 2023/08/04 08:54:00 mrg Exp $
 ./lib/libc_fp.so				base-sys-shlib		dynamicroot,softfloat,arch64
 ./lib/libc_fp.so.0				base-sys-shlib		dynamicroot,softfloat,arch64
 ./lib/libc_fp.so.0.0				base-sys-shlib		dynamicroot,softfloat,arch64
@@ -23,11 +23,10 @@
 ./usr/lib/o32/libc_fp.so.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libc_fp.so.0.0			base-compat-shlib	compat,pic,arch64
 ./usr/lib/o32/libgomp.so.1.3			base-compat-shlib	obsolete
-./usr/lib/o32/libgomp.so.2.0			base-compat-shlib	compat,pic,arch64,gcc=9
-./usr/lib/o32/libgomp.so.2.0			base-compat-shlib	compat,pic,arch64,gcc=10,obsolete
+./usr/lib/o32/libgomp.so.2.0			base-obsolete		obsolete
 ./usr/lib/o32/libgomp.so.2.1			base-compat-shlib	compat,pic,arch64,gcc=10
 ./usr/lib/o32/libgomp.so.2.1			base-compat-shlib	compat,pic,arch64,gcc=12,obsolete
-./usr/lib/o32/libgomp.so.2.1			base-compat-shlib	compat,pic,arch64,gcc=12
+./usr/lib/o32/libgomp.so.2.2			base-compat-shlib	compat,pic,arch64,gcc=12
 ./usr/lib/o32/openssl				base-crypto-usr		compat,pic,arch64
 ./usr/lib/o32/openssl/engines			base-crypto-usr		compat,pic,arch64
 ./usr/lib/o32/openssl/engines/dasync.so		base-compat-shlib	compat,pic,arch64,openssl=30

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.293 src/distrib/sets/lists/base/md.amd64:1.294
--- src/distrib/sets/lists/base/md.amd64:1.293	Sat May 27 02:28:46 2023
+++ src/distrib/sets/lists/base/md.amd64	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.293 2023/05/27 02:28:46 riastradh Exp $
+# $NetBSD: md.amd64,v 1.294 2023/08/04 08:54:00 mrg Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
@@ -20,12 +20,13 @@
 ./usr/lib/i386/openssl/engines/padlock.so	base-crypto-usr		compat,pic,openssl=30
 ./usr/lib/i386/openssl/modules			base-crypto-usr
 ./usr/lib/i386/openssl/modules/legacy.so	base-crypto-usr		compat,pic,openssl=30
-./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				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
 ./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.958 src/distrib/sets/lists/base/shl.mi:1.959
--- src/distrib/sets/lists/base/shl.mi:1.958	Thu Aug  3 15:07:06 2023
+++ src/distrib/sets/lists/base/shl.mi	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.958 2023/08/03 15:07:06 rin Exp $
+# $NetBSD: shl.mi,v 1.959 2023/08/04 08:54:00 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -210,11 +210,12 @@
 ./usr/lib/libarchive.so				base-sys-shlib		compatfile
 ./usr/lib/libarchive.so.4			base-sys-shlib		compatfile
 ./usr/lib/libarchive.so.4.0			base-sys-shlib		compatfile
-./usr/lib/libasan.so				base-sys-shlib		compatfile,cxx,gcc=10
-./usr/lib/libasan.so				base-sys-shlib		compatfile,cxx,gcc=12
+./usr/lib/libasan.so				base-sys-shlib		compatfile,cxx
 ./usr/lib/libasan.so.5				base-sys-shlib		compatfile,cxx,gcc=10
-./usr/lib/libasan.so.6				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libasan.so.5.0			base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/libasan.so.5				base-sys-shlib		compatfile,cxx,obsolete,gcc=12
+./usr/lib/libasan.so.5.0			base-sys-shlib		compatfile,cxx,obsolete,gcc=12
+./usr/lib/libasan.so.6				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libasan.so.6.0			base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libasn1.so				base-krb5-shlib		compatfile,kerberos
 ./usr/lib/libasn1.so.10				base-krb5-shlib		compatfile,kerberos
@@ -437,13 +438,14 @@
 ./usr/lib/libldap_r.so				base-ldap-shlib		ldap,compatfile
 ./usr/lib/libldap_r.so.5			base-ldap-shlib		ldap,compatfile
 ./usr/lib/libldap_r.so.5.0			base-ldap-shlib		ldap,compatfile
-./usr/lib/liblsan.so				base-sys-shlib		compatfile,cxx,gcc=10
-./usr/lib/liblsan.so				base-sys-shlib		compatfile,cxx,gcc=12
+./usr/lib/liblsan.so				base-sys-shlib		compatfile,cxx,gcc
 ./usr/lib/liblsan.so.1				base-sys-shlib		compatfile,obsolete
 ./usr/lib/liblsan.so.1.0			base-sys-shlib		compatfile,obsolete
 ./usr/lib/liblsan.so.2				base-sys-shlib		compatfile,cxx,gcc=10
-./usr/lib/liblsan.so.3				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/liblsan.so.2.0			base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/liblsan.so.2				base-sys-shlib		compatfile,cxx,obsolete,gcc=12
+./usr/lib/liblsan.so.2.0			base-sys-shlib		compatfile,cxx,obsolete,gcc=12
+./usr/lib/liblsan.so.3				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/liblsan.so.3.0			base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/liblua.so				base-sys-shlib		compatfile
 ./usr/lib/liblua.so.6				base-sys-shlib		compatfile
@@ -933,11 +935,12 @@
 ./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
-./usr/lib/libubsan.so				base-sys-shlib		compatfile,cxx,gcc=10
-./usr/lib/libubsan.so				base-sys-shlib		compatfile,cxx,gcc=12
+./usr/lib/libubsan.so				base-sys-shlib		compatfile,cxx
 ./usr/lib/libubsan.so.4				base-sys-shlib		compatfile,cxx,gcc=10
-./usr/lib/libubsan.so.5				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libubsan.so.4.0			base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/libubsan.so.4				base-sys-shlib		compatfile,cxx,obsolete,gcc=12
+./usr/lib/libubsan.so.4.0			base-sys-shlib		compatfile,cxx,obsolete,gcc=12
+./usr/lib/libubsan.so.5				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libubsan.so.5.0			base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libukfs.so				base-sys-shlib		compatfile,rump
 ./usr/lib/libukfs.so.1				base-sys-shlib		compatfile,rump

Index: src/distrib/sets/lists/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.48 src/distrib/sets/lists/comp/ad.aarch64:1.49
--- src/distrib/sets/lists/comp/ad.aarch64:1.48	Tue Aug  1 06:35:55 2023
+++ src/distrib/sets/lists/comp/ad.aarch64	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.48 2023/08/01 06:35:55 mrg Exp $
+# $NetBSD: ad.aarch64,v 1.49 2023/08/04 08:54:00 mrg Exp $
 ./usr/include/aarch64				comp-c-include
 ./usr/include/aarch64/ansi.h			comp-c-include
 ./usr/include/aarch64/aout_machdep.h		comp-c-include
@@ -181,6 +181,9 @@
 ./usr/lib/eabihf/libarm.so			base-sys-shlib		compat,pic,llvm
 ./usr/lib/eabihf/libarm_p.a			comp-c-proflib		compat,profile,llvm
 ./usr/lib/eabihf/libarm_pic.a			comp-c-piclib		compat,pic,picinstall,llvm
+./usr/lib/libtsan.a				comp-c-lib		arch64,cxx,gcc=12
+./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcc=12
+./usr/lib/libtsan_pic.a				comp-c-piclib		compat,picinstall,cxx,gcc=12
 ./usr/lib/oabi/libarm.a				comp-obsolete		obsolete
 ./usr/lib/oabi/libarm.so			base-obsolete		obsolete
 ./usr/lib/oabi/libarm_p.a			comp-obsolete		obsolete

Index: src/distrib/sets/lists/comp/ad.m68k
diff -u src/distrib/sets/lists/comp/ad.m68k:1.65 src/distrib/sets/lists/comp/ad.m68k:1.66
--- src/distrib/sets/lists/comp/ad.m68k:1.65	Mon Apr 12 02:08:59 2021
+++ src/distrib/sets/lists/comp/ad.m68k	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.m68k,v 1.65 2021/04/12 02:08:59 mrg Exp $
+# $NetBSD: ad.m68k,v 1.66 2023/08/04 08:54:00 mrg Exp $
 ./usr/bin/elf2aout				comp-sysutil-bin
 ./usr/include/gcc-4.5/math-68881.h		comp-c-include		obsolete
 ./usr/include/gcc-4.5/tgmath.h			comp-c-include		obsolete
@@ -16,6 +16,7 @@
 ./usr/include/gcc-9/tgmath.h			comp-c-include		gcc=9
 ./usr/include/gcc-10/math-68881.h		comp-c-include		gcc=10
 ./usr/include/gcc-10/tgmath.h			comp-c-include		gcc=10
+./usr/include/gcc-12/math-68881.h		comp-c-include		gcc=12
 ./usr/include/m68k				comp-c-include
 ./usr/include/m68k/ansi.h			comp-c-include
 ./usr/include/m68k/aout_machdep.h		comp-c-include

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.297 src/distrib/sets/lists/comp/md.amd64:1.298
--- src/distrib/sets/lists/comp/md.amd64:1.297	Tue Aug  1 06:35:55 2023
+++ src/distrib/sets/lists/comp/md.amd64	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.297 2023/08/01 06:35:55 mrg Exp $
+# $NetBSD: md.amd64,v 1.298 2023/08/04 08:54:00 mrg Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -1526,8 +1526,9 @@
 ./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=10
-./usr/lib/libtsan_pic.a				comp-c-piclib		picinstall,cxx,gcc=9
+./usr/lib/libtsan.a				comp-c-lib		arch64,cxx,gcc
+./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcc
+./usr/lib/libtsan_pic.a				comp-c-piclib		compat,picinstall,cxx,gcc
 ./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/md.ia64
diff -u src/distrib/sets/lists/comp/md.ia64:1.9 src/distrib/sets/lists/comp/md.ia64:1.10
--- src/distrib/sets/lists/comp/md.ia64:1.9	Mon Apr 12 02:09:00 2021
+++ src/distrib/sets/lists/comp/md.ia64	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.ia64,v 1.9 2021/04/12 02:09:00 mrg Exp $
+# $NetBSD: md.ia64,v 1.10 2023/08/04 08:54:00 mrg Exp $
 ./usr/include/gcc-4.8/ia64intrin.h	comp-obsolete		obsolete
 ./usr/include/gcc-4.8/tgmath.h		comp-obsolete		obsolete
 ./usr/include/gcc-5/ia64intrin.h	comp-obsolete		obsolete
@@ -13,6 +13,7 @@
 ./usr/include/gcc-9/tgmath.h		comp-c-include		gcc=9
 ./usr/include/gcc-10/ia64intrin.h	comp-c-include		gcc=10
 ./usr/include/gcc-10/tgmath.h		comp-c-include		gcc=10
+./usr/include/gcc-12/ia64intrin.h	comp-c-include		gcc=12
 ./usr/include/ia64			comp-c-include
 ./usr/include/ia64/_regset.h		comp-c-include
 ./usr/include/ia64/acpi_machdep.h	comp-c-include

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2443 src/distrib/sets/lists/comp/mi:1.2444
--- src/distrib/sets/lists/comp/mi:1.2443	Thu Aug  3 13:13:04 2023
+++ src/distrib/sets/lists/comp/mi	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2443 2023/08/03 13:13:04 rin Exp $
+#	$NetBSD: mi,v 1.2444 2023/08/04 08:54:00 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -2481,16 +2481,16 @@
 ./usr/include/gcc-8/sanitizer/lsan_interface.h		comp-gcc-include	obsolete
 ./usr/include/gcc-8/sanitizer/tsan_interface_atomic.h	comp-gcc-include	obsolete
 ./usr/include/gcc-8/stdatomic.h				comp-gcc-include	obsolete
-./usr/include/gcc-9/omp.h				comp-gcc-include	gcc=9
-./usr/include/gcc-9/openacc.h				comp-gcc-include	gcc=9
-./usr/include/gcc-9/sanitizer/allocator_interface.h	comp-gcc-include	gcc=9
-./usr/include/gcc-9/sanitizer/asan_interface.h		comp-gcc-include	gcc=9
-./usr/include/gcc-9/sanitizer/common_interface_defs.h	comp-gcc-include	gcc=9
-./usr/include/gcc-9/sanitizer/lsan_interface.h		comp-gcc-include	gcc=9
-./usr/include/gcc-9/sanitizer/netbsd_syscall_hooks.h	comp-gcc-include	gcc=9
-./usr/include/gcc-9/sanitizer/tsan_interface.h		comp-gcc-include	gcc=9
-./usr/include/gcc-9/sanitizer/tsan_interface_atomic.h	comp-gcc-include	gcc=9
-./usr/include/gcc-9/stdatomic.h				comp-gcc-include	gcc=9
+./usr/include/gcc-9/omp.h				comp-gcc-include	obsolete
+./usr/include/gcc-9/openacc.h				comp-gcc-include	obsolete
+./usr/include/gcc-9/sanitizer/allocator_interface.h	comp-gcc-include	obsolete
+./usr/include/gcc-9/sanitizer/asan_interface.h		comp-gcc-include	obsolete
+./usr/include/gcc-9/sanitizer/common_interface_defs.h	comp-gcc-include	obsolete
+./usr/include/gcc-9/sanitizer/lsan_interface.h		comp-gcc-include	obsolete
+./usr/include/gcc-9/sanitizer/netbsd_syscall_hooks.h	comp-gcc-include	obsolete
+./usr/include/gcc-9/sanitizer/tsan_interface.h		comp-gcc-include	obsolete
+./usr/include/gcc-9/sanitizer/tsan_interface_atomic.h	comp-gcc-include	obsolete
+./usr/include/gcc-9/stdatomic.h				comp-gcc-include	obsolete
 ./usr/include/gelf.h				comp-c-include
 ./usr/include/getopt.h				comp-c-include
 ./usr/include/glob.h				comp-c-include
@@ -3836,10 +3836,8 @@
 ./usr/lib/libamu_p.a				comp-obsolete		obsolete
 ./usr/lib/libarchive.a				comp-c-lib		compatfile
 ./usr/lib/libarchive_p.a			comp-c-proflib		compatfile,profile
-./usr/lib/libasan.a				comp-c-lib		compatfile,cxx,gcc=10
-./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=10
-./usr/lib/libasan.a				comp-c-lib		compatfile,cxx,gcc=12
-./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=12
+./usr/lib/libasan.a				comp-c-lib		compatfile,cxx,gcc
+./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc
 ./usr/lib/libasn1.a				comp-krb5-lib		compatfile,kerberos
 ./usr/lib/libasn1_p.a				comp-krb5-proflib	compatfile,kerberos,profile
 ./usr/lib/libatf-c++.a				comp-atf-lib		compatfile,atf
@@ -3999,10 +3997,8 @@
 ./usr/lib/libldap_p.a				comp-ldap-proflib	compatfile,ldap,profile
 ./usr/lib/libldap_r.a				comp-ldap-lib		compatfile,ldap
 ./usr/lib/libldap_r_p.a				comp-ldap-proflib	compatfile,ldap,profile
-./usr/lib/liblsan.a				comp-c-lib		compatfile,cxx,gcc=10
-./usr/lib/liblsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=10
-./usr/lib/liblsan.a				comp-c-lib		compatfile,cxx,gcc=12
-./usr/lib/liblsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=12
+./usr/lib/liblsan.a				comp-c-lib		compatfile,cxx,gcc
+./usr/lib/liblsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc
 ./usr/lib/liblua.a				comp-c-lib		compatfile
 ./usr/lib/liblua_p.a				comp-c-proflib		compatfile,profile
 ./usr/lib/liblutok.a				comp-c-lib		compatfile,kyua
@@ -4345,18 +4341,10 @@
 ./usr/lib/libtpm_unseal_p.a			comp-c-proflib		compatfile,tpm,profile
 ./usr/lib/libtre.a				comp-c-lib		compatfile
 ./usr/lib/libtre_p.a				comp-c-proflib		compatfile,profile
-# NOTYET ./usr/lib/libtsan.a				comp-c-lib		arch64,cxx,gcc=12,machine=amd64
-# NOTYET ./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcc=12,machine=amd64
-./usr/lib/libtsan.a				comp-c-lib		arch64,cxx,gcc=10,machine=amd64
-./usr/lib/libtsan.a				comp-c-lib		arch64,cxx,gcc=9,machine=amd64
-./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcc=10,machine=amd64
-./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcc=9,machine=amd64
 ./usr/lib/libtspi.a				comp-c-lib		compatfile,tpm
 ./usr/lib/libtspi_p.a				comp-c-proflib		compatfile,tpm,profile
-./usr/lib/libubsan.a				comp-c-lib		compatfile,cxx,gcc=10
-./usr/lib/libubsan.a				comp-c-lib		compatfile,cxx,gcc=12
-./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=12
-./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=10
+./usr/lib/libubsan.a				comp-c-lib		compatfile,cxx,gcc
+./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc
 ./usr/lib/libukfs.a				comp-c-lib		compatfile,rump
 ./usr/lib/libukfs_p.a				comp-c-proflib		compatfile,rump,profile
 ./usr/lib/libumem.a				comp-zfs-lib		compatfile,zfs

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.352 src/distrib/sets/lists/comp/shl.mi:1.353
--- src/distrib/sets/lists/comp/shl.mi:1.352	Tue Aug  1 06:35:55 2023
+++ src/distrib/sets/lists/comp/shl.mi	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.352 2023/08/01 06:35:55 mrg Exp $
+# $NetBSD: shl.mi,v 1.353 2023/08/04 08:54:00 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7,7 +7,7 @@
 ./usr/lib/crtendS.o				comp-c-lib		compatfile
 ./usr/lib/libamu_pic.a				comp-obsolete		obsolete
 ./usr/lib/libarchive_pic.a			comp-c-piclib		compatfile,picinstall
-./usr/lib/libasan_pic.a				comp-c-piclib		compatfile,picinstall,cxx,gcc=10
+./usr/lib/libasan_pic.a				comp-c-piclib		compatfile,picinstall,cxx,gcc
 ./usr/lib/libasn1_pic.a				comp-c-piclib		compatfile,picinstall,kerberos
 ./usr/lib/libatf-c++_pic.a			comp-atf-piclib		compatfile,picinstall,atf
 ./usr/lib/libatf-c_pic.a			comp-atf-piclib		compatfile,picinstall,atf
@@ -91,7 +91,7 @@
 ./usr/lib/liblber_pic.a				comp-ldap-piclib	compatfile,picinstall,ldap
 ./usr/lib/libldap_pic.a				comp-ldap-piclib	compatfile,picinstall,ldap
 ./usr/lib/libldap_r_pic.a			comp-ldap-piclib	compatfile,picinstall,ldap
-./usr/lib/liblsan_pic.a				comp-c-piclib		compatfile,picinstall,cxx,gcc=10
+./usr/lib/liblsan_pic.a				comp-c-piclib		compatfile,picinstall,cxx,gcc
 ./usr/lib/liblua_pic.a				comp-c-piclib		compatfile,picinstall
 ./usr/lib/liblutok_pic.a			comp-c-piclib		compatfile,picinstall,kyua
 ./usr/lib/liblwres_pic.a			comp-obsolete		obsolete
@@ -283,7 +283,7 @@
 ./usr/lib/libtpm_unseal_pic.a			comp-tpm-lib		compatfile,picinstall,tpm
 ./usr/lib/libtre_pic.a				comp-c-piclib		compatfile,picinstall
 ./usr/lib/libtspi_pic.a				comp-c-piclib		compatfile,picinstall,tpm
-./usr/lib/libubsan_pic.a			comp-c-piclib		compatfile,picinstall,cxx,gcc=10
+./usr/lib/libubsan_pic.a			comp-c-piclib		compatfile,picinstall,cxx,gcc
 ./usr/lib/libukfs_pic.a				comp-c-piclib		compatfile,picinstall,rump
 ./usr/lib/libumem_pic.a				comp-zfs-piclib		compatfile,picinstall,zfs
 ./usr/lib/libunbound_pic.a			comp-c-piclib		compatfile,picinstall,unbound

Index: src/distrib/sets/lists/debug/ad.aarch64
diff -u src/distrib/sets/lists/debug/ad.aarch64:1.33 src/distrib/sets/lists/debug/ad.aarch64:1.34
--- src/distrib/sets/lists/debug/ad.aarch64:1.33	Mon Jun  7 17:11:17 2021
+++ src/distrib/sets/lists/debug/ad.aarch64	Fri Aug  4 08:54:00 2023
@@ -1,7 +1,8 @@
-# $NetBSD: ad.aarch64,v 1.33 2021/06/07 17:11:17 christos Exp $
+# $NetBSD: ad.aarch64,v 1.34 2023/08/04 08:54:00 mrg Exp $
 ./usr/lib/eabi/libarm_g.a					comp-sys-debug	debuglib,compat,llvm
 ./usr/lib/eabi/libc_vfp_g.a					comp-sys-debug	debuglib,compat,llvm
 ./usr/lib/eabihf/libarm_g.a					comp-sys-debug	debuglib,compat,llvm
+./usr/lib/libtsan_g.a						comp-c-debuglib	debuglib,arch64,cxx,gcc=12
 ./usr/lib/oabi/libarm_g.a					comp-obsolete		obsolete
 ./usr/lib/oabi/libc_vfp_g.a					comp-obsolete		obsolete
 ./usr/libdata/debug/lib/eabi					comp-sys-debug	compat,llvm
@@ -19,6 +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.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

Index: src/distrib/sets/lists/debug/md.amd64
diff -u src/distrib/sets/lists/debug/md.amd64:1.116 src/distrib/sets/lists/debug/md.amd64:1.117
--- src/distrib/sets/lists/debug/md.amd64:1.116	Sat Oct 16 07:01:03 2021
+++ src/distrib/sets/lists/debug/md.amd64	Fri Aug  4 08:54:00 2023
@@ -1,8 +1,9 @@
-# $NetBSD: md.amd64,v 1.116 2021/10/16 07:01:03 skrll Exp $
+# $NetBSD: md.amd64,v 1.117 2023/08/04 08:54:00 mrg 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
 ./usr/lib/i386/libiberty_g.a			comp-obsolete		obsolete
+./usr/lib/libtsan_g.a				comp-c-debuglib		compat,debuglib,arch64,cxx,gcc
 ./usr/lib/libx86_64_g.a				comp-c-debuglib		debuglib
 ./usr/libdata/debug/libexec/ld.elf_so-i386.debug	comp-sys-debug		debug,compat
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
@@ -11,8 +12,7 @@
 ./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/libtsan.so.2.0.debug		comp-sys-debug	debug,cxx,gcc
 ./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/mi
diff -u src/distrib/sets/lists/debug/mi:1.413 src/distrib/sets/lists/debug/mi:1.414
--- src/distrib/sets/lists/debug/mi:1.413	Thu Aug  3 13:13:05 2023
+++ src/distrib/sets/lists/debug/mi	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.413 2023/08/03 13:13:05 rin Exp $
+# $NetBSD: mi,v 1.414 2023/08/04 08:54:00 mrg Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib					comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -26,8 +26,7 @@
 ./usr/lib/i18n/libmapper_zone_g.a		comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libamu_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libarchive_g.a			comp-c-debuglib		debuglib,compatfile
-./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=10
-./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=12
+./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,compatfile,cxx
 ./usr/lib/libasn1_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libatf-c++_g.a			comp-c-debuglib		debuglib,compatfile,atf
 ./usr/lib/libatf-c_g.a				comp-c-debuglib		debuglib,compatfile,atf
@@ -101,8 +100,7 @@
 ./usr/lib/liblber_g.a				comp-c-debuglib		debuglib,ldap,compatfile
 ./usr/lib/libldap_g.a				comp-c-debuglib		debuglib,ldap,compatfile
 ./usr/lib/libldap_r_g.a				comp-c-debuglib		debuglib,ldap,compatfile
-./usr/lib/liblsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=10
-./usr/lib/liblsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=12
+./usr/lib/liblsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx
 ./usr/lib/liblua_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/liblwres_g.a				comp-obsolete		obsolete
 ./usr/lib/liblzf_g.a				comp-c-debuglib		debuglib,compatfile
@@ -268,12 +266,8 @@
 ./usr/lib/libterminfo_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libtpm_unseal_g.a			comp-c-debuglib		debuglib,compatfile,tpm
 ./usr/lib/libtre_g.a				comp-c-debuglib		debuglib,compatfile
-./usr/lib/libtsan_g.a				comp-c-debuglib		debuglib,arch64,cxx,gcc=9,machine=amd64
-./usr/lib/libtsan_g.a				comp-c-debuglib		debuglib,arch64,cxx,gcc=10,machine=amd64
-# NOTYET ./usr/lib/libtsan_g.a				comp-c-debuglib		debuglib,arch64,cxx,gcc=12,machine=amd64
 ./usr/lib/libtspi_g.a				comp-c-debuglib		debuglib,compatfile,tpm
-./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=10
-./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=12
+./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc
 ./usr/lib/libukfs_g.a				comp-c-debuglib		debuglib,compatfile,rump
 ./usr/lib/libumem_g.a				comp-c-debuglib		debuglib,compatfile,zfs
 ./usr/lib/libunbound_g.a			comp-c-debuglib		debuglib,compatfile,unbound

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.319 src/distrib/sets/lists/debug/shl.mi:1.320
--- src/distrib/sets/lists/debug/shl.mi:1.319	Thu Aug  3 15:07:07 2023
+++ src/distrib/sets/lists/debug/shl.mi	Fri Aug  4 08:54:00 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.319 2023/08/03 15:07:07 rin Exp $
+# $NetBSD: shl.mi,v 1.320 2023/08/04 08:54:00 mrg 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
@@ -71,6 +71,7 @@
 ./usr/libdata/debug/usr/lib/libarchive.so.4.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libasan.so.3.0.debug		comp-sys-debug	debug,compatfile,cxx,obsolete
 ./usr/libdata/debug/usr/lib/libasan.so.5.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=10
+./usr/libdata/debug/usr/lib/libasan.so.5.0.debug		comp-sys-debug	debug,compatfile,cxx,obsolete,gcc=12
 ./usr/libdata/debug/usr/lib/libasan.so.6.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=12
 ./usr/libdata/debug/usr/lib/libasn1.so.10.0.debug		comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libatf-c++.so.2.0.debug		comp-atf-debug	debug,compatfile,atf
@@ -162,6 +163,7 @@
 ./usr/libdata/debug/usr/lib/libldap_r.so.5.0.debug		comp-ldap-debug	debug,compatfile,ldap
 ./usr/libdata/debug/usr/lib/liblsan.so.1.0.debug		comp-sys-debug	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=10
+./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug		comp-sys-debug	debug,compatfile,cxx,obsolete,gcc=12
 ./usr/libdata/debug/usr/lib/liblsan.so.3.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=12
 ./usr/libdata/debug/usr/lib/liblua.so.6.1.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/liblutok.so.1.0.debug		comp-obsolete	debug,compatfile,obsolete
@@ -332,6 +334,7 @@
 ./usr/libdata/debug/usr/lib/libtre.so.0.8.debug			comp-sys-debug	debug,compatfile
 ./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=10
+./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug		comp-sys-debug	debug,compatfile,cxx,obsolete,gcc=12
 ./usr/libdata/debug/usr/lib/libubsan.so.5.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=12
 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug		comp-sys-debug	debug,compatfile,rump
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs

Reply via email to