commit f1ee2cd5e4c7a46e1188315daa2c79181f852bec
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Wed May 23 11:52:37 2012 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Wed May 23 11:52:37 2012 +0000
tree e529f2b807c291dbe76a09576ea5962459c5aa73
parent ed2341803878f04093f58848468926337d9ca88f

Use zero-based shadow by default on Android.



git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@157318 91177308-0d34-0410-b5e6-96231b3b80d8

lib/asan/asan_mapping.h

diff --git a/lib/asan/asan_mapping.h b/lib/asan/asan_mapping.h
index 3912484..22ee81f 100644
--- a/lib/asan/asan_mapping.h
+++ b/lib/asan/asan_mapping.h
@@ -22,15 +22,20 @@
 #if ASAN_FLEXIBLE_MAPPING_AND_OFFSET == 1
 extern __attribute__((visibility("default"))) uintptr_t __asan_mapping_scale;
 extern __attribute__((visibility("default"))) uintptr_t __asan_mapping_offset;
-#define SHADOW_SCALE (__asan_mapping_scale)
-#define SHADOW_OFFSET (__asan_mapping_offset)
+# define SHADOW_SCALE (__asan_mapping_scale)
+# define SHADOW_OFFSET (__asan_mapping_offset)
 #else
-#define SHADOW_SCALE (3)
-#if __WORDSIZE == 32
-#define SHADOW_OFFSET (1 << 29)
-#else
-#define SHADOW_OFFSET (1ULL << 44)
-#endif
+# ifdef ANDROID
+#  define SHADOW_SCALE (3)
+#  define SHADOW_OFFSET (0)
+# else
+#  define SHADOW_SCALE (3)
+#  if __WORDSIZE == 32
+#   define SHADOW_OFFSET (1 << 29)
+#  else
+#   define SHADOW_OFFSET (1ULL << 44)
+#  endif
+# endif
 #endif  // ASAN_FLEXIBLE_MAPPING_AND_OFFSET
 
 #define SHADOW_GRANULARITY (1ULL << SHADOW_SCALE)