From c426cf268942c629d47a5cca079f676b3edfde24 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Oct 11 2014 19:59:32 +0000
Subject: 3.10.0-4 Add valgrind-3.10.0-aarch64-dmb-sy.patch


---

diff --git a/valgrind-3.10.0-aarch64-dmb-sy.patch b/valgrind-3.10.0-aarch64-dmb-sy.patch
new file mode 100644
index 0000000..7f1de8a
--- /dev/null
+++ b/valgrind-3.10.0-aarch64-dmb-sy.patch
@@ -0,0 +1,24 @@
+commit 5343bb38f44897fcb179b4756d75294719d75fbb
+Author: mjw <mjw@8f6e269a-dfd6-0310-a8e1-e2731360e62c>
+Date:   Sat Oct 11 19:13:35 2014 +0000
+
+    Bug 339858 arm64 recognize dmb sy. Data Memory Barrier full SYstem variant.
+    
+    git-svn-id: svn://svn.valgrind.org/vex/trunk@2975 8f6e269a-dfd6-0310-a8e1-e2731360e62c
+
+diff --git a/VEX/priv/guest_arm64_toIR.c b/VEX/priv/guest_arm64_toIR.c
+index 2aa145c..5ebe0a6 100644
+--- a/VEX/priv/guest_arm64_toIR.c
++++ b/VEX/priv/guest_arm64_toIR.c
+@@ -5537,6 +5537,11 @@ Bool dis_ARM64_branch_etc(/*MB_OUT*/DisResult* dres, UInt insn,
+       DIP("isb\n");
+       return True;
+    }
++   if (INSN(31,0) == 0xD5033FBF) {
++      stmt(IRStmt_MBE(Imbe_Fence));
++      DIP("dmb sy\n");
++      return True;
++   }
+    if (INSN(31,0) == 0xD5033BBF) {
+       stmt(IRStmt_MBE(Imbe_Fence));
+       DIP("dmb ish\n");
diff --git a/valgrind.spec b/valgrind.spec
index d9d539b..2f56a67 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.10.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -68,6 +68,9 @@ Patch6: valgrind-3.10.0-aarch64-times.patch
 # KDE#339855 arm64 unhandled getsid/setsid syscalls.
 Patch7: valgrind-3.10.0-aarch64-getsetsid.patch
 
+# KDE#339858 arm64 recognize dmb sy. Data Memory Barrier full SYstem variant.
+Patch8: valgrind-3.10.0-aarch64-dmb-sy.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -173,6 +176,7 @@ Valgrind User Manual for details.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -321,9 +325,10 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
-* Sat Oct 11 2014 Mark Wielaard <mjw@redhat.com>
+* Sat Oct 11 2014 Mark Wielaard <mjw@redhat.com> - 3.10.0-4
 - Add valgrind-3.10.0-aarch64-times.patch
 - Add valgrind-3.10.0-aarch64-getsetsid.patch
+- Add valgrind-3.10.0-aarch64-dmb-sy.patch
 
 * Mon Sep 15 2014 Mark Wielaard <mjw@redhat.com> - 3.10.0-3
 - Add valgrind-3.10.0-old-ppc32-instr-magic.patch.