From c7430b108fbc97d1d0312bca0ddc7bc7b82ce41e Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Feb 14 2020 12:51:57 +0000
Subject: 3.15.0-18 - Add valgrind-3.15.0-ppc64-sigframe.patch


---

diff --git a/valgrind-3.15.0-ppc64-sigframe.patch b/valgrind-3.15.0-ppc64-sigframe.patch
new file mode 100644
index 0000000..839ce1a
--- /dev/null
+++ b/valgrind-3.15.0-ppc64-sigframe.patch
@@ -0,0 +1,20 @@
+---
+ coregrind/m_sigframe/sigframe-ppc64-linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/coregrind/m_sigframe/sigframe-ppc64-linux.c b/coregrind/m_sigframe/
+sigframe-ppc64-linux.c
+index 0406f3c..b54c4e0 100644
+--- a/coregrind/m_sigframe/sigframe-ppc64-linux.c
++++ b/coregrind/m_sigframe/sigframe-ppc64-linux.c
+@@ -112,7 +112,7 @@ struct rt_sigframe {
+    vki_siginfo_t         info;
+    struct vg_sig_private priv;
+    UChar                 abigap[288];   // unused
+-};
++} __attribute__ ((aligned (16)));
+ 
+ #define SET_SIGNAL_LR(zztst, zzval)                          \
+    do { tst->arch.vex.guest_LR = (zzval);                    \
+-- 
+2.7.4
diff --git a/valgrind.spec b/valgrind.spec
index ed29184..5634d32 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: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -155,6 +155,10 @@ Patch25: valgrind-3.15.0-s390x-HRcVec128.patch
 # KDE#417578 - Add suppressions for glibc DTV leaks
 Patch26: valgrind-3.15.0-glibc-dtv-supp.patch
 
+# KDE#416760 Assertion 'VG_IS_16_ALIGNED(sizeof(struct rt_sigframe))' failed
+# KDE#417427 commit to fix vki_siginfo_t definition created errors on PPC64
+Patch27: valgrind-3.15.0-ppc64-sigframe.patch
+
 BuildRequires: glibc-devel
 
 %if %{build_openmpi}
@@ -310,17 +314,14 @@ Valgrind User Manual for details.
 %patch19 -p1
 %endif
 
-# KDE#416760 Assertion 'VG_IS_16_ALIGNED(sizeof(struct rt_sigframe))' failed
-%ifnarch ppc64 ppc64le
 %patch20 -p1
-%endif
-
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %build
 
@@ -541,6 +542,9 @@ fi
 %endif
 
 %changelog
+* Fri Feb 14 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-18
+- Add valgrind-3.15.0-ppc64-sigframe.patch
+
 * Thu Feb 13 2020 Mark Wielaard <mjw@fedoraproject.org> - 3.15.0-17
 - Add valgrind-3.15.0-glibc-dtv-supp.patch