diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-05-23 11:52:37 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-05-23 11:52:37 +0000 |
| commit | f1ee2cd5e4c7a46e1188315daa2c79181f852bec (patch) | |
| tree | e529f2b807c291dbe76a09576ea5962459c5aa73 /lib/asan/asan_mapping.h | |
| parent | ed2341803878f04093f58848468926337d9ca88f (diff) | |
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
Diffstat (limited to 'lib/asan/asan_mapping.h')
| -rw-r--r-- | lib/asan/asan_mapping.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/asan/asan_mapping.h b/lib/asan/asan_mapping.h index 3912484c8..22ee81fb5 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) |