[PR PATCH] rust: import fix-memory-mf_exec-on-aarch64.patch from alpine

[PR PATCH] rust: import fix-memory-mf_exec-on-aarch64.patch from alpine

[Gottox]

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]

There is a new pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages rust-allocation-tests
https://github.com/void-linux/void-packages/pull/21655

rust: import fix-memory-mf_exec-on-aarch64.patch from alpine
addresses buildfail in #21577

A patch file from https://github.com/void-linux/void-packages/pull/21655.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-allocation-tests-21655.patch --]
[-- Type: text/x-diff, Size: 734 bytes --]

From 2a478d55f43d65a0be7dc2de0b8e4efa6a19e6c6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 5 May 2020 16:15:15 +0200
Subject: [PATCH] rust: import fix-memory-mf_exec-on-aarch64.patch from alpine

addresses buildfail in #21577
---
 srcpkgs/rust/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index e7421cf4e04..7438264ff84 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -5,7 +5,7 @@
 # See: https://github.com/rust-lang/core-team/issues/4
 pkgname=rust
 version=1.41.1
-revision=2
+revision=3
 _rust_dist_version=1.40.0
 _cargo_dist_version=0.41.0
 # Always make sure custom distfiles used for bootstrap are

Re: [PR PATCH] [Updated] rust: import fix-memory-mf_exec-on-aarch64.patch from alpine

[Gottox]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

There is an updated pull request by Gottox against master on the void-packages repository

https://github.com/Gottox/void-packages rust-allocation-tests
https://github.com/void-linux/void-packages/pull/21655

rust: import fix-memory-mf_exec-on-aarch64.patch from alpine
addresses buildfail in #21577

A patch file from https://github.com/void-linux/void-packages/pull/21655.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-allocation-tests-21655.patch --]
[-- Type: text/x-diff, Size: 2826 bytes --]

From f5a0bb2a5604f3cf4ca136154af1ddc41ee5a427 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 5 May 2020 16:15:15 +0200
Subject: [PATCH] rust: import fix-memory-mf_exec-on-aarch64.patch from alpine

addresses buildfail in #21577
---
 .../fix-memory-mf_exec-on-aarch64.patch       | 27 +++++++++++++++++++
 srcpkgs/rust/template                         |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/rust/patches/fix-memory-mf_exec-on-aarch64.patch

diff --git a/srcpkgs/rust/patches/fix-memory-mf_exec-on-aarch64.patch b/srcpkgs/rust/patches/fix-memory-mf_exec-on-aarch64.patch
new file mode 100644
index 00000000000..9b7c62c85bd
--- /dev/null
+++ b/srcpkgs/rust/patches/fix-memory-mf_exec-on-aarch64.patch
@@ -0,0 +1,27 @@
+Source: https://git.alpinelinux.org/aports/tree/main/llvm9/fix-memory-mf_exec-on-aarch64.patch
+
+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
+
+--- ./lib/Support/Unix/Memory.inc
++++ ./lib/Support/Unix/Memory.inc
+@@ -59,7 +59,7 @@
+     return PROT_READ | PROT_WRITE | PROT_EXEC;
+   case llvm::sys::Memory::MF_EXEC:
+ #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \
+-     defined(_POWER) || defined(_ARCH_PPC))
++     defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__)))
+     // 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
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index e7421cf4e04..7438264ff84 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -5,7 +5,7 @@
 # See: https://github.com/rust-lang/core-team/issues/4
 pkgname=rust
 version=1.41.1
-revision=2
+revision=3
 _rust_dist_version=1.40.0
 _cargo_dist_version=0.41.0
 # Always make sure custom distfiles used for bootstrap are

Re: rust: import fix-memory-mf_exec-on-aarch64.patch from alpine

[jnbr]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/21655#issuecomment-624194462

Comment:
our rust is built with system llvm9, so we should apply the patch there as well

Re: rust: import fix-memory-mf_exec-on-aarch64.patch from alpine

[q66]

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/21655#issuecomment-626053226

Comment:
imported in llvm10 PR, which includes it in llvm9 too

Re: [PR PATCH] [Closed]: rust: import fix-memory-mf_exec-on-aarch64.patch from alpine

[q66]

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

There's a closed pull request on the void-packages repository

rust: import fix-memory-mf_exec-on-aarch64.patch from alpine
https://github.com/void-linux/void-packages/pull/21655

Description:
addresses buildfail in #21577