commit f444a493107cb067b72d5f4ed8b6657cfec1cddd
author Alexander Potapenko <glider@google.com> Thu Feb 07 11:40:03 2013 +0000
committer Alexander Potapenko <glider@google.com> Thu Feb 07 11:40:03 2013 +0000
tree 8a1f96d1b2696c37a70155922bd9e299910b7066
parent 94651f9da9d39d5fdb5de7389e9595a379f982f9

[ASan] Implement asan_mz_size(), asan_mz_force_lock() and asan_mz_force_unlock() for allocator2.
Switch to allocator2 on Darwin.

llvm-svn: 174603

compiler-rt/lib/asan/asan_allocator.h

diff --git a/compiler-rt/lib/asan/asan_allocator.h b/compiler-rt/lib/asan/asan_allocator.h
index d8cef68..724dbe8 100644
--- a/compiler-rt/lib/asan/asan_allocator.h
+++ b/compiler-rt/lib/asan/asan_allocator.h
@@ -24,7 +24,7 @@
 // will co-exist in the source base for a while. The actual allocator is chosen
 // at build time by redefining this macro.
 #ifndef ASAN_ALLOCATOR_VERSION
-# if ASAN_LINUX && !ASAN_ANDROID
+# if (ASAN_LINUX && !ASAN_ANDROID) || ASAN_MAC
 #  define ASAN_ALLOCATOR_VERSION 2
 # else
 #  define ASAN_ALLOCATOR_VERSION 1