From 51b48af1cb77ca1b99c0cc0b1700f16004949a7e Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Thu, 23 Jan 2020 21:20:42 +0100
Subject: [PATCH] 3.15.0-13 Add valgrind-3.15.0-gcc-10-typedef-enum.patch

Resolves: #1794482
guest_s390_defs.h:291: multiple definition of `s390x_vec_op_t'
---
 valgrind-3.15.0-gcc-10-typedef-enum.patch | 13 +++++++++++++
 valgrind.spec                             |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 valgrind-3.15.0-gcc-10-typedef-enum.patch

diff --git a/valgrind-3.15.0-gcc-10-typedef-enum.patch b/valgrind-3.15.0-gcc-10-typedef-enum.patch
new file mode 100644
index 0000000..9df1b9d
--- /dev/null
+++ b/valgrind-3.15.0-gcc-10-typedef-enum.patch
@@ -0,0 +1,13 @@
+diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
+index b9f038aaa..9f93cff19 100644
+--- a/VEX/priv/guest_s390_defs.h
++++ b/VEX/priv/guest_s390_defs.h
+@@ -261,7 +261,7 @@ extern ULong last_execute_target;
+ /* Vector operatons passed to s390x_dirtyhelper_vec_op(...) helper.
+    Please don't change ordering of elements and append new items
+    before  S390_VEC_OP_LAST. */
+-enum {
++typedef enum {
+    S390_VEC_OP_INVALID = 0,
+    S390_VEC_OP_VPKS = 1,
+    S390_VEC_OP_VPKLS = 2,
diff --git a/valgrind.spec b/valgrind.spec
index e9ade37..41736ff 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.15.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -136,6 +136,9 @@ Patch19: valgrind-3.15.0-z14-misc.patch
 # KDE#405201 Incorrect size of struct vki_siginfo on 64-bit Linux architectures
 Patch20: valgrind-3.15.0-ptrace-siginfo.patch
 
+# RHBZ#1794482 guest_s390_defs.h:291: multiple definition of `s390x_vec_op_t'
+Patch21: valgrind-3.15.0-gcc-10-typedef-enum.patch
+
 BuildRequires: glibc-devel
 
 %if %{build_openmpi}
@@ -292,6 +295,7 @@ Valgrind User Manual for details.
 %endif
 
 %patch20 -p1
+%patch21 -p1
 
 %build
 
@@ -512,6 +516,9 @@ fi
 %endif
 
 %changelog
+* Thu Jan 23 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-13
+- Add valgrind-3.15.0-gcc-10-typedef-enum.patch
+
 * Mon Sep 23 2019 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-12
 - Add valgrind-3.15.0-ptrace-siginfo.patch