main/llvm5: fix ppc64le bld test err because of memory access and update checksum

author: Mike Sullivan <mksully22@gmail.com> 2019-05-06 13:22:54 +0000
committer: Natanael Copa <ncopa@alpinelinux.org> 2019-05-08 13:13:59 +0000
commit: 4b8e007d440b5cfa6ca95cedb193bbc9083b63a5 (patch)
tree: 77200c2c2b34e0970b3fe7f62263b14afe406232
parent: 00523e06f73f0a507e69166e5db05d027f357c8a (diff)
download: alpine_aports-4b8e007d440b5cfa6ca95cedb193bbc9083b63a5.tar.bz2
alpine_aports-4b8e007d440b5cfa6ca95cedb193bbc9083b63a5.tar.xz
alpine_aports-4b8e007d440b5cfa6ca95cedb193bbc9083b63a5.zip
2 files changed, 3 insertions, 3 deletions
diff --git a/main/llvm5/APKBUILD b/main/llvm5/APKBUILD
index 838b8738bf..c976b40c98 100644
--- a/main/llvm5/APKBUILD
+++ b/main/llvm5/APKBUILD
@@ -6,7 +6,7 @@ _pkgname=llvm
 pkgver=5.0.2
 _majorver=${pkgver%%.*}
 pkgname=$_pkgname$_majorver
-pkgrel=0
+pkgrel=1
 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
 arch="all"
 url="https://llvm.org/"
@@ -259,7 +259,7 @@ sha512sums="3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220b
 695502bd3b5454c2f5630c59a8cf5f8aeb0deac16a76a8a4df34849e1e35c12ed4234572a320fe4c7e96f974f572f429eb816c5aa3dcfb17057f550eac596495  0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
 3bcfeccc1f14567f99029a131b1289290226d48855857f2eb6a251e041981a8b8b2d7965099df16ebf0a406e48130679f97235ef3f3524577413bb51cf40e613  fix-CheckAtomic.cmake.patch
 5e61bbeafa64dd858cde2e85d3001f3abc0379f7ca057e9f49684eeabc8b4663f79136d688aff8a83a480b3e7cde76823d381e9dd6933187a36ff59da85532b2  dynamiclibrary-fix-build-musl.patch
-e6d925ddc71f9f2ce8a859ac519dad51cba99c07129e378a5388bb1dd2f7d5b9d5ed392e85267fd20043789c7460a7d705eb8f970b2d130edbf5a934e9505ac4  fix-memory-mf_exec-on-aarch64.patch
+c9ef3cd95c4bd1d6ac69bbcd471b01755126d00f59d27d4a2a2ef5623943be73f8407e2fd731294d1a9d81a66e459f45f3f1d5dc5f9646f4f2fb2d8d891b5279  fix-memory-mf_exec-on-aarch64.patch
 7d4825d16107e56a14b7b05be847f03d75e2e05952bea0742a1233b5b0441c9934d8058e612abb6471272884372d9bfd3348355fbd3c19cba82a554003cc3eec  fix-LLVMConfig-cmake-install-prefix.patch
 f57c734687c8ceae8d1bbfcbfdeecb75a5059a112967f4ba639d78d2484e0cc1deabf02ba2d3a6f5283443bf8b3230f38ad143800f8f3327cca0d2691a3ddc3d  fix-return-type-in-ORC-readMem-client-interface.patch
 95b335237328e249c7de71648385d90e736932b1d47cf07a9188ea98d4c2bc740f217e4145f65cb9822058515b6fccaeaf28fb0319fd692e7278a2d542186f54  fix-too-strict-gtest-banner-check.patch"
diff --git a/main/llvm5/fix-memory-mf_exec-on-aarch64.patch b/main/llvm5/fix-memory-mf_exec-on-aarch64.patch
index 644c77790a..a70b397333 100644
--- a/main/llvm5/fix-memory-mf_exec-on-aarch64.patch
+++ b/main/llvm5/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
author	Mike Sullivan <mksully22@gmail.com>	2019-05-06 13:22:54 +0000
committer	Natanael Copa <ncopa@alpinelinux.org>	2019-05-08 13:13:59 +0000
commit	4b8e007d440b5cfa6ca95cedb193bbc9083b63a5 (patch)
tree	77200c2c2b34e0970b3fe7f62263b14afe406232
parent	00523e06f73f0a507e69166e5db05d027f357c8a (diff)
download	alpine_aports-4b8e007d440b5cfa6ca95cedb193bbc9083b63a5.tar.bz2 alpine_aports-4b8e007d440b5cfa6ca95cedb193bbc9083b63a5.tar.xz alpine_aports-4b8e007d440b5cfa6ca95cedb193bbc9083b63a5.zip

diff --git a/main/llvm5/APKBUILD b/main/llvm5/APKBUILD index 838b8738bf..c976b40c98 100644 --- a/main/llvm5/APKBUILD +++ b/main/llvm5/APKBUILD
@@ -6,7 +6,7 @@ _pkgname=llvm
6	pkgver=5.0.2	6	pkgver=5.0.2
7	_majorver=${pkgver%%.*}	7	_majorver=${pkgver%%.*}
8	pkgname=$_pkgname$_majorver	8	pkgname=$_pkgname$_majorver
9	pkgrel=0	9	pkgrel=1
10	pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"	10	pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
11	arch="all"	11	arch="all"
12	url="https://llvm.org/"	12	url="https://llvm.org/"
@@ -259,7 +259,7 @@ sha512sums="3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220b
259	695502bd3b5454c2f5630c59a8cf5f8aeb0deac16a76a8a4df34849e1e35c12ed4234572a320fe4c7e96f974f572f429eb816c5aa3dcfb17057f550eac596495 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch	259	695502bd3b5454c2f5630c59a8cf5f8aeb0deac16a76a8a4df34849e1e35c12ed4234572a320fe4c7e96f974f572f429eb816c5aa3dcfb17057f550eac596495 0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
260	3bcfeccc1f14567f99029a131b1289290226d48855857f2eb6a251e041981a8b8b2d7965099df16ebf0a406e48130679f97235ef3f3524577413bb51cf40e613 fix-CheckAtomic.cmake.patch	260	3bcfeccc1f14567f99029a131b1289290226d48855857f2eb6a251e041981a8b8b2d7965099df16ebf0a406e48130679f97235ef3f3524577413bb51cf40e613 fix-CheckAtomic.cmake.patch
261	5e61bbeafa64dd858cde2e85d3001f3abc0379f7ca057e9f49684eeabc8b4663f79136d688aff8a83a480b3e7cde76823d381e9dd6933187a36ff59da85532b2 dynamiclibrary-fix-build-musl.patch	261	5e61bbeafa64dd858cde2e85d3001f3abc0379f7ca057e9f49684eeabc8b4663f79136d688aff8a83a480b3e7cde76823d381e9dd6933187a36ff59da85532b2 dynamiclibrary-fix-build-musl.patch
262	e6d925ddc71f9f2ce8a859ac519dad51cba99c07129e378a5388bb1dd2f7d5b9d5ed392e85267fd20043789c7460a7d705eb8f970b2d130edbf5a934e9505ac4 fix-memory-mf_exec-on-aarch64.patch	262	c9ef3cd95c4bd1d6ac69bbcd471b01755126d00f59d27d4a2a2ef5623943be73f8407e2fd731294d1a9d81a66e459f45f3f1d5dc5f9646f4f2fb2d8d891b5279 fix-memory-mf_exec-on-aarch64.patch
263	7d4825d16107e56a14b7b05be847f03d75e2e05952bea0742a1233b5b0441c9934d8058e612abb6471272884372d9bfd3348355fbd3c19cba82a554003cc3eec fix-LLVMConfig-cmake-install-prefix.patch	263	7d4825d16107e56a14b7b05be847f03d75e2e05952bea0742a1233b5b0441c9934d8058e612abb6471272884372d9bfd3348355fbd3c19cba82a554003cc3eec fix-LLVMConfig-cmake-install-prefix.patch
264	f57c734687c8ceae8d1bbfcbfdeecb75a5059a112967f4ba639d78d2484e0cc1deabf02ba2d3a6f5283443bf8b3230f38ad143800f8f3327cca0d2691a3ddc3d fix-return-type-in-ORC-readMem-client-interface.patch	264	f57c734687c8ceae8d1bbfcbfdeecb75a5059a112967f4ba639d78d2484e0cc1deabf02ba2d3a6f5283443bf8b3230f38ad143800f8f3327cca0d2691a3ddc3d fix-return-type-in-ORC-readMem-client-interface.patch
265	95b335237328e249c7de71648385d90e736932b1d47cf07a9188ea98d4c2bc740f217e4145f65cb9822058515b6fccaeaf28fb0319fd692e7278a2d542186f54 fix-too-strict-gtest-banner-check.patch"	265	95b335237328e249c7de71648385d90e736932b1d47cf07a9188ea98d4c2bc740f217e4145f65cb9822058515b6fccaeaf28fb0319fd692e7278a2d542186f54 fix-too-strict-gtest-banner-check.patch"


diff --git a/main/llvm5/fix-memory-mf_exec-on-aarch64.patch b/main/llvm5/fix-memory-mf_exec-on-aarch64.patch index 644c77790a..a70b397333 100644 --- a/main/llvm5/fix-memory-mf_exec-on-aarch64.patch +++ b/main/llvm5/fix-memory-mf_exec-on-aarch64.patch
@@ -19,7 +19,7 @@ Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
19	return PROT_READ \| PROT_WRITE \| PROT_EXEC;	19	return PROT_READ \| PROT_WRITE \| PROT_EXEC;
20	case llvm::sys::Memory::MF_EXEC:	20	case llvm::sys::Memory::MF_EXEC:
21	-#if defined(__FreeBSD__)	21	-#if defined(__FreeBSD__)
22	+#if defined(__FreeBSD__) \|\| (defined(__linux__) && defined(__aarch64__))	22	+#if defined(__FreeBSD__) \|\| (defined(__linux__) && (defined(__aarch64__) \|\| defined(__powerpc64__)))
23	// On PowerPC, having an executable page that has no read permission	23	// On PowerPC, having an executable page that has no read permission
24	// can have unintended consequences. The function InvalidateInstruction-	24	// can have unintended consequences. The function InvalidateInstruction-
25	// Cache uses instructions dcbf and icbi, both of which are treated by	25	// Cache uses instructions dcbf and icbi, both of which are treated by