Backport r259459

2018-04-24  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2018-04-18  Bill Seurer  <seurer@linux.vnet.ibm.com>

	PR sanitizer/85389
	* asan/asan_allocator.h (kAllocatorSpace): For __powerpc64__ change
	from 0xa0000000000ULL to ~(uptr)0.

From-SVN: r259604

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 2c213f18e0c9adca58f2b9bbefbd9364bff693e4..07096babbdad54e35e4987bdaeea84e89e2cc889 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-24  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2018-04-18  Bill Seurer  <seurer@linux.vnet.ibm.com>
+
+       PR sanitizer/85389
+       * asan/asan_allocator.h (kAllocatorSpace): For __powerpc64__ change
+       from 0xa0000000000ULL to ~(uptr)0.
+
 2018-01-25  Release Manager
 
        * GCC 7.3.0 released.

diff --git a/libsanitizer/asan/asan_allocator.h b/libsanitizer/asan/asan_allocator.h
index 7eeddadd5472ee919485d207350bd7c82bc10e6c..dacfddd5ddfc989c85ff4534483f6c337414e3af 100644 (file)
--- a/libsanitizer/asan/asan_allocator.h
+++ b/libsanitizer/asan/asan_allocator.h
@@ -115,7 +115,7 @@ struct AsanMapUnmapCallback {
 
 #if SANITIZER_CAN_USE_ALLOCATOR64
 # if defined(__powerpc64__)
-const uptr kAllocatorSpace =  0xa0000000000ULL;
+const uptr kAllocatorSpace = ~(uptr)0;
 const uptr kAllocatorSize  =  0x20000000000ULL;  // 2T.
 typedef DefaultSizeClassMap SizeClassMap;
 # elif defined(__aarch64__) && SANITIZER_ANDROID