Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src actually, disable tsan on everything but amd64.



details:   https://anonhg.NetBSD.org/src/rev/3b675d721f7c
branches:  trunk
changeset: 976243:3b675d721f7c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Sep 15 07:00:03 2020 +0000

description:
actually, disable tsan on everything but amd64.

it fails to build on mips64 and arm64 for me as well as others..

diffstat:

 distrib/sets/lists/base/shl.mi  |   8 ++++----
 distrib/sets/lists/comp/mi      |   6 +++---
 distrib/sets/lists/comp/shl.mi  |   4 ++--
 distrib/sets/lists/debug/mi     |   4 ++--
 distrib/sets/lists/debug/shl.mi |   4 ++--
 external/gpl3/gcc/lib/Makefile  |  10 +++++-----
 6 files changed, 18 insertions(+), 18 deletions(-)

diffs (122 lines):

diff -r bdcd64a1aad5 -r 3b675d721f7c distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Tue Sep 15 06:22:33 2020 +0000
+++ b/distrib/sets/lists/base/shl.mi    Tue Sep 15 07:00:03 2020 +0000
@@ -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
diff -r bdcd64a1aad5 -r 3b675d721f7c distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Tue Sep 15 06:22:33 2020 +0000
+++ b/distrib/sets/lists/comp/mi        Tue Sep 15 07:00:03 2020 +0000
@@ -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
diff -r bdcd64a1aad5 -r 3b675d721f7c distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi    Tue Sep 15 06:22:33 2020 +0000
+++ b/distrib/sets/lists/comp/shl.mi    Tue Sep 15 07:00:03 2020 +0000
@@ -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
diff -r bdcd64a1aad5 -r 3b675d721f7c distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Tue Sep 15 06:22:33 2020 +0000
+++ b/distrib/sets/lists/debug/mi       Tue Sep 15 07:00:03 2020 +0000
@@ -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
diff -r bdcd64a1aad5 -r 3b675d721f7c distrib/sets/lists/debug/shl.mi
--- a/distrib/sets/lists/debug/shl.mi   Tue Sep 15 06:22:33 2020 +0000
+++ b/distrib/sets/lists/debug/shl.mi   Tue Sep 15 07:00:03 2020 +0000
@@ -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
diff -r bdcd64a1aad5 -r 3b675d721f7c external/gpl3/gcc/lib/Makefile
--- a/external/gpl3/gcc/lib/Makefile    Tue Sep 15 06:22:33 2020 +0000
+++ b/external/gpl3/gcc/lib/Makefile    Tue Sep 15 07:00:03 2020 +0000
@@ -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+= .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>



Home | Main Index | Thread Index | Old Index