Module Name:    src
Committed By:   kamil
Date:           Mon Sep 14 14:33:01 UTC 2020

Modified Files:
        src/external/gpl3/gcc/lib/libtsan: Makefile
Removed Files:
        src/external/gpl3/gcc/lib/libtsan: tsan_rtl_unimpl.cc

Log Message:
Avoid using dummy tsan_rtl_unimpl.cc

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


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/lib/libtsan/Makefile
cvs rdiff -u -r1.1 -r0 src/external/gpl3/gcc/lib/libtsan/tsan_rtl_unimpl.cc

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

Modified files:

Index: src/external/gpl3/gcc/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc/lib/libtsan/Makefile:1.13 src/external/gpl3/gcc/lib/libtsan/Makefile:1.14
--- src/external/gpl3/gcc/lib/libtsan/Makefile:1.13	Sun Sep 13 02:37:32 2020
+++ src/external/gpl3/gcc/lib/libtsan/Makefile	Mon Sep 14 14:33:01 2020
@@ -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_SRCS= \
 	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

Reply via email to