summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2014-02-28 14:46:53 +0000
committerDmitry Vyukov <dvyukov@google.com>2014-02-28 14:46:53 +0000
commit9cffc9550b75dd7f1861eea2156a2b974077993f (patch)
treee18ce53d3376258b767cd323a51db9b97945a17a /compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
parent7210cdd4730c0ecd43977f9bdf52c7e6b0bbf96c (diff)
downloadbcm5719-llvm-9cffc9550b75dd7f1861eea2156a2b974077993f.tar.gz
bcm5719-llvm-9cffc9550b75dd7f1861eea2156a2b974077993f.zip
tsan: allow to force use of __libc_malloc in sanitizer_common
llvm-svn: 202504
Diffstat (limited to 'compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc')
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
index c3bdd34eb99..47509f83665 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc
@@ -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);
OpenPOWER on IntegriCloud