diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2015-11-09 18:05:24 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2015-11-09 18:05:24 +0000 |
| commit | c3825cb83ded0b710b40add0c95adfebed544902 (patch) | |
| tree | 7bce4ecec9fac431e54ce663e09fe7b1575bc035 /lib/asan | |
| parent | 623cb1d391f15595c8c2e9814d140db8bad9bddb (diff) | |
[compiler-rt] [asan] Use same shadow offset for aarch64
This patch makes ASAN for aarch64 use the same shadow offset for all
currently supported VMAs (39 and 42 bits). The shadow offset is the
same for 39-bit (36).
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@252497 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan')
| -rw-r--r-- | lib/asan/asan_mapping.h | 4 | ||||
| -rw-r--r-- | lib/asan/asan_rtl.cc | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/lib/asan/asan_mapping.h b/lib/asan/asan_mapping.h index f76ca53c3..f46d0edab 100644 --- a/lib/asan/asan_mapping.h +++ b/lib/asan/asan_mapping.h @@ -118,11 +118,7 @@ static const u64 kIosShadowOffset32 = 1ULL << 30; // 0x40000000 static const u64 kIosShadowOffset64 = 0x130000000; static const u64 kIosSimShadowOffset32 = 1ULL << 30; static const u64 kIosSimShadowOffset64 = kDefaultShadowOffset64; -#if SANITIZER_AARCH64_VMA == 39 static const u64 kAArch64_ShadowOffset64 = 1ULL << 36; -#elif SANITIZER_AARCH64_VMA == 42 -static const u64 kAArch64_ShadowOffset64 = 1ULL << 39; -#endif static const u64 kMIPS32_ShadowOffset32 = 0x0aaa0000; static const u64 kMIPS64_ShadowOffset64 = 1ULL << 37; static const u64 kPPC64_ShadowOffset64 = 1ULL << 41; diff --git a/lib/asan/asan_rtl.cc b/lib/asan/asan_rtl.cc index c744ac251..176130ca9 100644 --- a/lib/asan/asan_rtl.cc +++ b/lib/asan/asan_rtl.cc @@ -378,8 +378,6 @@ static void AsanInitInternal() { // initialization steps look at flags(). InitializeFlags(); - CheckVMASize(); - AsanCheckIncompatibleRT(); AsanCheckDynamicRTPrereqs(); |