[src/trunk]: src/external/gpl3/gcc/lib/libtsan Avoid using dummy tsan_rtl_uni...

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/92a0dcd1d7c6
branches:  trunk
changeset: 954975:92a0dcd1d7c6
user:      kamil <kamil%NetBSD.org@localhost>
date:      Mon Sep 14 14:33:01 2020 +0000

description:
Avoid using dummy tsan_rtl_unimpl.cc

Instead of providing broken support, error during build to catch the
problem quickly.

diffstat:

 external/gpl3/gcc/lib/libtsan/Makefile           |  15 ++++++++++-----
 external/gpl3/gcc/lib/libtsan/tsan_rtl_unimpl.cc |   4 ----
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (38 lines):

diff -r 1d24d39e81b9 -r 92a0dcd1d7c6 external/gpl3/gcc/lib/libtsan/Makefile
--- a/external/gpl3/gcc/lib/libtsan/Makefile    Mon Sep 14 11:56:01 2020 +0000
+++ b/external/gpl3/gcc/lib/libtsan/Makefile    Mon Sep 14 14:33:01 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/09/13 02:37:32 kamil Exp $
+# $NetBSD: Makefile,v 1.14 2020/09/14 14:33:01 kamil Exp $
 
 UNSUPPORTED_COMPILER.clang=     # defined
 NOSANITIZER=    # defined
@@ -48,11 +48,16 @@
        tsan_symbolize.cc \
        tsan_sync.cc 
 
-# XXX ${MACHINE} won't match mips64 or ppc64
-.if exists(${SANITIZER}/tsan/tsan_rtl_${MACHINE}.S)
-TSAN_SRCS+= tsan_rtl_${MACHINE}.S
+.if ${MACHINE_ARCH} == "x86_64"
+TSAN_SRCS+= tsan_rtl_amd64.S
+.elif ${MACHINE_ARCH} == "aarch64"
+TSAN_SRCS+= tsan_rtl_aarch64.S
+.elif ${MACHINE_ARCH} == "mips64el"
+TSAN_SRCS+= tsan_rtl_mips64.S
+.elif ${MACHINE_ARCH} == "powerpc64"
+TSAN_SRCS+= tsan_rtl_ppc64.S
 .else
-TSAN_SRCS+= tsan_rtl_unimpl.cc
+.error Unsupported
 .endif
 
 LIB=   tsan
diff -r 1d24d39e81b9 -r 92a0dcd1d7c6 external/gpl3/gcc/lib/libtsan/tsan_rtl_unimpl.cc
--- a/external/gpl3/gcc/lib/libtsan/tsan_rtl_unimpl.cc  Mon Sep 14 11:56:01 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#include <cstdlib>
-
-extern "C" void __tsan_report_race_thunk(void) { abort(); }
-extern "C" void __tsan_trace_switch_thunk(void) { abort(); }