diff options
| author | Bill Seurer <seurer@linux.vnet.ibm.com> | 2017-11-13 15:43:19 +0000 |
|---|---|---|
| committer | Bill Seurer <seurer@linux.vnet.ibm.com> | 2017-11-13 15:43:19 +0000 |
| commit | 44156a0efb92b178d3a0fdaf8af97a29778c0b2c (patch) | |
| tree | fc99dab08ee74818a3fe6f3003bee97384c74e1c | |
| parent | 3e3ee1282b987b8adb85f33849c0054839152287 (diff) | |
| download | bcm5719-llvm-44156a0efb92b178d3a0fdaf8af97a29778c0b2c.tar.gz bcm5719-llvm-44156a0efb92b178d3a0fdaf8af97a29778c0b2c.zip | |
[PowerPC][msan] Update msan to handle changed memory layouts in newer kernels
In more recent Linux kernels (including those with 47 bit VMAs) the layout of
virtual memory for powerpc64 changed causing the memory sanitizer to not
work properly. This patch adjusts a bit mask in the memory sanitizer to work
on the newer kernels while continuing to work on the older ones as well.
This is the non-runtime part of the patch and finishes it. ref: r317802
Tested on several 4.x and 3.x kernel releases.
llvm-svn: 318045
| -rw-r--r-- | llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp index 0e6f6bacf44..c8e772d9d84 100644 --- a/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ b/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -290,7 +290,7 @@ static const MemoryMapParams Linux_MIPS64_MemoryMapParams = { // ppc64 Linux static const MemoryMapParams Linux_PowerPC64_MemoryMapParams = { - 0x200000000000, // AndMask + 0xE00000000000, // AndMask 0x100000000000, // XorMask 0x080000000000, // ShadowBase 0x1C0000000000, // OriginBase |
