[llvm-branch-commits] [compiler-rt-branch] r369341 - Merge r368219 (PR42988)

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug 20 00:58:32 2019
New Revision: 369341

URL: http://llvm.org/viewvc/llvm-project?rev=369341&view=rev
Log:
Merge r368219 (PR42988)

    Restrict the NetBSD ASan TSD fallback to !ASAN_DYNAMIC
    
    The fallback to the alternative implementation of TSD with TLS
    is only needed for the static version of ASan for NetBSD.
    
    The same code cannot be reused for the dynamic version of ASan as
    TLS breaks and TSD code works.

Modified:
    compiler-rt/branches/release_90/lib/asan/asan_posix.cc

Modified: compiler-rt/branches/release_90/lib/asan/asan_posix.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_90/lib/asan/asan_posix.cc?rev=369341&r1=369340&r2=369341&view=diff
==============================================================================
--- compiler-rt/branches/release_90/lib/asan/asan_posix.cc (original)
+++ compiler-rt/branches/release_90/lib/asan/asan_posix.cc Tue Aug 20 00:58:32 2019
@@ -39,8 +39,8 @@ void AsanOnDeadlySignal(int signo, void
 
 // ---------------------- TSD ---------------- {{{1
 
-#if SANITIZER_NETBSD
-// Thread Static Data cannot be used in early init on NetBSD.
+#if SANITIZER_NETBSD && !ASAN_DYNAMIC
+// Thread Static Data cannot be used in early static ASan init on NetBSD.
 // Reuse the Asan TSD API for compatibility with existing code
 // with an alternative implementation.