From 536c355716d6f1b873f77931e31aa009ee665741 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Sun, 16 Dec 2018 11:48:20 +0100
Subject: [PATCH] 3.14.0-7 - Add valgrind-3.14.0-mc_translate-vecret.patch

---
 valgrind-3.14.0-mc_translate-vecret.patch | 12 ++++++++++++
 valgrind.spec                             |  8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 valgrind-3.14.0-mc_translate-vecret.patch

diff --git a/valgrind-3.14.0-mc_translate-vecret.patch b/valgrind-3.14.0-mc_translate-vecret.patch
new file mode 100644
index 0000000..487d328
--- /dev/null
+++ b/valgrind-3.14.0-mc_translate-vecret.patch
@@ -0,0 +1,12 @@
+diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
+index c24db91..1e770b3 100644
+--- a/memcheck/mc_translate.c
++++ b/memcheck/mc_translate.c
+@@ -8022,6 +8022,7 @@ static inline void noteTmpUsesIn ( /*MOD*/HowUsed* useEnv,
+       use info. */
+    switch (at->tag) {
+       case Iex_GSPTR:
++      case Iex_VECRET:
+       case Iex_Const:
+          return;
+       case Iex_RdTmp: {
diff --git a/valgrind.spec b/valgrind.spec
index e2c665c..f70f0a5 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.14.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -157,6 +157,8 @@ Patch28: valgrind-3.14.0-ppc64-ptrace.patch
 # commit 43fe4bc23 arm64: Fix PTRACE_TRACEME
 Patch29: valgrind-3.14.0-arm64-ptrace-traceme.patch
 
+# KDE#402134 - assert fail mc_translate.c (noteTmpUsesIn) Iex_VECRET on arm64
+Patch30: valgrind-3.14.0-mc_translate-vecret.patch
 
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
@@ -319,6 +321,7 @@ Valgrind User Manual for details.
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 
 %build
 CC=gcc
@@ -553,8 +556,9 @@ fi
 %endif
 
 %changelog
-* Fri Dec 14 2018 Mark Wielaard <mjw@fedoraproject.org>
+* Fri Dec 14 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-7
 - Add valgrind-3.14.0-arm64-ptrace-traceme.patch
+- Add valgrind-3.14.0-mc_translate-vecret.patch
 
 * Wed Dec 12 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.14.0-6
 - Add valgrind-3.14.0-final_tidyup.patch