diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-05-23 11:52:37 +0000 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2012-05-23 14:23:24 -0700 |
| commit | 02a063660153ab4d0430b211f4dd0b3606bcbff7 (patch) | |
| tree | 0c08fab8274cb6f94e5e04bc1750d45b39c923fd | |
| parent | b8a0c57f15cab97957901b5c71eaac14972b71ed (diff) | |
| download | compiler-rt-02a063660153ab4d0430b211f4dd0b3606bcbff7.tar.gz | |
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
| -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 4824bf109..07d9099f4 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) |