aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2018-10-31 12:16:41 +0100
committerMartin Liska <marxin@gcc.gnu.org>2018-10-31 11:16:41 +0000
commitf607b87cbe68705684b9dcecab6a26b4cf546b7a (patch)
treef530e9243aaf757b57aa90054df7ab855e5e0da6
parente63c96776535d05b610d9e11774b8ad9c085f0d0 (diff)
downloadgcc-f607b87cbe68705684b9dcecab6a26b4cf546b7a.zip
gcc-f607b87cbe68705684b9dcecab6a26b4cf546b7a.tar.gz
gcc-f607b87cbe68705684b9dcecab6a26b4cf546b7a.tar.bz2
Revert https://reviews.llvm.org/D40908 which changes asan offset to 1<<44.
2018-10-31 Martin Liska <mliska@suse.cz> * asan/asan_mapping.h: Revert shadow memory offset to 1 << 41. From-SVN: r265668
-rw-r--r--libsanitizer/ChangeLog4
-rw-r--r--libsanitizer/asan/asan_mapping.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index ba0c30f..4a93302 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,5 +1,9 @@
2018-10-31 Martin Liska <mliska@suse.cz>
+ * asan/asan_mapping.h: Revert shadow memory offset to 1 << 41.
+
+2018-10-31 Martin Liska <mliska@suse.cz>
+
* LOCAL_PATCHES: Update patch list.
* asan/asan_globals.cc (CheckODRViolationViaIndicator): Apply
patches from GCC's trunk.
diff --git a/libsanitizer/asan/asan_mapping.h b/libsanitizer/asan/asan_mapping.h
index 3f35a19..c3ad36e 100644
--- a/libsanitizer/asan/asan_mapping.h
+++ b/libsanitizer/asan/asan_mapping.h
@@ -159,7 +159,7 @@ static const u64 kIosSimShadowOffset64 = kDefaultShadowOffset64;
static const u64 kAArch64_ShadowOffset64 = 1ULL << 36;
static const u64 kMIPS32_ShadowOffset32 = 0x0aaa0000;
static const u64 kMIPS64_ShadowOffset64 = 1ULL << 37;
-static const u64 kPPC64_ShadowOffset64 = 1ULL << 44;
+static const u64 kPPC64_ShadowOffset64 = 1ULL << 41;
static const u64 kSystemZ_ShadowOffset64 = 1ULL << 52;
static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000
static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000