From 24c60750c0281c83f6169aa5694af9f0999265f9 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Aug 05 2019 14:26:31 +0000
Subject: Add valgrind-3.15.0-arm-membarrier.patch


---

diff --git a/valgrind-3.15.0-arm-membarrier.patch b/valgrind-3.15.0-arm-membarrier.patch
new file mode 100644
index 0000000..945e1a8
--- /dev/null
+++ b/valgrind-3.15.0-arm-membarrier.patch
@@ -0,0 +1,18 @@
+commit 9616e9bc9a1950f70ab1abd1c6ca9abc3f26eb7f
+Author: Mark Wielaard <mark@klomp.org>
+Date:   Fri May 31 15:11:35 2019 +0200
+
+    Hook up membarrier syscall for arm-linux.
+
+diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
+index 3c5194d55..5e8baf8db 100644
+--- a/coregrind/m_syswrap/syswrap-arm-linux.c
++++ b/coregrind/m_syswrap/syswrap-arm-linux.c
+@@ -1014,6 +1014,7 @@ static SyscallTableEntry syscall_main_table[] = {
+    LINXY(__NR_getrandom,         sys_getrandom),        // 384
+    LINXY(__NR_memfd_create,      sys_memfd_create),     // 385
+ 
++   LINX_(__NR_membarrier,        sys_membarrier),       // 389
+    LINX_(__NR_copy_file_range,   sys_copy_file_range),  // 391
+ 
+    LINXY(__NR_statx,             sys_statx),            // 397
diff --git a/valgrind.spec b/valgrind.spec
index 1520b13..c8d7499 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -127,6 +127,9 @@ Patch16: valgrind-3.15.0-pkey.patch
 # KDE#408414 Add support for preadv2 and pwritev2 syscalls
 Patch17: valgrind-3.15.0-preadv2-pwritev2.patch
 
+# Upstream commit 9616e9bc9a1950f70ab1abd1c6ca9abc3f26eb7f
+Patch18: valgrind-3.15.0-arm-membarrier.patch
+
 BuildRequires: glibc-devel
 
 %if %{build_openmpi}
@@ -275,6 +278,7 @@ Valgrind User Manual for details.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 
@@ -497,6 +501,7 @@ fi
 %changelog
 * Mon Aug  5 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-11
 - Add valgrind-3.15.0-preadv2-pwritev2.patch
+- Add valgrind-3.15.0-arm-membarrier.patch
 
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.15.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild