aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-03-19 14:26:04 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-03-19 14:43:00 +0000
commite82c1699567e5a2159c614b4de4a7265a7e34d8d (patch)
tree642143bc658c9a23a59d950cad723bfc12be7385 /main
parent442a5e84d6e21f03108fa1480e650c2a3d649d2c (diff)
downloadaports-e82c1699567e5a2159c614b4de4a7265a7e34d8d.tar.bz2
aports-e82c1699567e5a2159c614b4de4a7265a7e34d8d.tar.xz
main/llvm7: fix memory mf_exec on ppc64le
related to: https://bugs.llvm.org/show_bug.cgi?id=14278 https://bugzilla.redhat.com/show_bug.cgi?id=1685065
Diffstat (limited to 'main')
-rw-r--r--main/llvm7/APKBUILD2
-rw-r--r--main/llvm7/fix-memory-mf_exec-on-aarch64.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/main/llvm7/APKBUILD b/main/llvm7/APKBUILD
index 9e8618d084..22581b3026 100644
--- a/main/llvm7/APKBUILD
+++ b/main/llvm7/APKBUILD
@@ -248,5 +248,5 @@ _mv() {
sha512sums="ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df llvm-7.0.1.src.tar.xz
49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a disable-FileSystemTest.CreateDir-perms-assert.patch
695502bd3b5454c2f5630c59a8cf5f8aeb0deac16a76a8a4df34849e1e35c12ed4234572a320fe4c7e96f974f572f429eb816c5aa3dcfb17057f550eac596495 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
-e6d925ddc71f9f2ce8a859ac519dad51cba99c07129e378a5388bb1dd2f7d5b9d5ed392e85267fd20043789c7460a7d705eb8f970b2d130edbf5a934e9505ac4 fix-memory-mf_exec-on-aarch64.patch
+c9ef3cd95c4bd1d6ac69bbcd471b01755126d00f59d27d4a2a2ef5623943be73f8407e2fd731294d1a9d81a66e459f45f3f1d5dc5f9646f4f2fb2d8d891b5279 fix-memory-mf_exec-on-aarch64.patch
7d4825d16107e56a14b7b05be847f03d75e2e05952bea0742a1233b5b0441c9934d8058e612abb6471272884372d9bfd3348355fbd3c19cba82a554003cc3eec fix-LLVMConfig-cmake-install-prefix.patch"
diff --git a/main/llvm7/fix-memory-mf_exec-on-aarch64.patch b/main/llvm7/fix-memory-mf_exec-on-aarch64.patch
index 644c77790a..a70b397333 100644
--- a/main/llvm7/fix-memory-mf_exec-on-aarch64.patch
+++ b/main/llvm7/fix-memory-mf_exec-on-aarch64.patch
@@ -19,7 +19,7 @@ Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
return PROT_READ | PROT_WRITE | PROT_EXEC;
case llvm::sys::Memory::MF_EXEC:
-#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || (defined(__linux__) && defined(__aarch64__))
++#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