Module Name:    src
Committed By:   rin
Date:           Thu Aug  3 13:13:05 UTC 2023

Modified Files:
        src/distrib/sets/lists/base: shl.mi
        src/distrib/sets/lists/comp: mi
        src/distrib/sets/lists/debug: mi shl.mi
        src/distrib/sets/lists/tests: mi

Log Message:
Fix lists for HAVE_GCC=12.


To generate a diff of this commit:
cvs rdiff -u -r1.955 -r1.956 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2442 -r1.2443 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.412 -r1.413 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.317 -r1.318 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.1282 -r1.1283 src/distrib/sets/lists/tests/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.955 src/distrib/sets/lists/base/shl.mi:1.956
--- src/distrib/sets/lists/base/shl.mi:1.955	Wed Aug  2 12:12:52 2023
+++ src/distrib/sets/lists/base/shl.mi	Thu Aug  3 13:13:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.955 2023/08/02 12:12:52 martin Exp $
+# $NetBSD: shl.mi,v 1.956 2023/08/03 13:13:04 rin Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -211,8 +211,11 @@
 ./usr/lib/libarchive.so.4			base-sys-shlib		compatfile
 ./usr/lib/libarchive.so.4.0			base-sys-shlib		compatfile
 ./usr/lib/libasan.so				base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/libasan.so				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libasan.so.5				base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/libasan.so.5				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libasan.so.5.0			base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/libasan.so.5.0			base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libasn1.so				base-krb5-shlib		compatfile,kerberos
 ./usr/lib/libasn1.so.10				base-krb5-shlib		compatfile,kerberos
 ./usr/lib/libasn1.so.10.0			base-krb5-shlib		compatfile,kerberos
@@ -435,10 +438,13 @@
 ./usr/lib/libldap_r.so.5			base-ldap-shlib		ldap,compatfile
 ./usr/lib/libldap_r.so.5.0			base-ldap-shlib		ldap,compatfile
 ./usr/lib/liblsan.so				base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/liblsan.so				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/liblsan.so.1				base-sys-shlib		compatfile,obsolete
 ./usr/lib/liblsan.so.1.0			base-sys-shlib		compatfile,obsolete
 ./usr/lib/liblsan.so.2				base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/liblsan.so.2				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/liblsan.so.2.0			base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/liblsan.so.2.0			base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/liblua.so				base-sys-shlib		compatfile
 ./usr/lib/liblua.so.6				base-sys-shlib		compatfile
 ./usr/lib/liblua.so.6.1				base-sys-shlib		compatfile
@@ -905,7 +911,6 @@
 ./usr/lib/libssl.so.15.0			base-crypto-shlib	compatfile,openssl=30
 ./usr/lib/libstdc++.so				base-sys-shlib		compatfile,gcc,cxx,libstdcxx
 ./usr/lib/libstdc++.so.9			base-sys-shlib		compatfile,gcc,cxx,libstdcxx
-./usr/lib/libstdc++.so.9.0			base-sys-shlib		compatfile,gcc,cxx,libstdcxx,gcc=10
 ./usr/lib/libstdc++.so.9.0			base-sys-shlib		compatfile,gcc,cxx,libstdcxx,obsolete,gcc=12
 ./usr/lib/libstdc++.so.9.1			base-sys-shlib		compatfile,gcc,cxx,libstdcxx,gcc=12
 ./usr/lib/libtelnet.so				base-obsolete		obsolete
@@ -928,8 +933,11 @@
 ./usr/lib/libtspi.so.3				base-sys-shlib		compatfile,tpm
 ./usr/lib/libtspi.so.3.0			base-sys-shlib		compatfile,tpm
 ./usr/lib/libubsan.so				base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/libubsan.so				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libubsan.so.4				base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/libubsan.so.4				base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libubsan.so.4.0			base-sys-shlib		compatfile,cxx,gcc=10
+./usr/lib/libubsan.so.4.0			base-sys-shlib		compatfile,cxx,gcc=12
 ./usr/lib/libukfs.so				base-sys-shlib		compatfile,rump
 ./usr/lib/libukfs.so.1				base-sys-shlib		compatfile,rump
 ./usr/lib/libukfs.so.1.0			base-sys-shlib		compatfile,rump

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2442 src/distrib/sets/lists/comp/mi:1.2443
--- src/distrib/sets/lists/comp/mi:1.2442	Thu Aug  3 12:24:47 2023
+++ src/distrib/sets/lists/comp/mi	Thu Aug  3 13:13:04 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2442 2023/08/03 12:24:47 nia Exp $
+#	$NetBSD: mi,v 1.2443 2023/08/03 13:13:04 rin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -3838,6 +3838,8 @@
 ./usr/lib/libarchive_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libasan.a				comp-c-lib		compatfile,cxx,gcc=10
 ./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=10
+./usr/lib/libasan.a				comp-c-lib		compatfile,cxx,gcc=12
+./usr/lib/libasan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=12
 ./usr/lib/libasn1.a				comp-krb5-lib		compatfile,kerberos
 ./usr/lib/libasn1_p.a				comp-krb5-proflib	compatfile,kerberos,profile
 ./usr/lib/libatf-c++.a				comp-atf-lib		compatfile,atf
@@ -3999,6 +4001,8 @@
 ./usr/lib/libldap_r_p.a				comp-ldap-proflib	compatfile,ldap,profile
 ./usr/lib/liblsan.a				comp-c-lib		compatfile,cxx,gcc=10
 ./usr/lib/liblsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=10
+./usr/lib/liblsan.a				comp-c-lib		compatfile,cxx,gcc=12
+./usr/lib/liblsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=12
 ./usr/lib/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
@@ -4341,6 +4345,8 @@
 ./usr/lib/libtpm_unseal_p.a			comp-c-proflib		compatfile,tpm,profile
 ./usr/lib/libtre.a				comp-c-lib		compatfile
 ./usr/lib/libtre_p.a				comp-c-proflib		compatfile,profile
+# NOTYET ./usr/lib/libtsan.a				comp-c-lib		arch64,cxx,gcc=12,machine=amd64
+# NOTYET ./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcc=12,machine=amd64
 ./usr/lib/libtsan.a				comp-c-lib		arch64,cxx,gcc=10,machine=amd64
 ./usr/lib/libtsan.a				comp-c-lib		arch64,cxx,gcc=9,machine=amd64
 ./usr/lib/libtsan_p.a				comp-c-proflib		arch64,profile,cxx,gcc=10,machine=amd64
@@ -4348,6 +4354,8 @@
 ./usr/lib/libtspi.a				comp-c-lib		compatfile,tpm
 ./usr/lib/libtspi_p.a				comp-c-proflib		compatfile,tpm,profile
 ./usr/lib/libubsan.a				comp-c-lib		compatfile,cxx,gcc=10
+./usr/lib/libubsan.a				comp-c-lib		compatfile,cxx,gcc=12
+./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=12
 ./usr/lib/libubsan_p.a				comp-c-proflib		compatfile,profile,cxx,gcc=10
 ./usr/lib/libukfs.a				comp-c-lib		compatfile,rump
 ./usr/lib/libukfs_p.a				comp-c-proflib		compatfile,rump,profile

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.412 src/distrib/sets/lists/debug/mi:1.413
--- src/distrib/sets/lists/debug/mi:1.412	Thu Aug  3 12:30:25 2023
+++ src/distrib/sets/lists/debug/mi	Thu Aug  3 13:13:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.412 2023/08/03 12:30:25 nia Exp $
+# $NetBSD: mi,v 1.413 2023/08/03 13:13:05 rin Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib					comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -27,6 +27,7 @@
 ./usr/lib/libamu_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libarchive_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=10
+./usr/lib/libasan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=12
 ./usr/lib/libasn1_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libatf-c++_g.a			comp-c-debuglib		debuglib,compatfile,atf
 ./usr/lib/libatf-c_g.a				comp-c-debuglib		debuglib,compatfile,atf
@@ -101,6 +102,7 @@
 ./usr/lib/libldap_g.a				comp-c-debuglib		debuglib,ldap,compatfile
 ./usr/lib/libldap_r_g.a				comp-c-debuglib		debuglib,ldap,compatfile
 ./usr/lib/liblsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=10
+./usr/lib/liblsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=12
 ./usr/lib/liblua_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/liblwres_g.a				comp-obsolete		obsolete
 ./usr/lib/liblzf_g.a				comp-c-debuglib		debuglib,compatfile
@@ -268,8 +270,10 @@
 ./usr/lib/libtre_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libtsan_g.a				comp-c-debuglib		debuglib,arch64,cxx,gcc=9,machine=amd64
 ./usr/lib/libtsan_g.a				comp-c-debuglib		debuglib,arch64,cxx,gcc=10,machine=amd64
+# NOTYET ./usr/lib/libtsan_g.a				comp-c-debuglib		debuglib,arch64,cxx,gcc=12,machine=amd64
 ./usr/lib/libtspi_g.a				comp-c-debuglib		debuglib,compatfile,tpm
 ./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=10
+./usr/lib/libubsan_g.a				comp-c-debuglib		debuglib,compatfile,cxx,gcc=12
 ./usr/lib/libukfs_g.a				comp-c-debuglib		debuglib,compatfile,rump
 ./usr/lib/libumem_g.a				comp-c-debuglib		debuglib,compatfile,zfs
 ./usr/lib/libunbound_g.a			comp-c-debuglib		debuglib,compatfile,unbound
@@ -2075,7 +2079,9 @@
 ./usr/libdata/debug/usr/tests/lib/libc/membar/t_seqlock.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/membar/t_spinlock.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/misc/t_ubsan.debug		tests-lib-debug		debug,atf,compattestfile,gcc=10
+./usr/libdata/debug/usr/tests/lib/libc/misc/t_ubsan.debug		tests-lib-debug		debug,atf,compattestfile,gcc=12
 ./usr/libdata/debug/usr/tests/lib/libc/misc/t_ubsanxx.debug		tests-lib-debug		debug,atf,compattestfile,gcc=10
+./usr/libdata/debug/usr/tests/lib/libc/misc/t_ubsanxx.debug		tests-lib-debug		debug,atf,compattestfile,gcc=12
 ./usr/libdata/debug/usr/tests/lib/libc/net/getaddrinfo/h_gai.debug	tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/net/h_dns_server.debug		tests-lib-debug		debug,atf,compattestfile
 ./usr/libdata/debug/usr/tests/lib/libc/net/h_hostent.debug		tests-lib-debug		debug,atf,compattestfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.317 src/distrib/sets/lists/debug/shl.mi:1.318
--- src/distrib/sets/lists/debug/shl.mi:1.317	Wed Aug  2 12:12:52 2023
+++ src/distrib/sets/lists/debug/shl.mi	Thu Aug  3 13:13:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.317 2023/08/02 12:12:52 martin Exp $
+# $NetBSD: shl.mi,v 1.318 2023/08/03 13:13:05 rin Exp $
 ./usr/lib/libbfd_g.a						comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib						base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,dynamicroot,zfs
@@ -71,6 +71,7 @@
 ./usr/libdata/debug/usr/lib/libarchive.so.4.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libasan.so.3.0.debug		comp-sys-debug	debug,compatfile,cxx,obsolete
 ./usr/libdata/debug/usr/lib/libasan.so.5.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=10
+./usr/libdata/debug/usr/lib/libasan.so.5.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=12
 ./usr/libdata/debug/usr/lib/libasn1.so.10.0.debug		comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libatf-c++.so.2.0.debug		comp-atf-debug	debug,compatfile,atf
 ./usr/libdata/debug/usr/lib/libatf-c.so.0.0.debug		comp-atf-debug	debug,compatfile,atf
@@ -161,6 +162,7 @@
 ./usr/libdata/debug/usr/lib/libldap_r.so.5.0.debug		comp-ldap-debug	debug,compatfile,ldap
 ./usr/libdata/debug/usr/lib/liblsan.so.1.0.debug		comp-sys-debug	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=10
+./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=12
 ./usr/libdata/debug/usr/lib/liblua.so.6.1.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/liblutok.so.1.0.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/liblutok.so.2.0.debug		comp-kyua-debug	debug,compatfile,kyua
@@ -330,6 +332,7 @@
 ./usr/libdata/debug/usr/lib/libtre.so.0.8.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libtspi.so.3.0.debug		comp-tpm-debug	debug,compatfile,tpm
 ./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=10
+./usr/libdata/debug/usr/lib/libubsan.so.4.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=12
 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug		comp-sys-debug	debug,compatfile,rump
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libunbound.so.7.0.debug 		comp-net-debug	debug,compatfile,unbound

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1282 src/distrib/sets/lists/tests/mi:1.1283
--- src/distrib/sets/lists/tests/mi:1.1282	Thu Aug  3 12:24:47 2023
+++ src/distrib/sets/lists/tests/mi	Thu Aug  3 13:13:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1282 2023/08/03 12:24:47 nia Exp $
+# $NetBSD: mi,v 1.1283 2023/08/03 13:13:05 rin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3062,7 +3062,9 @@
 ./usr/tests/lib/libc/misc/Atffile			tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/misc/Kyuafile			tests-lib-tests		compattestfile,atf,kyua
 ./usr/tests/lib/libc/misc/t_ubsan			tests-lib-tests		compattestfile,atf,gcc=10
+./usr/tests/lib/libc/misc/t_ubsan			tests-lib-tests		compattestfile,atf,gcc=12
 ./usr/tests/lib/libc/misc/t_ubsanxx			tests-lib-tests		compattestfile,atf,gcc=10
+./usr/tests/lib/libc/misc/t_ubsanxx			tests-lib-tests		compattestfile,atf,gcc=12
 ./usr/tests/lib/libc/net				tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/net/Atffile			tests-lib-tests		compattestfile,atf
 ./usr/tests/lib/libc/net/Kyuafile			tests-lib-tests		compattestfile,atf,kyua

Reply via email to