diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2013-12-09 19:25:51 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2013-12-09 19:25:51 +0000 |
| commit | 9bc52662a095e68b938ab2492675eec035b69c0a (patch) | |
| tree | d0eed9c13a3ca8b4bc6755ab35280d6de6074f12 /lib/asan/asan_mapping.h | |
| parent | 21de371246adb7b3cf5d73049c1fd3d216562125 (diff) | |
Revert three patches which were committed without explicit contribution
by their authors.
This may break builds where others added code relying on these patches,
but please *do not* revert this commit. Instead, we will prepare patches
which fix the failures.
Reverts the following commits:
r168306: "[asan] support x32 mode in the fast stack unwinder. Patch by H.J. Lu"
r168356: "[asan] more support for powerpc, patch by Peter Bergner"
r196489: "[sanitizer] fix the ppc32 build (patch by Jakub Jelinek)"
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@196802 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_mapping.h')
| -rw-r--r-- | lib/asan/asan_mapping.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/asan/asan_mapping.h b/lib/asan/asan_mapping.h index b097f841f..bdcf2f9e5 100644 --- a/lib/asan/asan_mapping.h +++ b/lib/asan/asan_mapping.h @@ -61,7 +61,6 @@ static const u64 kDefaultShadowScale = 3; static const u64 kDefaultShadowOffset32 = 1ULL << 29; static const u64 kDefaultShadowOffset64 = 1ULL << 44; static const u64 kDefaultShort64bitShadowOffset = 0x7FFF8000; // < 2G. -static const u64 kPPC64_ShadowOffset64 = 1ULL << 41; static const u64 kMIPS32_ShadowOffset32 = 0x0aaa8000; #if ASAN_FLEXIBLE_MAPPING_AND_OFFSET == 1 @@ -81,9 +80,7 @@ extern "C" SANITIZER_INTERFACE_ATTRIBUTE uptr __asan_mapping_offset; # define SHADOW_OFFSET kDefaultShadowOffset32 # endif # else -# if defined(__powerpc64__) -# define SHADOW_OFFSET kPPC64_ShadowOffset64 -# elif SANITIZER_MAC +# if SANITIZER_MAC # define SHADOW_OFFSET kDefaultShadowOffset64 # else # define SHADOW_OFFSET kDefaultShort64bitShadowOffset |