Module Name: src
Committed By: mrg
Date: Tue Sep 15 07:00:04 UTC 2020
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/external/gpl3/gcc/lib: Makefile
Log Message:
actually, disable tsan on everything but amd64.
it fails to build on mips64 and arm64 for me as well as others..
To generate a diff of this commit:
cvs rdiff -u -r1.904 -r1.905 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2355 -r1.2356 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.342 -r1.343 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.336 -r1.337 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.263 -r1.264 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gcc/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/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.904 src/distrib/sets/lists/base/shl.mi:1.905
--- src/distrib/sets/lists/base/shl.mi:1.904 Tue Sep 15 06:22:33 2020
+++ src/distrib/sets/lists/base/shl.mi Tue Sep 15 07:00:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.904 2020/09/15 06:22:33 mrg Exp $
+# $NetBSD: shl.mi,v 1.905 2020/09/15 07:00:03 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -896,9 +896,9 @@
./usr/lib/libtre.so base-sys-shlib compatfile
./usr/lib/libtre.so.0 base-sys-shlib compatfile
./usr/lib/libtre.so.0.8 base-sys-shlib compatfile
-./usr/lib/libtsan.so base-sys-shlib arch64,cxx,gcc=9,!machine=sparc64
-./usr/lib/libtsan.so.1 base-sys-shlib arch64,cxx,gcc=9,!machine=sparc64
-./usr/lib/libtsan.so.1.0 base-sys-shlib arch64,cxx,gcc=9,!machine=sparc64
+./usr/lib/libtsan.so base-sys-shlib arch64,cxx,gcc=9,machine=amd64
+./usr/lib/libtsan.so.1 base-sys-shlib arch64,cxx,gcc=9,machine=amd64
+./usr/lib/libtsan.so.1.0 base-sys-shlib arch64,cxx,gcc=9,machine=amd64
./usr/lib/libtspi.so base-sys-shlib compatfile,tpm
./usr/lib/libtspi.so.3 base-sys-shlib compatfile,tpm
./usr/lib/libtspi.so.3.0 base-sys-shlib compatfile,tpm
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2355 src/distrib/sets/lists/comp/mi:1.2356
--- src/distrib/sets/lists/comp/mi:1.2355 Tue Sep 15 06:22:33 2020
+++ src/distrib/sets/lists/comp/mi Tue Sep 15 07:00:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2355 2020/09/15 06:22:33 mrg Exp $
+# $NetBSD: mi,v 1.2356 2020/09/15 07:00:03 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3947,8 +3947,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
-./usr/lib/libtsan.a comp-c-lib arch64,cxx,gcc=9,!machine=sparc64
-./usr/lib/libtsan_p.a comp-c-proflib arch64,profile,cxx,gcc=9,!machine=sparc64
+./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=9,machine=amd64
./usr/lib/libtspi.a comp-c-lib compatfile,tpm
./usr/lib/libtspi_p.a comp-c-proflib compatfile,tpm,profile
./usr/lib/libubsan.a comp-c-lib compatfile,cxx,gcc
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.342 src/distrib/sets/lists/comp/shl.mi:1.343
--- src/distrib/sets/lists/comp/shl.mi:1.342 Tue Sep 15 06:22:33 2020
+++ src/distrib/sets/lists/comp/shl.mi Tue Sep 15 07:00:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.342 2020/09/15 06:22:33 mrg Exp $
+# $NetBSD: shl.mi,v 1.343 2020/09/15 07:00:03 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -274,7 +274,7 @@
./usr/lib/libtermlib_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libtpm_unseal_pic.a comp-tpm-lib compatfile,picinstall,tpm
./usr/lib/libtre_pic.a comp-c-piclib compatfile,picinstall
-./usr/lib/libtsan_pic.a comp-c-piclib arch64,picinstall,cxx,gcc=9,!machine=sparc64
+./usr/lib/libtsan_pic.a comp-c-piclib arch64,picinstall,cxx,gcc=9,machine=amd64
./usr/lib/libtspi_pic.a comp-c-piclib compatfile,picinstall,tpm
./usr/lib/libubsan_pic.a comp-c-piclib compatfile,picinstall,cxx,gcc
./usr/lib/libukfs_pic.a comp-c-piclib compatfile,picinstall,rump
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.336 src/distrib/sets/lists/debug/mi:1.337
--- src/distrib/sets/lists/debug/mi:1.336 Tue Sep 15 06:22:33 2020
+++ src/distrib/sets/lists/debug/mi Tue Sep 15 07:00:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.336 2020/09/15 06:22:33 mrg Exp $
+# $NetBSD: mi,v 1.337 2020/09/15 07:00: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,compatfile
@@ -261,7 +261,7 @@
./usr/lib/libterminfo_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libtpm_unseal_g.a comp-c-debuglib debuglib,compatfile,tpm
./usr/lib/libtre_g.a comp-c-debuglib debuglib,compatfile
-./usr/lib/libtsan_g.a comp-c-debuglib debuglib,arch64,cxx,gcc=9,!machine=sparc64
+./usr/lib/libtsan_g.a comp-c-debuglib debuglib,arch64,cxx,gcc=9,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
./usr/lib/libukfs_g.a comp-c-debuglib debuglib,compatfile,rump
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.263 src/distrib/sets/lists/debug/shl.mi:1.264
--- src/distrib/sets/lists/debug/shl.mi:1.263 Tue Sep 15 06:22:33 2020
+++ src/distrib/sets/lists/debug/shl.mi Tue Sep 15 07:00:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.263 2020/09/15 06:22:33 mrg Exp $
+# $NetBSD: shl.mi,v 1.264 2020/09/15 07:00:04 mrg Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
@@ -316,7 +316,7 @@
./usr/libdata/debug/usr/lib/libterminfo.so.2.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libtpm_unseal.so.1.0.debug comp-tpm-debug debug,compatfile,tpm
./usr/libdata/debug/usr/lib/libtre.so.0.8.debug comp-sys-debug debug,compatfile
-./usr/libdata/debug/usr/lib/libtsan.so.1.0.debug comp-sys-debug debug,arch64,cxx,gcc=9,!machine=sparc64
+./usr/libdata/debug/usr/lib/libtsan.so.1.0.debug comp-sys-debug debug,arch64,cxx,gcc=9,machine=amd64
./usr/libdata/debug/usr/lib/libtspi.so.3.0.debug comp-tpm-debug debug,compatfile,tpm
./usr/libdata/debug/usr/lib/libubsan.so.1.0.debug comp-sys-debug obsolete,gcc=5
./usr/libdata/debug/usr/lib/libubsan.so.2.0.debug comp-sys-debug debug,compatfile,obsolete
Index: src/external/gpl3/gcc/lib/Makefile
diff -u src/external/gpl3/gcc/lib/Makefile:1.20 src/external/gpl3/gcc/lib/Makefile:1.21
--- src/external/gpl3/gcc/lib/Makefile:1.20 Tue Sep 15 04:55:23 2020
+++ src/external/gpl3/gcc/lib/Makefile Tue Sep 15 07:00:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/09/15 04:55:23 martin Exp $
+# $NetBSD: Makefile,v 1.21 2020/09/15 07:00:03 mrg Exp $
.include <bsd.own.mk>
@@ -13,12 +13,12 @@ SUBDIR+= libsupc++ libstdc++-v3
SUBDIR+= .WAIT libasan liblsan libubsan
-# TSan does not work with 32bit address space and has not been porter
-# to all architectures
-.if (!empty(MACHINE_ARCH:M*64*) || ${MACHINE_ARCH} == alpha) && \
- ${MACHINE_ARCH} != "sparc64"
+# TSan does not work with 32bit address space and has not been ported
+# to all 64-bit architectures.
+.if ${MACHINE} == "amd64"
SUBDIR+= libtsan
.endif
+
.endif
.include <bsd.subdir.mk>
