diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-17 07:55:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-17 09:09:23 +0000 |
| commit | 42c6c6d7e36b349de49d652bc4818ca02dd5e13d (patch) | |
| tree | b64343776e3cb6545a56c1ae68300210c1382d75 /community/llvm7/fix-memory-mf_exec-on-aarch64.patch | |
| parent | 8eabc1cab21faad026b7808ad0cd3b041e56ea8c (diff) | |
| download | aports-42c6c6d7e36b349de49d652bc4818ca02dd5e13d.tar.bz2 aports-42c6c6d7e36b349de49d652bc4818ca02dd5e13d.tar.xz | |
community/llvm7: move from main
Diffstat (limited to 'community/llvm7/fix-memory-mf_exec-on-aarch64.patch')
| -rw-r--r-- | community/llvm7/fix-memory-mf_exec-on-aarch64.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/community/llvm7/fix-memory-mf_exec-on-aarch64.patch b/community/llvm7/fix-memory-mf_exec-on-aarch64.patch new file mode 100644 index 0000000000..a70b397333 --- /dev/null +++ b/community/llvm7/fix-memory-mf_exec-on-aarch64.patch @@ -0,0 +1,33 @@ +Fix failures in AllocationTests/MappedMemoryTest.* on aarch64: + + Failing Tests (8): + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3 + +Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10 + +--- a/lib/Support/Unix/Memory.inc ++++ b/lib/Support/Unix/Memory.inc +@@ -54,7 +54,7 @@ + llvm::sys::Memory::MF_EXEC: + return PROT_READ | PROT_WRITE | PROT_EXEC; + case llvm::sys::Memory::MF_EXEC: +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || (defined(__linux__) && (defined(__aarch64__) || defined(__powerpc64__))) + // On PowerPC, having an executable page that has no read permission + // can have unintended consequences. The function InvalidateInstruction- + // Cache uses instructions dcbf and icbi, both of which are treated by +@@ -62,6 +62,7 @@ + // executing these instructions will result in a segmentation fault. + // Somehow, this problem is not present on Linux, but it does happen + // on FreeBSD. ++ // The same problem is present even on aarch64 Linux (at least on musl). + return PROT_READ | PROT_EXEC; + #else + return PROT_EXEC; |