[compiler-rt] r202504 - tsan: allow to force use of __libc_malloc in sanitizer_common

[Dmitry Vyukov]

Author: dvyukov
Date: Fri Feb 28 08:46:53 2014
New Revision: 202504

URL: http://llvm.org/viewvc/llvm-project?rev=202504&view=rev
Log:
tsan: allow to force use of __libc_malloc in sanitizer_common

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc?rev=202504&r1=202503&r2=202504&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc Fri Feb 28 08:46:53 2014
@@ -19,7 +19,7 @@
 namespace __sanitizer {
 
 // ThreadSanitizer for Go uses libc malloc/free.
-#if defined(SANITIZER_GO)
+#if defined(SANITIZER_GO) || defined(SANITIZER_USE_MALLOC)
 # if SANITIZER_LINUX && !SANITIZER_ANDROID
 extern "C" void *__libc_malloc(uptr size);
 extern "C" void __libc_free(void *ptr);