From: Kostya Serebryany <kcc@google.com>
Date: Wed, 13 Feb 2013 10:15:03 +0000 (+0000)
Subject: [asan] fix fixed mapping for mac (ASAN_FLEXIBLE_MAPPING_AND_OFFSET=0)
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32214a25878d1444e7c14bcbf80b637e59c035c3;p=platform%2Fupstream%2Fllvm.git

[asan] fix fixed mapping for mac (ASAN_FLEXIBLE_MAPPING_AND_OFFSET=0)

llvm-svn: 175049
---

diff --git a/compiler-rt/lib/asan/asan_mapping.h b/compiler-rt/lib/asan/asan_mapping.h
index 4cf0675..3e7fc6b 100644
--- a/compiler-rt/lib/asan/asan_mapping.h
+++ b/compiler-rt/lib/asan/asan_mapping.h
@@ -36,7 +36,11 @@ extern SANITIZER_INTERFACE_ATTRIBUTE uptr __asan_mapping_offset;
 #   if defined(__powerpc64__)
 #    define SHADOW_OFFSET (1ULL << 41)
 #   else
-#    define SHADOW_OFFSET 0x7fff8000ULL
+#    if ASAN_MAC
+#     define SHADOW_OFFSET (1ULL << 44)
+#    else
+#     define SHADOW_OFFSET 0x7fff8000ULL
+#    endif
 #   endif
 #  endif
 # endif