Module Name:    src
Committed By:   mrg
Date:           Mon Jul  1 04:03:05 UTC 2024

Modified Files:
        src/distrib/sets/lists/base: ad.aarch64 md.amd64 shl.mi
        src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el
            ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
            md.sparc64
        src/distrib/sets/lists/base64: ad.mips64eb ad.mips64el
        src/distrib/sets/lists/comp: ad.aarch64 md.amd64 mi shl.mi
        src/distrib/sets/lists/debug: ad.aarch64 md.amd64 mi shl.mi
        src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
            ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
            md.sparc64
        src/distrib/sets/lists/debug64: ad.mips64eb ad.mips64el
        src/external/gpl3/gcc/lib: Makefile
        src/lib: Makefile

Log Message:
GCC sanitizers: only build the sanitizers if $MKGCCCMDS != "no".

there's a minor use-case for the configuration of "building sanitizers
for distribution, but not the compiler", but it's pretty uncommon, and
the latest sanitizers don't build at all on m68000 so enhance the
option to not build /usr/bin/gcc (which simply can't modern GCC on a
sun2) to not build the sanitizers either.

(if we were to split these, MKGCCSANITIZER would be good variable.)

update set lists for far too many files, including fixing MKDEBUG for
a couple of builds.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.297 -r1.298 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.981 -r1.982 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base32/ad.aarch64 \
    src/distrib/sets/lists/base32/ad.mips64el \
    src/distrib/sets/lists/base32/ad.riscv64 \
    src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base32/ad.mips64eb \
    src/distrib/sets/lists/base32/ad.powerpc64
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/base32/ad.mipsn64eb \
    src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base64/ad.mips64eb \
    src/distrib/sets/lists/base64/ad.mips64el
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/ad.aarch64
cvs rdiff -u -r1.301 -r1.302 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.2460 -r1.2461 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.354 -r1.355 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.435 -r1.436 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.342 -r1.343 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug32/ad.aarch64 \
    src/distrib/sets/lists/debug32/ad.mips64eb \
    src/distrib/sets/lists/debug32/ad.mips64el
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/debug32/ad.mipsn64eb \
    src/distrib/sets/lists/debug32/ad.mipsn64el
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/debug32/ad.powerpc64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/debug32/ad.riscv64 \
    src/distrib/sets/lists/debug32/md.sparc64
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/debug32/md.amd64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug64/ad.mips64eb \
    src/distrib/sets/lists/debug64/ad.mips64el
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/gcc/lib/Makefile
cvs rdiff -u -r1.299 -r1.300 src/lib/Makefile

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.46 src/distrib/sets/lists/base/ad.aarch64:1.47
--- src/distrib/sets/lists/base/ad.aarch64:1.46	Tue Apr  9 15:17:22 2024
+++ src/distrib/sets/lists/base/ad.aarch64	Mon Jul  1 04:03:04 2024
@@ -1,11 +1,11 @@
-# $NetBSD: ad.aarch64,v 1.46 2024/04/09 15:17:22 nia Exp $
+# $NetBSD: ad.aarch64,v 1.47 2024/07/01 04:03:04 mrg Exp $
 ./lib/oabi					base-obsolete		obsolete
 ./lib/oabi/npf					base-obsolete		obsolete
 ./libexec/ld.elf_so-oabi			base-obsolete		obsolete
 ./usr/lib/eabi/lua/5.3				base-obsolete		obsolete
-./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/libtsan.so				base-sys-shlib		cxx,gcccmds,gcc=12
+./usr/lib/libtsan.so.2				base-sys-shlib		cxx,gcccmds,gcc=12
+./usr/lib/libtsan.so.2.0			base-sys-shlib		cxx,gcccmds,gcc=12
 ./usr/lib/eabihf/lua/5.3			base-obsolete		obsolete
 ./usr/lib/oabi					base-obsolete		obsolete
 ./usr/lib/oabi/i18n				base-obsolete		obsolete

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.297 src/distrib/sets/lists/base/md.amd64:1.298
--- src/distrib/sets/lists/base/md.amd64:1.297	Tue Apr  9 15:17:22 2024
+++ src/distrib/sets/lists/base/md.amd64	Mon Jul  1 04:03:04 2024
@@ -1,14 +1,14 @@
-# $NetBSD: md.amd64,v 1.297 2024/04/09 15:17:22 nia Exp $
+# $NetBSD: md.amd64,v 1.298 2024/07/01 04:03:04 mrg Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./usr/bin/fdformat				base-util-bin
 ./usr/bin/gdbserver				base-util-bin		gdb
 ./usr/bin/pmc					base-obsolete		obsolete
-./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.2				base-sys-shlib		cxx,gcc=12
-./usr/lib/libtsan.so.2.0			base-sys-shlib		cxx,gcc=12
+./usr/lib/libtsan.so				base-sys-shlib		cxx,gcccmds,gcc
+./usr/lib/libtsan.so.1				base-sys-shlib		cxx,gcccmds,gcc=10
+./usr/lib/libtsan.so.1.0			base-sys-shlib		cxx,gcccmds,gcc=10
+./usr/lib/libtsan.so.2				base-sys-shlib		cxx,gcccmds,gcc=12
+./usr/lib/libtsan.so.2.0			base-sys-shlib		cxx,gcccmds,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.981 src/distrib/sets/lists/base/shl.mi:1.982
--- src/distrib/sets/lists/base/shl.mi:1.981	Mon Jun 10 07:47:06 2024
+++ src/distrib/sets/lists/base/shl.mi	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.981 2024/06/10 07:47:06 kre Exp $
+# $NetBSD: shl.mi,v 1.982 2024/07/01 04:03:04 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -208,11 +208,11 @@
 ./usr/lib/libarchive.so				base-sys-shlib
 ./usr/lib/libarchive.so.5			base-sys-shlib
 ./usr/lib/libarchive.so.5.1			base-sys-shlib
-./usr/lib/libasan.so				base-sys-shlib		cxx,gcc
-./usr/lib/libasan.so.5				base-sys-shlib		cxx,gcc=10
-./usr/lib/libasan.so.5.0			base-sys-shlib		cxx,gcc=10
-./usr/lib/libasan.so.6				base-sys-shlib		cxx,gcc=12
-./usr/lib/libasan.so.6.0			base-sys-shlib		cxx,gcc=12
+./usr/lib/libasan.so				base-sys-shlib		cxx,gcccmds
+./usr/lib/libasan.so.5				base-sys-shlib		cxx,gcccmds,gcc=10
+./usr/lib/libasan.so.5.0			base-sys-shlib		cxx,gccgcccmds,=10
+./usr/lib/libasan.so.6				base-sys-shlib		cxx,gcccmds,gcc=12
+./usr/lib/libasan.so.6.0			base-sys-shlib		cxx,gcccmds,gcc=12
 ./usr/lib/libasn1.so				base-krb5-shlib		kerberos
 ./usr/lib/libasn1.so.10				base-krb5-shlib		kerberos
 ./usr/lib/libasn1.so.10.0			base-krb5-shlib		kerberos
@@ -424,11 +424,11 @@
 ./usr/lib/libldap_r.so				base-ldap-shlib		ldap
 ./usr/lib/libldap_r.so.6			base-ldap-shlib		ldap
 ./usr/lib/libldap_r.so.6.0			base-ldap-shlib		ldap
-./usr/lib/liblsan.so				base-sys-shlib		cxx,gcc
-./usr/lib/liblsan.so.2				base-sys-shlib		cxx,gcc=10
-./usr/lib/liblsan.so.2.0			base-sys-shlib		cxx,gcc=10
-./usr/lib/liblsan.so.3				base-sys-shlib		cxx,gcc=12
-./usr/lib/liblsan.so.3.0			base-sys-shlib		cxx,gcc=12
+./usr/lib/liblsan.so				base-sys-shlib		cxx,gcccmds,gcc
+./usr/lib/liblsan.so.2				base-sys-shlib		cxx,gcccmds,gcc=10
+./usr/lib/liblsan.so.2.0			base-sys-shlib		cxx,gcccmds,gcc=10
+./usr/lib/liblsan.so.3				base-sys-shlib		cxx,gcccmds,gcc=12
+./usr/lib/liblsan.so.3.0			base-sys-shlib		cxx,gcccmds,gcc=12
 ./usr/lib/liblua.so				base-sys-shlib
 ./usr/lib/liblua.so.6				base-sys-shlib
 ./usr/lib/liblua.so.6.1				base-sys-shlib
@@ -908,11 +908,11 @@
 ./usr/lib/libtspi.so				base-sys-shlib		tpm
 ./usr/lib/libtspi.so.4				base-sys-shlib		tpm
 ./usr/lib/libtspi.so.4.0			base-sys-shlib		tpm
-./usr/lib/libubsan.so				base-sys-shlib		cxx,gcc
-./usr/lib/libubsan.so.4				base-sys-shlib		cxx,gcc=10
-./usr/lib/libubsan.so.4.0			base-sys-shlib		cxx,gcc=10
-./usr/lib/libubsan.so.5				base-sys-shlib		cxx,gcc=12
-./usr/lib/libubsan.so.5.0			base-sys-shlib		cxx,gcc=12
+./usr/lib/libubsan.so				base-sys-shlib		cxx,gcccmds,gcc
+./usr/lib/libubsan.so.4				base-sys-shlib		cxx,gcccmds,gcc=10
+./usr/lib/libubsan.so.4.0			base-sys-shlib		cxx,gcccmds,gcc=10
+./usr/lib/libubsan.so.5				base-sys-shlib		cxx,gcccmds,gcc=12
+./usr/lib/libubsan.so.5.0			base-sys-shlib		cxx,gcccmds,gcc=12
 ./usr/lib/libukfs.so				base-sys-shlib		rump
 ./usr/lib/libukfs.so.1				base-sys-shlib		rump
 ./usr/lib/libukfs.so.1.0			base-sys-shlib		rump

Index: src/distrib/sets/lists/base32/ad.aarch64
diff -u src/distrib/sets/lists/base32/ad.aarch64:1.8 src/distrib/sets/lists/base32/ad.aarch64:1.9
--- src/distrib/sets/lists/base32/ad.aarch64:1.8	Mon Jun 10 07:57:10 2024
+++ src/distrib/sets/lists/base32/ad.aarch64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.8 2024/06/10 07:57:10 kre Exp $
+# $NetBSD: ad.aarch64,v 1.9 2024/07/01 04:03:04 mrg Exp $
 ./lib/eabi					base-compat-shlib	compat
 ./lib/eabi/npf					base-compat-shlib	compat,npf
 ./lib/eabi/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -102,9 +102,9 @@
 ./usr/lib/eabi/libarm.so			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libarm.so.0			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libarm.so.0.0			base-compat-shlib	compat,pic
-./usr/lib/eabi/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/eabi/libasan.so.5			base-compat-shlib	compat,gcc,cxx
-./usr/lib/eabi/libasan.so.5.0			base-compat-shlib	compat,gcc,cxx
+./usr/lib/eabi/libasan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/eabi/libasan.so.5			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/eabi/libasan.so.5.0			base-compat-shlib	compat,gcccmds,gcc,cxx
 ./usr/lib/eabi/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/eabi/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/eabi/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -293,9 +293,9 @@
 ./usr/lib/eabi/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/eabi/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/eabi/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/eabi/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/eabi/liblsan.so.2			base-compat-shlib	compat,cxx,gcc
-./usr/lib/eabi/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc
+./usr/lib/eabi/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/eabi/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/eabi/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc
 ./usr/lib/eabi/liblua.so			base-compat-shlib	compat
 ./usr/lib/eabi/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/eabi/liblua.so.6.1			base-compat-shlib	compat
@@ -455,9 +455,9 @@
 ./usr/lib/eabi/libtre.so			base-compat-shlib	compat
 ./usr/lib/eabi/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/eabi/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/eabi/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/eabi/libubsan.so.4			base-compat-shlib	compat,gcc,cxx
-./usr/lib/eabi/libubsan.so.4.0			base-compat-shlib	compat,gcc,cxx
+./usr/lib/eabi/libubsan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/eabi/libubsan.so.4			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/eabi/libubsan.so.4.0			base-compat-shlib	compat,gcccmds,gcc,cxx
 ./usr/lib/eabi/libukfs.so			base-compat-shlib	compat
 ./usr/lib/eabi/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/eabi/libukfs.so.1.0			base-compat-shlib	compat
@@ -616,9 +616,9 @@
 ./usr/lib/eabihf/libarm.so			base-compat-shlib	compat,pic
 ./usr/lib/eabihf/libarm.so.0			base-compat-shlib	compat,pic
 ./usr/lib/eabihf/libarm.so.0.0			base-compat-shlib	compat,pic
-./usr/lib/eabihf/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/eabihf/libasan.so.5			base-compat-shlib	compat,gcc,cxx
-./usr/lib/eabihf/libasan.so.5.0			base-compat-shlib	compat,gcc,cxx
+./usr/lib/eabihf/libasan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/eabihf/libasan.so.5			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/eabihf/libasan.so.5.0			base-compat-shlib	compat,gcccmds,gcc,cxx
 ./usr/lib/eabihf/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/eabihf/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/eabihf/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -804,9 +804,9 @@
 ./usr/lib/eabihf/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/eabihf/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/eabihf/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/eabihf/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/eabihf/liblsan.so.2			base-compat-shlib	compat,cxx,gcc
-./usr/lib/eabihf/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc
+./usr/lib/eabihf/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/eabihf/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/eabihf/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc
 ./usr/lib/eabihf/liblua.so			base-compat-shlib	compat
 ./usr/lib/eabihf/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/eabihf/liblua.so.6.1			base-compat-shlib	compat
@@ -966,9 +966,9 @@
 ./usr/lib/eabihf/libtre.so			base-compat-shlib	compat
 ./usr/lib/eabihf/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/eabihf/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/eabihf/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/eabihf/libubsan.so.4			base-compat-shlib	compat,gcc,cxx
-./usr/lib/eabihf/libubsan.so.4.0			base-compat-shlib	compat,gcc,cxx
+./usr/lib/eabihf/libubsan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/eabihf/libubsan.so.4			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/eabihf/libubsan.so.4.0			base-compat-shlib	compat,gcccmds,gcc,cxx
 ./usr/lib/eabihf/libukfs.so			base-compat-shlib	compat
 ./usr/lib/eabihf/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/eabihf/libukfs.so.1.0			base-compat-shlib	compat
Index: src/distrib/sets/lists/base32/ad.mips64el
diff -u src/distrib/sets/lists/base32/ad.mips64el:1.8 src/distrib/sets/lists/base32/ad.mips64el:1.9
--- src/distrib/sets/lists/base32/ad.mips64el:1.8	Sun Jun 23 18:29:14 2024
+++ src/distrib/sets/lists/base32/ad.mips64el	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.8 2024/06/23 18:29:14 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.9 2024/07/01 04:03:04 mrg Exp $
 ./lib/64					base-compat-shlib	compat
 ./lib/o32					base-compat-shlib	compat
 ./lib/o32/npf					base-compat-shlib	compat,npf
@@ -90,11 +90,11 @@
 ./usr/lib/o32/libarchive.so			base-compat-shlib	compat
 ./usr/lib/o32/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/o32/libarchive.so.5.1			base-compat-shlib	compat
-./usr/lib/o32/libasan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/libasan.so.5			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libasan.so.6			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/libasan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/libasan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libasan.so.6			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/o32/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/o32/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -278,11 +278,11 @@
 ./usr/lib/o32/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/o32/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/o32/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/o32/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/liblua.so			base-compat-shlib	compat
 ./usr/lib/o32/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/o32/liblua.so.6.1			base-compat-shlib	compat
@@ -443,11 +443,11 @@
 ./usr/lib/o32/libtre.so			base-compat-shlib	compat
 ./usr/lib/o32/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/o32/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/o32/libubsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/libubsan.so.4			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libubsan.so.5			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/libubsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/libubsan.so.4			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libubsan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/libukfs.so			base-compat-shlib	compat
 ./usr/lib/o32/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/o32/libukfs.so.1.0			base-compat-shlib	compat
Index: src/distrib/sets/lists/base32/ad.riscv64
diff -u src/distrib/sets/lists/base32/ad.riscv64:1.8 src/distrib/sets/lists/base32/ad.riscv64:1.9
--- src/distrib/sets/lists/base32/ad.riscv64:1.8	Mon Jun 10 07:57:10 2024
+++ src/distrib/sets/lists/base32/ad.riscv64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv64,v 1.8 2024/06/10 07:57:10 kre Exp $
+# $NetBSD: ad.riscv64,v 1.9 2024/07/01 04:03:04 mrg Exp $
 ./lib/rv32					base-compat-shlib	compat
 ./lib/rv32/npf					base-compat-shlib	compat,npf
 ./lib/rv32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -87,11 +87,11 @@
 ./usr/lib/rv32/libarchive.so			base-compat-shlib	compat
 ./usr/lib/rv32/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/rv32/libarchive.so.5.1		base-compat-shlib	compat
-./usr/lib/rv32/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/rv32/libasan.so.5			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/rv32/libasan.so.5.0			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/rv32/libasan.so.6			base-compat-shlib	compat,gcc=12,cxx
-./usr/lib/rv32/libasan.so.6.0			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/rv32/libasan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/rv32/libasan.so.5			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/rv32/libasan.so.5.0			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/rv32/libasan.so.6			base-compat-shlib	compat,gcccmds,gcc=12,cxx
+./usr/lib/rv32/libasan.so.6.0			base-compat-shlib	compat,gcccmds,gcc=12,cxx
 ./usr/lib/rv32/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/rv32/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/rv32/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -273,11 +273,11 @@
 ./usr/lib/rv32/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/rv32/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/rv32/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/rv32/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/rv32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/rv32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/rv32/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/rv32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/rv32/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/rv32/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/rv32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/rv32/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/rv32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/rv32/liblua.so			base-compat-shlib	compat
 ./usr/lib/rv32/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/rv32/liblua.so.6.1			base-compat-shlib	compat
@@ -438,11 +438,11 @@
 ./usr/lib/rv32/libtre.so			base-compat-shlib	compat
 ./usr/lib/rv32/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/rv32/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/rv32/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/rv32/libubsan.so.4			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/rv32/libubsan.so.4.0			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/rv32/libubsan.so.5			base-compat-shlib	compat,gcc=12,cxx
-./usr/lib/rv32/libubsan.so.5.0			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/rv32/libubsan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/rv32/libubsan.so.4			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/rv32/libubsan.so.4.0			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/rv32/libubsan.so.5			base-compat-shlib	compat,gcccmds,gcc=12,cxx
+./usr/lib/rv32/libubsan.so.5.0			base-compat-shlib	compat,gcccmds,gcc=12,cxx
 ./usr/lib/rv32/libukfs.so			base-compat-shlib	compat
 ./usr/lib/rv32/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/rv32/libukfs.so.1.0			base-compat-shlib	compat
Index: src/distrib/sets/lists/base32/md.sparc64
diff -u src/distrib/sets/lists/base32/md.sparc64:1.8 src/distrib/sets/lists/base32/md.sparc64:1.9
--- src/distrib/sets/lists/base32/md.sparc64:1.8	Mon Jun 10 07:57:10 2024
+++ src/distrib/sets/lists/base32/md.sparc64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.8 2024/06/10 07:57:10 kre Exp $
+# $NetBSD: md.sparc64,v 1.9 2024/07/01 04:03:04 mrg Exp $
 ./lib/sparc					base-compat-shlib	compat
 ./lib/sparc/npf					base-compat-shlib	compat,npf
 ./lib/sparc/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -87,11 +87,11 @@
 ./usr/lib/sparc/libarchive.so			base-compat-shlib	compat
 ./usr/lib/sparc/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/sparc/libarchive.so.5.1		base-compat-shlib	compat
-./usr/lib/sparc/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/sparc/libasan.so.5			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/sparc/libasan.so.5.0			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/sparc/libasan.so.6			base-compat-shlib	compat,gcc=12,cxx
-./usr/lib/sparc/libasan.so.6.0			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/sparc/libasan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/sparc/libasan.so.5			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/sparc/libasan.so.5.0			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/sparc/libasan.so.6			base-compat-shlib	compat,gcccmds,gcc=12,cxx
+./usr/lib/sparc/libasan.so.6.0			base-compat-shlib	compat,gcccmds,gcc=12,cxx
 ./usr/lib/sparc/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/sparc/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/sparc/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -275,11 +275,11 @@
 ./usr/lib/sparc/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/sparc/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/sparc/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/sparc/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/sparc/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/sparc/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/sparc/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/sparc/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/sparc/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/sparc/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/sparc/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/sparc/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/sparc/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/sparc/liblua.so			base-compat-shlib	compat
 ./usr/lib/sparc/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/sparc/liblua.so.6.1			base-compat-shlib	compat
@@ -440,11 +440,11 @@
 ./usr/lib/sparc/libtre.so			base-compat-shlib	compat
 ./usr/lib/sparc/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/sparc/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/sparc/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/sparc/libubsan.so.4			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/sparc/libubsan.so.4.0			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/sparc/libubsan.so.5			base-compat-shlib	compat,gcc=12,cxx
-./usr/lib/sparc/libubsan.so.5.0			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/sparc/libubsan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/sparc/libubsan.so.4			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/sparc/libubsan.so.4.0			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/sparc/libubsan.so.5			base-compat-shlib	compat,gcccmds,gcc=12,cxx
+./usr/lib/sparc/libubsan.so.5.0			base-compat-shlib	compat,gcccmds,gcc=12,cxx
 ./usr/lib/sparc/libukfs.so			base-compat-shlib	compat,rump
 ./usr/lib/sparc/libukfs.so.1			base-compat-shlib	compat,rump
 ./usr/lib/sparc/libukfs.so.1.0			base-compat-shlib	compat,rump

Index: src/distrib/sets/lists/base32/ad.mips64eb
diff -u src/distrib/sets/lists/base32/ad.mips64eb:1.7 src/distrib/sets/lists/base32/ad.mips64eb:1.8
--- src/distrib/sets/lists/base32/ad.mips64eb:1.7	Sun Jun 23 18:29:14 2024
+++ src/distrib/sets/lists/base32/ad.mips64eb	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.7 2024/06/23 18:29:14 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.8 2024/07/01 04:03:04 mrg Exp $
 ./lib/64					base-compat-shlib	compat
 ./lib/o32					base-compat-shlib	compat
 ./lib/o32/npf					base-compat-shlib	compat,npf
@@ -90,11 +90,11 @@
 ./usr/lib/o32/libarchive.so			base-compat-shlib	compat
 ./usr/lib/o32/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/o32/libarchive.so.5.1			base-compat-shlib	compat
-./usr/lib/o32/libasan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/libasan.so.5			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libasan.so.6			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/libasan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/libasan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libasan.so.6			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/o32/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/o32/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -278,11 +278,11 @@
 ./usr/lib/o32/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/o32/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/o32/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/o32/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/liblua.so			base-compat-shlib	compat
 ./usr/lib/o32/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/o32/liblua.so.6.1			base-compat-shlib	compat
@@ -443,11 +443,11 @@
 ./usr/lib/o32/libtre.so			base-compat-shlib	compat
 ./usr/lib/o32/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/o32/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/o32/libubsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/libubsan.so.4			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libubsan.so.5			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/libubsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/libubsan.so.4			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libubsan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/libukfs.so			base-compat-shlib	compat
 ./usr/lib/o32/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/o32/libukfs.so.1.0			base-compat-shlib	compat
Index: src/distrib/sets/lists/base32/ad.powerpc64
diff -u src/distrib/sets/lists/base32/ad.powerpc64:1.7 src/distrib/sets/lists/base32/ad.powerpc64:1.8
--- src/distrib/sets/lists/base32/ad.powerpc64:1.7	Mon Jun 10 07:57:10 2024
+++ src/distrib/sets/lists/base32/ad.powerpc64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc64,v 1.7 2024/06/10 07:57:10 kre Exp $
+# $NetBSD: ad.powerpc64,v 1.8 2024/07/01 04:03:04 mrg Exp $
 ./lib/powerpc					base-compat-shlib	compat
 ./lib/powerpc/npf					base-compat-shlib	compat,npf
 ./lib/powerpc/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -87,11 +87,11 @@
 ./usr/lib/powerpc/libarchive.so			base-compat-shlib	compat
 ./usr/lib/powerpc/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/powerpc/libarchive.so.5.1		base-compat-shlib	compat
-./usr/lib/powerpc/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/powerpc/libasan.so.5			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/powerpc/libasan.so.5.0			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/powerpc/libasan.so.6			base-compat-shlib	compat,gcc=12,cxx
-./usr/lib/powerpc/libasan.so.6.0			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/powerpc/libasan.so			base-compat-shlib	compat,gcc,gcccmds,cxx
+./usr/lib/powerpc/libasan.so.5			base-compat-shlib	compat,gcc=10,gcccmds,cxx
+./usr/lib/powerpc/libasan.so.5.0			base-compat-shlib	compat,gcc=10,gcccmds,cxx
+./usr/lib/powerpc/libasan.so.6			base-compat-shlib	compat,gcc=12,gcccmds,cxx
+./usr/lib/powerpc/libasan.so.6.0			base-compat-shlib	compat,gcc=12,gcccmds,cxx
 ./usr/lib/powerpc/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/powerpc/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/powerpc/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -272,11 +272,11 @@
 ./usr/lib/powerpc/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/powerpc/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/powerpc/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/powerpc/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/powerpc/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/powerpc/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/powerpc/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/powerpc/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/powerpc/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/powerpc/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/powerpc/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/powerpc/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/powerpc/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/powerpc/liblua.so			base-compat-shlib	compat
 ./usr/lib/powerpc/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/powerpc/liblua.so.6.1			base-compat-shlib	compat
@@ -437,11 +437,11 @@
 ./usr/lib/powerpc/libtre.so			base-compat-shlib	compat
 ./usr/lib/powerpc/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/powerpc/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/powerpc/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/powerpc/libubsan.so.4			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/powerpc/libubsan.so.4.0			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/powerpc/libubsan.so.5			base-compat-shlib	compat,gcc=12,cxx
-./usr/lib/powerpc/libubsan.so.5.0			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/powerpc/libubsan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/powerpc/libubsan.so.4			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/powerpc/libubsan.so.4.0			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/powerpc/libubsan.so.5			base-compat-shlib	compat,gcccmds,gcc=12,cxx
+./usr/lib/powerpc/libubsan.so.5.0			base-compat-shlib	compat,gcccmds,gcc=12,cxx
 ./usr/lib/powerpc/libukfs.so			base-compat-shlib	compat
 ./usr/lib/powerpc/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/powerpc/libukfs.so.1.0			base-compat-shlib	compat

Index: src/distrib/sets/lists/base32/ad.mipsn64eb
diff -u src/distrib/sets/lists/base32/ad.mipsn64eb:1.11 src/distrib/sets/lists/base32/ad.mipsn64eb:1.12
--- src/distrib/sets/lists/base32/ad.mipsn64eb:1.11	Sun Jun 23 20:06:51 2024
+++ src/distrib/sets/lists/base32/ad.mipsn64eb	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64eb,v 1.11 2024/06/23 20:06:51 mrg Exp $
+# $NetBSD: ad.mipsn64eb,v 1.12 2024/07/01 04:03:04 mrg Exp $
 ./lib/n32					base-compat-shlib	compat
 ./lib/n32/npf					base-compat-shlib	compat,npf
 ./lib/n32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -99,11 +99,11 @@
 ./usr/lib/n32/libarchive.so			base-compat-shlib	compat
 ./usr/lib/n32/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/n32/libarchive.so.5.1			base-compat-shlib	compat
-./usr/lib/n32/libasan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/n32/libasan.so.5			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/libasan.so.6			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/n32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/n32/libasan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/n32/libasan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/libasan.so.6			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/n32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/n32/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/n32/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/n32/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -287,11 +287,11 @@
 ./usr/lib/n32/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/n32/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/n32/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/n32/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/n32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/n32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/n32/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/n32/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/n32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/n32/liblua.so			base-compat-shlib	compat
 ./usr/lib/n32/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/n32/liblua.so.6.1			base-compat-shlib	compat
@@ -452,11 +452,11 @@
 ./usr/lib/n32/libtre.so			base-compat-shlib	compat
 ./usr/lib/n32/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/n32/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/n32/libubsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/n32/libubsan.so.4			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/libubsan.so.5			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/n32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/n32/libubsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/n32/libubsan.so.4			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/libubsan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/n32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/n32/libukfs.so			base-compat-shlib	compat
 ./usr/lib/n32/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/n32/libukfs.so.1.0			base-compat-shlib	compat
@@ -612,11 +612,11 @@
 ./usr/lib/o32/libarchive.so			base-compat-shlib	compat
 ./usr/lib/o32/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/o32/libarchive.so.5.1			base-compat-shlib	compat
-./usr/lib/o32/libasan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/libasan.so.5			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libasan.so.6			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/libasan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/libasan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libasan.so.6			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/o32/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/o32/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -800,11 +800,11 @@
 ./usr/lib/o32/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/o32/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/o32/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/o32/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/liblua.so			base-compat-shlib	compat
 ./usr/lib/o32/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/o32/liblua.so.6.1			base-compat-shlib	compat
@@ -965,11 +965,11 @@
 ./usr/lib/o32/libtre.so			base-compat-shlib	compat
 ./usr/lib/o32/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/o32/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/o32/libubsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/libubsan.so.4			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libubsan.so.5			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/libubsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/libubsan.so.4			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libubsan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/libukfs.so			base-compat-shlib	compat
 ./usr/lib/o32/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/o32/libukfs.so.1.0			base-compat-shlib	compat
Index: src/distrib/sets/lists/base32/md.amd64
diff -u src/distrib/sets/lists/base32/md.amd64:1.11 src/distrib/sets/lists/base32/md.amd64:1.12
--- src/distrib/sets/lists/base32/md.amd64:1.11	Mon Jun 17 18:53:41 2024
+++ src/distrib/sets/lists/base32/md.amd64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.11 2024/06/17 18:53:41 riastradh Exp $
+# $NetBSD: md.amd64,v 1.12 2024/07/01 04:03:04 mrg Exp $
 ./lib/i386					base-compat-shlib	compat
 ./lib/i386/npf					base-compat-shlib	compat,npf
 ./lib/i386/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -87,11 +87,11 @@
 ./usr/lib/i386/libarchive.so			base-compat-shlib	compat
 ./usr/lib/i386/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/i386/libarchive.so.5.1		base-compat-shlib	compat
-./usr/lib/i386/libasan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/i386/libasan.so.5			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/i386/libasan.so.5.0			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/i386/libasan.so.6			base-compat-shlib	compat,gcc=12,cxx
-./usr/lib/i386/libasan.so.6.0			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/i386/libasan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/i386/libasan.so.5			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/i386/libasan.so.5.0			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/i386/libasan.so.6			base-compat-shlib	compat,gcccmds,gcc=12,cxx
+./usr/lib/i386/libasan.so.6.0			base-compat-shlib	compat,gcccmds,gcc=12,cxx
 ./usr/lib/i386/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/i386/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/i386/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -282,11 +282,11 @@
 ./usr/lib/i386/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/i386/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/i386/libldap_r.so.6.0			base-compat-shlib	compat,ldap
-./usr/lib/i386/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/i386/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/i386/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/i386/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/i386/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/i386/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/i386/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/i386/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/i386/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/i386/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/i386/liblua.so			base-compat-shlib	compat
 ./usr/lib/i386/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/i386/liblua.so.6.1			base-compat-shlib	compat
@@ -453,11 +453,11 @@
 ./usr/lib/i386/libtspi.so			base-compat-shlib	compat,tpm
 ./usr/lib/i386/libtspi.so.4			base-compat-shlib	compat,tpm
 ./usr/lib/i386/libtspi.so.4.0			base-compat-shlib	compat,tpm
-./usr/lib/i386/libubsan.so			base-compat-shlib	compat,gcc,cxx
-./usr/lib/i386/libubsan.so.4			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/i386/libubsan.so.4.0			base-compat-shlib	compat,gcc=10,cxx
-./usr/lib/i386/libubsan.so.5			base-compat-shlib	compat,gcc=12,cxx
-./usr/lib/i386/libubsan.so.5.0			base-compat-shlib	compat,gcc=12,cxx
+./usr/lib/i386/libubsan.so			base-compat-shlib	compat,gcccmds,gcc,cxx
+./usr/lib/i386/libubsan.so.4			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/i386/libubsan.so.4.0			base-compat-shlib	compat,gcccmds,gcc=10,cxx
+./usr/lib/i386/libubsan.so.5			base-compat-shlib	compat,gcccmds,gcc=12,cxx
+./usr/lib/i386/libubsan.so.5.0			base-compat-shlib	compat,gcccmds,gcc=12,cxx
 ./usr/lib/i386/libukfs.so			base-compat-shlib	compat,rump
 ./usr/lib/i386/libukfs.so.1			base-compat-shlib	compat,rump
 ./usr/lib/i386/libukfs.so.1.0			base-compat-shlib	compat,rump

Index: src/distrib/sets/lists/base32/ad.mipsn64el
diff -u src/distrib/sets/lists/base32/ad.mipsn64el:1.10 src/distrib/sets/lists/base32/ad.mipsn64el:1.11
--- src/distrib/sets/lists/base32/ad.mipsn64el:1.10	Sun Jun 23 20:06:51 2024
+++ src/distrib/sets/lists/base32/ad.mipsn64el	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64el,v 1.10 2024/06/23 20:06:51 mrg Exp $
+# $NetBSD: ad.mipsn64el,v 1.11 2024/07/01 04:03:04 mrg Exp $
 ./lib/n32					base-compat-shlib	compat
 ./lib/n32/npf					base-compat-shlib	compat,npf
 ./lib/n32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -99,11 +99,11 @@
 ./usr/lib/n32/libarchive.so			base-compat-shlib	compat
 ./usr/lib/n32/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/n32/libarchive.so.5.1			base-compat-shlib	compat
-./usr/lib/n32/libasan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/n32/libasan.so.5			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/libasan.so.6			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/n32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/n32/libasan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/n32/libasan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/libasan.so.6			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/n32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/n32/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/n32/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/n32/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -287,11 +287,11 @@
 ./usr/lib/n32/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/n32/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/n32/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/n32/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/n32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/n32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/n32/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/n32/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/n32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/n32/liblua.so			base-compat-shlib	compat
 ./usr/lib/n32/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/n32/liblua.so.6.1			base-compat-shlib	compat
@@ -452,11 +452,11 @@
 ./usr/lib/n32/libtre.so			base-compat-shlib	compat
 ./usr/lib/n32/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/n32/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/n32/libubsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/n32/libubsan.so.4			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/n32/libubsan.so.5			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/n32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/n32/libubsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/n32/libubsan.so.4			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/n32/libubsan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/n32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/n32/libukfs.so			base-compat-shlib	compat
 ./usr/lib/n32/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/n32/libukfs.so.1.0			base-compat-shlib	compat
@@ -612,11 +612,11 @@
 ./usr/lib/o32/libarchive.so			base-compat-shlib	compat
 ./usr/lib/o32/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/o32/libarchive.so.5.1			base-compat-shlib	compat
-./usr/lib/o32/libasan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/libasan.so.5			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libasan.so.6			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/libasan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/libasan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libasan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libasan.so.6			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/libasan.so.6.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/o32/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/o32/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -800,11 +800,11 @@
 ./usr/lib/o32/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/o32/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/o32/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/o32/liblsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/liblsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/liblua.so			base-compat-shlib	compat
 ./usr/lib/o32/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/o32/liblua.so.6.1			base-compat-shlib	compat
@@ -965,11 +965,11 @@
 ./usr/lib/o32/libtre.so			base-compat-shlib	compat
 ./usr/lib/o32/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/o32/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/o32/libubsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/o32/libubsan.so.4			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/o32/libubsan.so.5			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/o32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/o32/libubsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/o32/libubsan.so.4			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/o32/libubsan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/o32/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/o32/libukfs.so			base-compat-shlib	compat
 ./usr/lib/o32/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/o32/libukfs.so.1.0			base-compat-shlib	compat

Index: src/distrib/sets/lists/base64/ad.mips64eb
diff -u src/distrib/sets/lists/base64/ad.mips64eb:1.5 src/distrib/sets/lists/base64/ad.mips64eb:1.6
--- src/distrib/sets/lists/base64/ad.mips64eb:1.5	Sun Jun 23 18:29:14 2024
+++ src/distrib/sets/lists/base64/ad.mips64eb	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.5 2024/06/23 18:29:14 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.6 2024/07/01 04:03:04 mrg Exp $
 ./lib/64/npf					base-compat-shlib	compat,npf
 ./lib/64/npf/ext_log.so			base-compat-shlib	compat,npf
 ./lib/64/npf/ext_log.so.0			base-compat-shlib	compat,npf
@@ -84,11 +84,11 @@
 ./usr/lib/64/libarchive.so			base-compat-shlib	compat
 ./usr/lib/64/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/64/libarchive.so.5.1		base-compat-shlib	compat
-./usr/lib/64/libasan.so				base-compat-shlib	compat,cxx,gcc
-./usr/lib/64/libasan.so.5			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/libasan.so.5.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/libasan.so.6			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/64/libasan.so.6.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/64/libasan.so				base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/64/libasan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/libasan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/libasan.so.6			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/64/libasan.so.6.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/64/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/64/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/64/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -272,11 +272,11 @@
 ./usr/lib/64/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/64/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/64/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/64/liblsan.so				base-compat-shlib	compat,cxx,gcc
-./usr/lib/64/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/64/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/64/liblsan.so				base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/64/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/64/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/64/liblua.so			base-compat-shlib	compat
 ./usr/lib/64/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/64/liblua.so.6.1			base-compat-shlib	compat
@@ -437,11 +437,11 @@
 ./usr/lib/64/libtre.so			base-compat-shlib	compat
 ./usr/lib/64/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/64/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/64/libubsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/64/libubsan.so.4			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/libubsan.so.5			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/64/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/64/libubsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/64/libubsan.so.4			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/libubsan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/64/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/64/libukfs.so			base-compat-shlib	compat
 ./usr/lib/64/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/64/libukfs.so.1.0			base-compat-shlib	compat
Index: src/distrib/sets/lists/base64/ad.mips64el
diff -u src/distrib/sets/lists/base64/ad.mips64el:1.5 src/distrib/sets/lists/base64/ad.mips64el:1.6
--- src/distrib/sets/lists/base64/ad.mips64el:1.5	Sun Jun 23 18:29:14 2024
+++ src/distrib/sets/lists/base64/ad.mips64el	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.5 2024/06/23 18:29:14 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.6 2024/07/01 04:03:04 mrg Exp $
 ./lib/64/npf					base-compat-shlib	compat,npf
 ./lib/64/npf/ext_log.so			base-compat-shlib	compat,npf
 ./lib/64/npf/ext_log.so.0			base-compat-shlib	compat,npf
@@ -84,11 +84,11 @@
 ./usr/lib/64/libarchive.so			base-compat-shlib	compat
 ./usr/lib/64/libarchive.so.5			base-compat-shlib	compat
 ./usr/lib/64/libarchive.so.5.1		base-compat-shlib	compat
-./usr/lib/64/libasan.so				base-compat-shlib	compat,cxx,gcc
-./usr/lib/64/libasan.so.5			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/libasan.so.5.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/libasan.so.6			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/64/libasan.so.6.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/64/libasan.so				base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/64/libasan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/libasan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/libasan.so.6			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/64/libasan.so.6.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/64/libasn1.so			base-compat-shlib	compat,kerberos
 ./usr/lib/64/libasn1.so.10			base-compat-shlib	compat,kerberos
 ./usr/lib/64/libasn1.so.10.0			base-compat-shlib	compat,kerberos
@@ -272,11 +272,11 @@
 ./usr/lib/64/libldap_r.so			base-compat-shlib	compat,ldap
 ./usr/lib/64/libldap_r.so.6			base-compat-shlib	compat,ldap
 ./usr/lib/64/libldap_r.so.6.0		base-compat-shlib	compat,ldap
-./usr/lib/64/liblsan.so				base-compat-shlib	compat,cxx,gcc
-./usr/lib/64/liblsan.so.2			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/liblsan.so.3			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/64/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/64/liblsan.so				base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/64/liblsan.so.2			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/liblsan.so.2.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/liblsan.so.3			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/64/liblsan.so.3.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/64/liblua.so			base-compat-shlib	compat
 ./usr/lib/64/liblua.so.6			base-compat-shlib	compat
 ./usr/lib/64/liblua.so.6.1			base-compat-shlib	compat
@@ -437,11 +437,11 @@
 ./usr/lib/64/libtre.so			base-compat-shlib	compat
 ./usr/lib/64/libtre.so.0			base-compat-shlib	compat
 ./usr/lib/64/libtre.so.0.8			base-compat-shlib	compat
-./usr/lib/64/libubsan.so			base-compat-shlib	compat,cxx,gcc
-./usr/lib/64/libubsan.so.4			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcc=10
-./usr/lib/64/libubsan.so.5			base-compat-shlib	compat,cxx,gcc=12
-./usr/lib/64/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcc=12
+./usr/lib/64/libubsan.so			base-compat-shlib	compat,cxx,gcccmds,gcc
+./usr/lib/64/libubsan.so.4			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/libubsan.so.4.0			base-compat-shlib	compat,cxx,gcccmds,gcc=10
+./usr/lib/64/libubsan.so.5			base-compat-shlib	compat,cxx,gcccmds,gcc=12
+./usr/lib/64/libubsan.so.5.0			base-compat-shlib	compat,cxx,gcccmds,gcc=12
 ./usr/lib/64/libukfs.so			base-compat-shlib	compat
 ./usr/lib/64/libukfs.so.1			base-compat-shlib	compat
 ./usr/lib/64/libukfs.so.1.0			base-compat-shlib	compat

Index: src/distrib/sets/lists/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.53 src/distrib/sets/lists/comp/ad.aarch64:1.54
--- src/distrib/sets/lists/comp/ad.aarch64:1.53	Sat Jun 22 20:17:25 2024
+++ src/distrib/sets/lists/comp/ad.aarch64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.53 2024/06/22 20:17:25 riastradh Exp $
+# $NetBSD: ad.aarch64,v 1.54 2024/07/01 04:03:04 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
@@ -184,9 +184,9 @@
 ./usr/lib/eabihf/libarm.a				comp-c-lib		compat,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/libtsan.a				comp-c-lib		arch64,cxx,gcccmds,gcc=12
+./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcccmds,gcc=12
+./usr/lib/libtsan_pic.a				comp-c-piclib		compat,picinstall,cxx,gcccmds,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/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.301 src/distrib/sets/lists/comp/md.amd64:1.302
--- src/distrib/sets/lists/comp/md.amd64:1.301	Sat Jun 22 23:45:09 2024
+++ src/distrib/sets/lists/comp/md.amd64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.301 2024/06/22 23:45:09 mrg Exp $
+# $NetBSD: md.amd64,v 1.302 2024/07/01 04:03:04 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
@@ -1609,9 +1609,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.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/libtsan.a				comp-c-lib		arch64,cxx,gcccmds,gcc
+./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcccmds,gcc
+./usr/lib/libtsan_pic.a				comp-c-piclib		compat,picinstall,cxx,gcccmds,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/mi
diff -u src/distrib/sets/lists/comp/mi:1.2460 src/distrib/sets/lists/comp/mi:1.2461
--- src/distrib/sets/lists/comp/mi:1.2460	Sat Jun 22 21:30:51 2024
+++ src/distrib/sets/lists/comp/mi	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2460 2024/06/22 21:30:51 wiz Exp $
+#	$NetBSD: mi,v 1.2461 2024/07/01 04:03:04 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -3851,8 +3851,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
-./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc
+./usr/lib/libasan.a				comp-c-lib		compatfile,cxx,gcccmds,gcc
+./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,cxx,gcccmds,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
@@ -4012,8 +4012,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
-./usr/lib/liblsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc
+./usr/lib/liblsan.a				comp-c-lib		compatfile,cxx,gcccmds,gcc
+./usr/lib/liblsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcccmds,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
@@ -4358,8 +4358,8 @@
 ./usr/lib/libtre_p.a				comp-c-proflib		compatfile,profile
 ./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
-./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc
+./usr/lib/libubsan.a				comp-c-lib		compatfile,cxx,gcccmds,gcc
+./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcccmds,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.354 src/distrib/sets/lists/comp/shl.mi:1.355
--- src/distrib/sets/lists/comp/shl.mi:1.354	Mon Sep  4 21:36:31 2023
+++ src/distrib/sets/lists/comp/shl.mi	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.354 2023/09/04 21:36:31 riastradh Exp $
+# $NetBSD: shl.mi,v 1.355 2024/07/01 04:03:04 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
+./usr/lib/libasan_pic.a				comp-c-piclib		compatfile,picinstall,cxx,gcccmds,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
@@ -89,7 +89,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
+./usr/lib/liblsan_pic.a				comp-c-piclib		compatfile,picinstall,cxx,gcccmds,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
@@ -277,7 +277,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
+./usr/lib/libubsan_pic.a			comp-c-piclib		compatfile,picinstall,cxx,gcccmds,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.38 src/distrib/sets/lists/debug/ad.aarch64:1.39
--- src/distrib/sets/lists/debug/ad.aarch64:1.38	Tue Apr  9 15:17:23 2024
+++ src/distrib/sets/lists/debug/ad.aarch64	Mon Jul  1 04:03:04 2024
@@ -1,5 +1,5 @@
-# $NetBSD: ad.aarch64,v 1.38 2024/04/09 15:17:23 nia Exp $
-./usr/lib/libtsan_g.a						comp-c-debuglib	debuglib,arch64,cxx,gcc=12
-./usr/libdata/debug/usr/lib/libtsan.so.2.0.debug		comp-sys-debug	debug,cxx,gcc=12
+# $NetBSD: ad.aarch64,v 1.39 2024/07/01 04:03:04 mrg Exp $
+./usr/lib/libtsan_g.a						comp-c-debuglib	debuglib,arch64,cxx,gcccmds,gcc=12
+./usr/libdata/debug/usr/lib/libtsan.so.2.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/sbin/ofctl.debug			comp-util-debug		debug
 ./usr/libdata/debug/usr/sbin/tpctl.debug			comp-sysutil-debug	debug

Index: src/distrib/sets/lists/debug/md.amd64
diff -u src/distrib/sets/lists/debug/md.amd64:1.124 src/distrib/sets/lists/debug/md.amd64:1.125
--- src/distrib/sets/lists/debug/md.amd64:1.124	Tue Apr  9 15:17:23 2024
+++ src/distrib/sets/lists/debug/md.amd64	Mon Jul  1 04:03:04 2024
@@ -1,11 +1,11 @@
-# $NetBSD: md.amd64,v 1.124 2024/04/09 15:17:23 nia Exp $
-./usr/lib/libtsan_g.a				comp-c-debuglib		compat,debuglib,arch64,cxx,gcc
+# $NetBSD: md.amd64,v 1.125 2024/07/01 04:03:04 mrg Exp $
+./usr/lib/libtsan_g.a				comp-c-debuglib		compat,debuglib,arch64,cxx,gcccmds,gcc
 ./usr/lib/libx86_64_g.a				comp-c-debuglib		debuglib
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/gdbserver.debug	base-util-debug		gdb,debug
 ./usr/libdata/debug/usr/bin/pmc.debug		comp-obsolete		obsolete
-./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/libtsan.so.1.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/libtsan.so.2.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug	comp-sys-shlib		pic,debug
 ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait.debug	tests-obsolete	obsolete
 ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait3.debug	tests-obsolete	obsolete

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.435 src/distrib/sets/lists/debug/mi:1.436
--- src/distrib/sets/lists/debug/mi:1.435	Sun May  5 02:53:01 2024
+++ src/distrib/sets/lists/debug/mi	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.435 2024/05/05 02:53:01 riastradh Exp $
+# $NetBSD: mi,v 1.436 2024/07/01 04:03:04 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
@@ -26,7 +26,7 @@
 ./usr/lib/i18n/libmapper_zone_g.a		comp-c-debuglib		debuglib
 ./usr/lib/libamu_g.a				comp-c-debuglib		debuglib
 ./usr/lib/libarchive_g.a			comp-c-debuglib		debuglib
-./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,cxx,gcc
+./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,cxx,gcccmds,gcc
 ./usr/lib/libasn1_g.a				comp-c-debuglib		debuglib,kerberos
 ./usr/lib/libatf-c++_g.a			comp-c-debuglib		debuglib,atf
 ./usr/lib/libatf-c_g.a				comp-c-debuglib		debuglib,atf
@@ -98,7 +98,7 @@
 ./usr/lib/liblber_g.a				comp-c-debuglib		debuglib,ldap
 ./usr/lib/libldap_g.a				comp-c-debuglib		debuglib,ldap
 ./usr/lib/libldap_r_g.a				comp-c-debuglib		debuglib,ldap
-./usr/lib/liblsan_g.a				comp-c-debuglib		debuglib,cxx,gcc
+./usr/lib/liblsan_g.a				comp-c-debuglib		debuglib,cxx,gcccmds,gcc
 ./usr/lib/liblua_g.a				comp-c-debuglib		debuglib
 ./usr/lib/liblwres_g.a				comp-obsolete		obsolete
 ./usr/lib/liblzf_g.a				comp-c-debuglib		debuglib
@@ -265,7 +265,7 @@
 ./usr/lib/libtpm_unseal_g.a			comp-c-debuglib		debuglib,tpm
 ./usr/lib/libtre_g.a				comp-c-debuglib		debuglib
 ./usr/lib/libtspi_g.a				comp-c-debuglib		debuglib,tpm
-./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,cxx,gcc
+./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,cxx,gcccmds,gcc
 ./usr/lib/libukfs_g.a				comp-c-debuglib		debuglib,rump
 ./usr/lib/libumem_g.a				comp-c-debuglib		debuglib,zfs
 ./usr/lib/libunbound_g.a			comp-c-debuglib		debuglib,unbound

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.342 src/distrib/sets/lists/debug/shl.mi:1.343
--- src/distrib/sets/lists/debug/shl.mi:1.342	Mon Jun 10 07:47:06 2024
+++ src/distrib/sets/lists/debug/shl.mi	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.342 2024/06/10 07:47:06 kre Exp $
+# $NetBSD: shl.mi,v 1.343 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/libbfd_g.a						comp-c-debuglib	debuglib,binutils
 ./usr/lib/libgcc_eh_g.a				comp-c-debuglib		debuglib,gcc
 ./usr/lib/libgcc_s_g.a				comp-c-debuglib		debuglib,gcc
@@ -68,8 +68,8 @@
 ./usr/libdata/debug/usr/lib/i18n/libmapper_zone.so.5.0.debug	comp-i18n-debug	debug
 ./usr/libdata/debug/usr/lib/libamu.so.5.0.debug			comp-amd-debug	debug
 ./usr/libdata/debug/usr/lib/libarchive.so.5.1.debug		comp-sys-debug	debug
-./usr/libdata/debug/usr/lib/libasan.so.5.0.debug		comp-sys-debug	debug,cxx,gcc=10
-./usr/libdata/debug/usr/lib/libasan.so.6.0.debug		comp-sys-debug	debug,cxx,gcc=12
+./usr/libdata/debug/usr/lib/libasan.so.5.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/libasan.so.6.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/libasn1.so.10.0.debug		comp-krb5-debug	debug,kerberos
 ./usr/libdata/debug/usr/lib/libatf-c++.so.2.0.debug		comp-atf-debug	debug,atf
 ./usr/libdata/debug/usr/lib/libatf-c.so.0.0.debug		comp-atf-debug	debug,atf
@@ -142,8 +142,8 @@
 ./usr/libdata/debug/usr/lib/liblber.so.5.0.debug		comp-ldap-debug	debug,ldap
 ./usr/libdata/debug/usr/lib/libldap.so.6.0.debug		comp-ldap-debug	debug,ldap
 ./usr/libdata/debug/usr/lib/libldap_r.so.6.0.debug		comp-ldap-debug	debug,ldap
-./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug		comp-sys-debug	debug,cxx,gcc=10
-./usr/libdata/debug/usr/lib/liblsan.so.3.0.debug		comp-sys-debug	debug,cxx,gcc=12
+./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/liblsan.so.3.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/liblua.so.6.1.debug			comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/liblutok.so.3.0.debug		comp-kyua-debug	debug,kyua
 ./usr/libdata/debug/usr/lib/liblzf.so.1.0.debug			comp-sys-debug	debug
@@ -300,8 +300,8 @@
 ./usr/libdata/debug/usr/lib/libtpm_unseal.so.2.0.debug		comp-tpm-debug	debug,tpm
 ./usr/libdata/debug/usr/lib/libtre.so.0.8.debug			comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libtspi.so.4.0.debug		comp-tpm-debug	debug,tpm
-./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug		comp-sys-debug	debug,cxx,gcc=10
-./usr/libdata/debug/usr/lib/libubsan.so.5.0.debug		comp-sys-debug	debug,cxx,gcc=12
+./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/libubsan.so.5.0.debug		comp-sys-debug	debug,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug		comp-sys-debug	debug,rump
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug		comp-zfs-debug	debug,zfs
 ./usr/libdata/debug/usr/lib/libunbound.so.9.0.debug 		comp-net-debug	debug,unbound

Index: src/distrib/sets/lists/debug32/ad.aarch64
diff -u src/distrib/sets/lists/debug32/ad.aarch64:1.11 src/distrib/sets/lists/debug32/ad.aarch64:1.12
--- src/distrib/sets/lists/debug32/ad.aarch64:1.11	Tue Jun 25 01:00:51 2024
+++ src/distrib/sets/lists/debug32/ad.aarch64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.11 2024/06/25 01:00:51 mrg Exp $
+# $NetBSD: ad.aarch64,v 1.12 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/eabi/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/eabi/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/eabi/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/eabi/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/eabi/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/eabi/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/eabi/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/eabi/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/eabi/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/eabi/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/eabi/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/eabi/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/eabi/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/eabi/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/eabi/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabi/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/eabi/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/eabi/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/eabi/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/eabi/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/eabi/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -187,7 +187,7 @@
 ./usr/lib/eabihf/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabihf/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabihf/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/eabihf/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/eabihf/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/eabihf/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/eabihf/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/eabihf/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -256,7 +256,7 @@
 ./usr/lib/eabihf/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/eabihf/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/eabihf/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/eabihf/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/eabihf/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/eabihf/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabihf/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabihf/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -311,7 +311,7 @@
 ./usr/lib/eabihf/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/eabihf/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/eabihf/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/eabihf/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/eabihf/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/eabihf/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/eabihf/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/eabihf/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -359,7 +359,7 @@
 ./usr/libdata/debug/usr/lib/eabi/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libarm.so.0.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/eabi/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc,cxx
+./usr/libdata/debug/usr/lib/eabi/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc,gcccmds,cxx
 ./usr/libdata/debug/usr/lib/eabi/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/eabi/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -424,7 +424,7 @@
 ./usr/libdata/debug/usr/lib/eabi/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/eabi/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/eabi/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/eabi/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc
+./usr/libdata/debug/usr/lib/eabi/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc
 ./usr/libdata/debug/usr/lib/eabi/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -477,7 +477,7 @@
 ./usr/libdata/debug/usr/lib/eabi/libstdc++.so.9.0.debug	comp-sys-debug	debug,compat,gcc,cxx,libstdcxx
 ./usr/libdata/debug/usr/lib/eabi/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/eabi/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc,cxx
+./usr/libdata/debug/usr/lib/eabi/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc,gcccmds,cxx
 ./usr/libdata/debug/usr/lib/eabi/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabi/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/eabi/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound
@@ -540,7 +540,7 @@
 ./usr/libdata/debug/usr/lib/eabihf/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabihf/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabihf/libarm.so.0.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/eabihf/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc,cxx
+./usr/libdata/debug/usr/lib/eabihf/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc,gcccmds,cxx
 ./usr/libdata/debug/usr/lib/eabihf/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabihf/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/eabihf/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -604,7 +604,7 @@
 ./usr/libdata/debug/usr/lib/eabihf/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/eabihf/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/eabihf/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/eabihf/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc
+./usr/libdata/debug/usr/lib/eabihf/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc
 ./usr/libdata/debug/usr/lib/eabihf/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabihf/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabihf/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -657,7 +657,7 @@
 ./usr/libdata/debug/usr/lib/eabihf/libstdc++.so.9.0.debug	comp-sys-debug	debug,compat,gcc,cxx,libstdcxx
 ./usr/libdata/debug/usr/lib/eabihf/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabihf/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/eabihf/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc,cxx
+./usr/libdata/debug/usr/lib/eabihf/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc,gcccmds,cxx
 ./usr/libdata/debug/usr/lib/eabihf/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/eabihf/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/eabihf/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound
Index: src/distrib/sets/lists/debug32/ad.mips64eb
diff -u src/distrib/sets/lists/debug32/ad.mips64eb:1.11 src/distrib/sets/lists/debug32/ad.mips64eb:1.12
--- src/distrib/sets/lists/debug32/ad.mips64eb:1.11	Sun Jun 23 18:29:14 2024
+++ src/distrib/sets/lists/debug32/ad.mips64eb	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.11 2024/06/23 18:29:14 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.12 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/o32/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/o32/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/o32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/o32/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/o32/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/o32/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/o32/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/o32/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/o32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/o32/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/o32/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/o32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/o32/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/o32/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -192,8 +192,8 @@
 ./usr/libdata/debug/usr/lib/o32/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/o32/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -255,8 +255,8 @@
 ./usr/libdata/debug/usr/lib/o32/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/o32/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/o32/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/o32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -309,8 +309,8 @@
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,cxx,libstdcxx,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/o32/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound
Index: src/distrib/sets/lists/debug32/ad.mips64el
diff -u src/distrib/sets/lists/debug32/ad.mips64el:1.11 src/distrib/sets/lists/debug32/ad.mips64el:1.12
--- src/distrib/sets/lists/debug32/ad.mips64el:1.11	Sun Jun 23 18:29:14 2024
+++ src/distrib/sets/lists/debug32/ad.mips64el	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.11 2024/06/23 18:29:14 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.12 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/o32/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/o32/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/o32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/o32/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/o32/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/o32/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/o32/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/o32/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/o32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/o32/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/o32/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/o32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/o32/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/o32/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -192,8 +192,8 @@
 ./usr/libdata/debug/usr/lib/o32/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/o32/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -255,8 +255,8 @@
 ./usr/libdata/debug/usr/lib/o32/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/o32/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/o32/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/o32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -309,8 +309,8 @@
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,cxx,libstdcxx,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/o32/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound

Index: src/distrib/sets/lists/debug32/ad.mipsn64eb
diff -u src/distrib/sets/lists/debug32/ad.mipsn64eb:1.12 src/distrib/sets/lists/debug32/ad.mipsn64eb:1.13
--- src/distrib/sets/lists/debug32/ad.mipsn64eb:1.12	Sun Jun 23 20:06:51 2024
+++ src/distrib/sets/lists/debug32/ad.mipsn64eb	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64eb,v 1.12 2024/06/23 20:06:51 mrg Exp $
+# $NetBSD: ad.mipsn64eb,v 1.13 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/n32/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/n32/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/n32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/n32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/n32/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/n32/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/n32/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/n32/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/n32/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/n32/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/n32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/n32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/n32/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/n32/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/n32/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/n32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/n32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/n32/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/n32/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/n32/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -187,7 +187,7 @@
 ./usr/lib/o32/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/o32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/o32/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/o32/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -256,7 +256,7 @@
 ./usr/lib/o32/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/o32/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/o32/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/o32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -311,7 +311,7 @@
 ./usr/lib/o32/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/o32/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/o32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/o32/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/o32/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -358,8 +358,8 @@
 ./usr/libdata/debug/usr/lib/n32/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/n32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/n32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/n32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/n32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/n32/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/n32/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -421,8 +421,8 @@
 ./usr/libdata/debug/usr/lib/n32/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/n32/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/n32/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/n32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/n32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/n32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/n32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/n32/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -475,8 +475,8 @@
 ./usr/libdata/debug/usr/lib/n32/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,cxx,libstdcxx,gcc=12
 ./usr/libdata/debug/usr/lib/n32/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/n32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/n32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/n32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/n32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/n32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/n32/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound
@@ -538,8 +538,8 @@
 ./usr/libdata/debug/usr/lib/o32/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/o32/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -601,8 +601,8 @@
 ./usr/libdata/debug/usr/lib/o32/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/o32/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/o32/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/o32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -655,8 +655,8 @@
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,cxx,libstdcxx,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/o32/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound
Index: src/distrib/sets/lists/debug32/ad.mipsn64el
diff -u src/distrib/sets/lists/debug32/ad.mipsn64el:1.12 src/distrib/sets/lists/debug32/ad.mipsn64el:1.13
--- src/distrib/sets/lists/debug32/ad.mipsn64el:1.12	Sun Jun 23 20:06:51 2024
+++ src/distrib/sets/lists/debug32/ad.mipsn64el	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64el,v 1.12 2024/06/23 20:06:51 mrg Exp $
+# $NetBSD: ad.mipsn64el,v 1.13 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/n32/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/n32/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/n32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/n32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/n32/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/n32/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/n32/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/n32/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/n32/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/n32/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/n32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/n32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/n32/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/n32/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/n32/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/n32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/n32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/n32/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/n32/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/n32/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -187,7 +187,7 @@
 ./usr/lib/o32/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/o32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/o32/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/o32/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -256,7 +256,7 @@
 ./usr/lib/o32/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/o32/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/o32/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/o32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -311,7 +311,7 @@
 ./usr/lib/o32/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/o32/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/o32/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/o32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/o32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/o32/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/o32/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/o32/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -358,8 +358,8 @@
 ./usr/libdata/debug/usr/lib/n32/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/n32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/n32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/n32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/n32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/n32/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/n32/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -421,8 +421,8 @@
 ./usr/libdata/debug/usr/lib/n32/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/n32/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/n32/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/n32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/n32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/n32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/n32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/n32/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -475,8 +475,8 @@
 ./usr/libdata/debug/usr/lib/n32/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,cxx,libstdcxx,gcc=12
 ./usr/libdata/debug/usr/lib/n32/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/n32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/n32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/n32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/n32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/n32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/n32/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound
@@ -538,8 +538,8 @@
 ./usr/libdata/debug/usr/lib/o32/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/o32/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -601,8 +601,8 @@
 ./usr/libdata/debug/usr/lib/o32/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/o32/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/o32/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/o32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -655,8 +655,8 @@
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,cxx,libstdcxx,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/o32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/o32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/o32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/o32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/o32/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound

Index: src/distrib/sets/lists/debug32/ad.powerpc64
diff -u src/distrib/sets/lists/debug32/ad.powerpc64:1.9 src/distrib/sets/lists/debug32/ad.powerpc64:1.10
--- src/distrib/sets/lists/debug32/ad.powerpc64:1.9	Mon Jun 10 07:47:06 2024
+++ src/distrib/sets/lists/debug32/ad.powerpc64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc64,v 1.9 2024/06/10 07:47:06 kre Exp $
+# $NetBSD: ad.powerpc64,v 1.10 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/powerpc/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/powerpc/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/powerpc/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/powerpc/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/powerpc/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/powerpc/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/powerpc/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/powerpc/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/powerpc/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/powerpc/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/powerpc/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/powerpc/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/powerpc/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/powerpc/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/powerpc/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/powerpc/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/powerpc/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/powerpc/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/powerpc/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/powerpc/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/powerpc/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/powerpc/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/powerpc/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/powerpc/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/powerpc/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/powerpc/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/powerpc/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -191,7 +191,8 @@
 ./usr/libdata/debug/usr/lib/powerpc/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/powerpc/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc,cxx
+./usr/libdata/debug/usr/lib/powerpc/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=10,gcccmds,cxx
+./usr/libdata/debug/usr/lib/powerpc/libasan.so.6.0.debug	comp-sys-debug	debug,compat,gcc=12,gcccmds,cxx
 ./usr/libdata/debug/usr/lib/powerpc/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/powerpc/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -228,7 +229,8 @@
 ./usr/libdata/debug/usr/lib/powerpc/libgcc_s.so.1.0.debug	comp-sys-debug	debug,compat,gcc
 ./usr/libdata/debug/usr/lib/powerpc/libgnuctf.so.1.0.debug	comp-sys-debug	debug,compat,binutils=239
 ./usr/libdata/debug/usr/lib/powerpc/libgnumalloc.so.1.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/powerpc/libgomp.so.2.1.debug	comp-sys-debug	debug,compat,gcc
+./usr/libdata/debug/usr/lib/powerpc/libgomp.so.2.1.debug	comp-sys-debug	debug,compat,gcc=10
+./usr/libdata/debug/usr/lib/powerpc/libgomp.so.2.2.debug	comp-sys-debug	debug,compat,gcc=12
 ./usr/libdata/debug/usr/lib/powerpc/libgssapi.so.12.0.debug	comp-sys-debug	debug,compat,kerberos
 ./usr/libdata/debug/usr/lib/powerpc/libhdb.so.16.0.debug	comp-sys-debug	debug,compat,kerberos
 ./usr/libdata/debug/usr/lib/powerpc/libheimbase.so.2.0.debug	comp-sys-debug	debug,compat,kerberos
@@ -252,7 +254,8 @@
 ./usr/libdata/debug/usr/lib/powerpc/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/powerpc/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/powerpc/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/powerpc/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc
+./usr/libdata/debug/usr/lib/powerpc/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/powerpc/liblsan.so.2.1.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/powerpc/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -301,10 +304,12 @@
 ./usr/libdata/debug/usr/lib/powerpc/libsqlite3.so.1.5.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/libssh.so.46.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/libssl.so.15.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/powerpc/libstdc++.so.9.0.debug	comp-sys-debug	debug,compat,gcc,cxx,libstdcxx
+./usr/libdata/debug/usr/lib/powerpc/libstdc++.so.9.0.debug	comp-sys-debug	debug,compat,gcc=10,cxx,libstdcxx
+./usr/libdata/debug/usr/lib/powerpc/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,gcc=12,cxx,libstdcxx
 ./usr/libdata/debug/usr/lib/powerpc/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/powerpc/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc,cxx
+./usr/libdata/debug/usr/lib/powerpc/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc=10,gcccmds,cxx
+./usr/libdata/debug/usr/lib/powerpc/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=12,gcccmds,cxx
 ./usr/libdata/debug/usr/lib/powerpc/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/powerpc/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/powerpc/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound

Index: src/distrib/sets/lists/debug32/ad.riscv64
diff -u src/distrib/sets/lists/debug32/ad.riscv64:1.10 src/distrib/sets/lists/debug32/ad.riscv64:1.11
--- src/distrib/sets/lists/debug32/ad.riscv64:1.10	Mon Jun 10 07:47:06 2024
+++ src/distrib/sets/lists/debug32/ad.riscv64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv64,v 1.10 2024/06/10 07:47:06 kre Exp $
+# $NetBSD: ad.riscv64,v 1.11 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/rv32/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/rv32/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/rv32/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/rv32/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/rv32/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/rv32/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/rv32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/rv32/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/rv32/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/rv32/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/rv32/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/rv32/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/rv32/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/rv32/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/rv32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/rv32/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/rv32/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/rv32/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/rv32/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/rv32/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/rv32/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/rv32/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/rv32/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/rv32/libubsan_g.a			comp-c-debuglib	gcccmds,debuglib,compat,cxx,gcc
 ./usr/lib/rv32/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/rv32/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/rv32/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -191,8 +191,8 @@
 ./usr/libdata/debug/usr/lib/rv32/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/rv32/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/rv32/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/rv32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=10
-./usr/libdata/debug/usr/lib/rv32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,gcc=12
+./usr/libdata/debug/usr/lib/rv32/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/rv32/libasan.so.6.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/rv32/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/rv32/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/rv32/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -254,8 +254,8 @@
 ./usr/libdata/debug/usr/lib/rv32/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/rv32/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/rv32/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/rv32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,gcc=10
-./usr/libdata/debug/usr/lib/rv32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,gcc=12
+./usr/libdata/debug/usr/lib/rv32/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/rv32/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/rv32/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/rv32/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/rv32/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -308,8 +308,8 @@
 ./usr/libdata/debug/usr/lib/rv32/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,gcc=12
 ./usr/libdata/debug/usr/lib/rv32/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/rv32/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/rv32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc=10
-./usr/libdata/debug/usr/lib/rv32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=12
+./usr/libdata/debug/usr/lib/rv32/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/rv32/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/rv32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/rv32/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/rv32/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound
Index: src/distrib/sets/lists/debug32/md.sparc64
diff -u src/distrib/sets/lists/debug32/md.sparc64:1.10 src/distrib/sets/lists/debug32/md.sparc64:1.11
--- src/distrib/sets/lists/debug32/md.sparc64:1.10	Mon Jun 10 07:47:06 2024
+++ src/distrib/sets/lists/debug32/md.sparc64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.10 2024/06/10 07:47:06 kre Exp $
+# $NetBSD: md.sparc64,v 1.11 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/sparc/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/sparc/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/sparc/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/sparc/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/sparc/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/sparc/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/sparc/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/sparc/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/sparc/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/sparc/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/sparc/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/sparc/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/sparc/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/sparc/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/sparc/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/sparc/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/sparc/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/sparc/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/sparc/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/sparc/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/sparc/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -191,8 +191,8 @@
 ./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/sparc/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=10
-./usr/libdata/debug/usr/lib/sparc/libasan.so.6.0.debug	comp-sys-debug	debug,compat,gcc=12
+./usr/libdata/debug/usr/lib/sparc/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/sparc/libasan.so.6.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/sparc/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -255,8 +255,8 @@
 ./usr/libdata/debug/usr/lib/sparc/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/sparc/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/sparc/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/sparc/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,gcc=10
-./usr/libdata/debug/usr/lib/sparc/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,gcc=12
+./usr/libdata/debug/usr/lib/sparc/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/sparc/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -309,8 +309,8 @@
 ./usr/libdata/debug/usr/lib/sparc/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/sparc/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc=10
-./usr/libdata/debug/usr/lib/sparc/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=12
+./usr/libdata/debug/usr/lib/sparc/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/sparc/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/sparc/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/sparc/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/sparc/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound

Index: src/distrib/sets/lists/debug32/md.amd64
diff -u src/distrib/sets/lists/debug32/md.amd64:1.16 src/distrib/sets/lists/debug32/md.amd64:1.17
--- src/distrib/sets/lists/debug32/md.amd64:1.16	Mon Jun 17 18:53:41 2024
+++ src/distrib/sets/lists/debug32/md.amd64	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.16 2024/06/17 18:53:41 riastradh Exp $
+# $NetBSD: md.amd64,v 1.17 2024/07/01 04:03:04 mrg Exp $
 ./usr/lib/i386/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/i386/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/i386/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/i386/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/i386/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/i386/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/i386/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -95,7 +95,7 @@
 ./usr/lib/i386/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/i386/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/i386/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/i386/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/i386/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/i386/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -150,7 +150,7 @@
 ./usr/lib/i386/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/i386/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/i386/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/i386/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/i386/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/i386/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/i386/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -193,8 +193,8 @@
 ./usr/libdata/debug/usr/lib/i386/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/i386/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=10,cxx
-./usr/libdata/debug/usr/lib/i386/libasan.so.6.0.debug	comp-sys-debug	debug,compat,gcc=12,cxx
+./usr/libdata/debug/usr/lib/i386/libasan.so.5.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=10,cxx
+./usr/libdata/debug/usr/lib/i386/libasan.so.6.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=12,cxx
 ./usr/libdata/debug/usr/lib/i386/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/i386/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -260,8 +260,8 @@
 ./usr/libdata/debug/usr/lib/i386/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/i386/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/i386/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/i386/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/i386/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/i386/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/i386/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/i386/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -317,8 +317,8 @@
 ./usr/libdata/debug/usr/lib/i386/libtpm_unseal.so.2.0.debug		comp-tpm-debug	compat,debug,tpm
 ./usr/libdata/debug/usr/lib/i386/libtre.so.0.8.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libtspi.so.4.0.debug		comp-tpm-debug	compat,debug,tpm
-./usr/libdata/debug/usr/lib/i386/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcc=10,cxx
-./usr/libdata/debug/usr/lib/i386/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,gcc=12,cxx
+./usr/libdata/debug/usr/lib/i386/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=10,cxx
+./usr/libdata/debug/usr/lib/i386/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,gcccmds,gcc=12,cxx
 ./usr/libdata/debug/usr/lib/i386/libukfs.so.1.0.debug	comp-sys-debug	debug,compat,rump
 ./usr/libdata/debug/usr/lib/i386/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/i386/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound

Index: src/distrib/sets/lists/debug64/ad.mips64eb
diff -u src/distrib/sets/lists/debug64/ad.mips64eb:1.5 src/distrib/sets/lists/debug64/ad.mips64eb:1.6
--- src/distrib/sets/lists/debug64/ad.mips64eb:1.5	Sun Jun 23 18:29:14 2024
+++ src/distrib/sets/lists/debug64/ad.mips64eb	Mon Jul  1 04:03:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.5 2024/06/23 18:29:14 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.6 2024/07/01 04:03:05 mrg Exp $
 ./usr/lib/64/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/64/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/64/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/64/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/64/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/64/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/64/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/64/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/64/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/64/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/64/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/64/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/64/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/64/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/64/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/64/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/64/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/64/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/64/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/64/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -190,8 +190,8 @@
 ./usr/libdata/debug/usr/lib/64/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/64/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/64/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/64/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/64/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/64/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/64/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -253,8 +253,8 @@
 ./usr/libdata/debug/usr/lib/64/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/64/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/64/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/64/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/64/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/64/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/64/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/64/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -307,8 +307,8 @@
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,cxx,libstdcxx,gcc=12
 ./usr/libdata/debug/usr/lib/64/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/64/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/64/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/64/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/64/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/64/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/64/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound
Index: src/distrib/sets/lists/debug64/ad.mips64el
diff -u src/distrib/sets/lists/debug64/ad.mips64el:1.5 src/distrib/sets/lists/debug64/ad.mips64el:1.6
--- src/distrib/sets/lists/debug64/ad.mips64el:1.5	Sun Jun 23 18:29:14 2024
+++ src/distrib/sets/lists/debug64/ad.mips64el	Mon Jul  1 04:03:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.5 2024/06/23 18:29:14 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.6 2024/07/01 04:03:05 mrg Exp $
 ./usr/lib/64/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -24,7 +24,7 @@
 ./usr/lib/64/i18n/libmapper_zone_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libamu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libarchive_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/64/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/64/libasan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/64/libasn1_g.a			comp-c-debuglib	debuglib,compat,kerberos
 ./usr/lib/64/libatf-c++_g.a			comp-c-debuglib	debuglib,compat,atf
 ./usr/lib/64/libatf-c_g.a			comp-c-debuglib	debuglib,compat,atf
@@ -93,7 +93,7 @@
 ./usr/lib/64/liblber_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/64/libldap_g.a			comp-c-debuglib	debuglib,compat,ldap
 ./usr/lib/64/libldap_r_g.a			comp-c-debuglib	debuglib,compat,ldap
-./usr/lib/64/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/64/liblsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/64/liblua_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/liblzf_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/liblzma_g.a			comp-c-debuglib	debuglib,compat
@@ -148,7 +148,7 @@
 ./usr/lib/64/libsupc++_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc,libstdcxx
 ./usr/lib/64/libterminfo_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/64/libtre_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/64/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcc
+./usr/lib/64/libubsan_g.a			comp-c-debuglib	debuglib,compat,cxx,gcccmds,gcc
 ./usr/lib/64/libukfs_g.a			comp-c-debuglib	debuglib,compat,rump
 ./usr/lib/64/libumem_g.a			comp-c-debuglib	debuglib,compat,zfs
 ./usr/lib/64/libunbound_g.a			comp-c-debuglib	debuglib,compat,unbound
@@ -190,8 +190,8 @@
 ./usr/libdata/debug/usr/lib/64/i18n/libmapper_zone.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libamu.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libarchive.so.5.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/64/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/64/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/64/libasan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/64/libasan.so.6.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/64/libasn1.so.10.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libatf-c++.so.2.0.debug	comp-sys-debug	debug,compat,atf
 ./usr/libdata/debug/usr/lib/64/libatf-c.so.0.0.debug	comp-sys-debug	debug,compat,atf
@@ -253,8 +253,8 @@
 ./usr/libdata/debug/usr/lib/64/liblber.so.5.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/64/libldap.so.6.0.debug	comp-sys-debug	debug,compat,ldap
 ./usr/libdata/debug/usr/lib/64/libldap_r.so.6.0.debug	comp-sys-debug	debug,compat,ldap
-./usr/libdata/debug/usr/lib/64/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/64/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/64/liblsan.so.2.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/64/liblsan.so.3.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/64/liblua.so.6.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/liblzf.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/liblzma.so.2.0.debug	comp-sys-debug	debug,compat
@@ -307,8 +307,8 @@
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.9.1.debug	comp-sys-debug	debug,compat,cxx,libstdcxx,gcc=12
 ./usr/libdata/debug/usr/lib/64/libterminfo.so.2.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libtre.so.0.8.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/64/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcc=10
-./usr/libdata/debug/usr/lib/64/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcc=12
+./usr/libdata/debug/usr/lib/64/libubsan.so.4.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=10
+./usr/libdata/debug/usr/lib/64/libubsan.so.5.0.debug	comp-sys-debug	debug,compat,cxx,gcccmds,gcc=12
 ./usr/libdata/debug/usr/lib/64/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libumem.so.0.0.debug	comp-sys-debug	debug,compat,zfs
 ./usr/libdata/debug/usr/lib/64/libunbound.so.9.0.debug	comp-sys-debug	debug,compat,unbound

Index: src/external/gpl3/gcc/lib/Makefile
diff -u src/external/gpl3/gcc/lib/Makefile:1.23 src/external/gpl3/gcc/lib/Makefile:1.24
--- src/external/gpl3/gcc/lib/Makefile:1.23	Thu Aug  3 01:36:54 2023
+++ src/external/gpl3/gcc/lib/Makefile	Mon Jul  1 04:03:04 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2023/08/03 01:36:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.24 2024/07/01 04:03:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,7 @@ SUBDIR+= liblto_plugin
 .if (${MKLIBSTDCXX} != "no") && (${MKCXX} != "no")
 SUBDIR+= libsupc++ libstdc++-v3
 
+.if ${MKGCCCMDS} != "no"
 SUBDIR+= .WAIT libasan liblsan libubsan
 
 # TSan does not work with 32bit address space and has not been ported
@@ -18,6 +19,7 @@ SUBDIR+= .WAIT libasan liblsan libubsan
 .if ${MACHINE} == "amd64" || ${MACHINE_CPU} == "aarch64"
 SUBDIR+= libtsan
 .endif
+.endif
 
 .endif
 

Index: src/lib/Makefile
diff -u src/lib/Makefile:1.299 src/lib/Makefile:1.300
--- src/lib/Makefile:1.299	Mon Feb 26 20:16:16 2024
+++ src/lib/Makefile	Mon Jul  1 04:03:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.299 2024/02/26 20:16:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.300 2024/07/01 04:03:03 mrg Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -194,12 +194,14 @@ SUBDIR+=	.WAIT
 SUBDIR+=	libwrap
 
 .if (${MKGCC} != "no" && ${MKCXX} != "no" && ${MKLIBSTDCXX} != "no")
+.if ${MKGCCCMDS} != "no"
 .for sanitizer in asan lsan ubsan
 .if exists(../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/lib${sanitizer})
 SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/lib${sanitizer}
 .endif
 .endfor
 .endif
+.endif
 
 .if (${MKLLVMRT} != "no" && (!defined(MLIBDIR) || ${MKCOMPATX11} != "no"))
 SUBDIR+=	../external/apache2/llvm/librt

Reply via email to