From 0ceac876cd72fb4da2c4c6041ed3d4cdb408421d Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Oct 12 2015 20:45:10 +0000
Subject: 3.11.0-4 Add valgrind-3.11.0-s390-hwcap.patch.


---

diff --git a/valgrind-3.11.0-s390-hwcap.patch b/valgrind-3.11.0-s390-hwcap.patch
new file mode 100644
index 0000000..4413a8e
--- /dev/null
+++ b/valgrind-3.11.0-s390-hwcap.patch
@@ -0,0 +1,70 @@
+On a zEC12 or z13, a glibc with lock elision enabled infers from HWCAP
+that the prerequisites for lock elision are met.  Then it may use TBEGIN
+and other transactional-execution instructions which are not implemented
+by Valgrind.  Likewise, the upcoming glibc 2.23 will exploit vector
+instructions if they are advertised by HWCAP; and those are currently
+not implemented by Valgrind either.  In general, the increased use of
+ifunc may lead to more such cases in the future.
+
+This patch suppresses the advertising of those hardware features via
+HWCAP which are either not known to Valgrind or currently unsupported.
+
+Patch by Andreas Arnez (arnez@linux.vnet.ibm.com).
+Fixes BZ #353680.
+
+Modified: trunk/README.s390
+==============================================================================
+--- trunk/README.s390 (original)
++++ trunk/README.s390 Mon Oct 12 21:35:56 2015
+@@ -22,6 +22,9 @@
+ - Some gcc versions use mvc to copy 4/8 byte values. This will affect
+   certain debug messages. For example, memcheck will complain about
+   4 one-byte reads/writes instead of just a single read/write.
++- The transactional-execution facility is not supported; it is masked
++  off from HWCAP.
++- The vector facility is not supported; it is masked off from HWCAP.
+ 
+ 
+ Hardware facilities
+
+Modified: trunk/coregrind/m_initimg/initimg-linux.c
+==============================================================================
+--- trunk/coregrind/m_initimg/initimg-linux.c (original)
++++ trunk/coregrind/m_initimg/initimg-linux.c Mon Oct 12 21:35:56 2015
+@@ -701,6 +701,12 @@
+                  in syswrap-arm-linux.c rather than to base this on
+                  conditional compilation. */
+             }
++#           elif defined(VGP_s390x_linux)
++            {
++               /* Advertise hardware features "below" TE only.  TE and VXRS
++                  (and anything above) are not supported by Valgrind. */
++               auxv->u.a_val &= VKI_HWCAP_S390_TE - 1;
++            }
+ #           endif
+             break;
+ #        if defined(VGP_ppc64be_linux) || defined(VGP_ppc64le_linux)
+
+Modified: trunk/include/vki/vki-s390x-linux.h
+==============================================================================
+--- trunk/include/vki/vki-s390x-linux.h (original)
++++ trunk/include/vki/vki-s390x-linux.h Mon Oct 12 21:35:56 2015
+@@ -800,12 +800,15 @@
+ #define VKI_PTRACE_POKEUSR_AREA       0x5001
+ 
+ //----------------------------------------------------------------------
+-// From linux-2.6.16.60/include/asm-s390/elf.h
++// From linux-3.18/include/asm-s390/elf.h
+ //----------------------------------------------------------------------
+ 
+ typedef vki_s390_fp_regs vki_elf_fpregset_t;
+ typedef vki_s390_regs vki_elf_gregset_t;
+ 
++#define VKI_HWCAP_S390_TE           1024
++#define VKI_HWCAP_S390_VXRS         2048
++
+ 
+ //----------------------------------------------------------------------
+ // From linux-2.6.16.60/include/asm-s390/ucontext.h
+
+
diff --git a/valgrind.spec b/valgrind.spec
index 5766f3f..146fd82 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.11.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -67,6 +67,9 @@ Patch6: valgrind-3.11.0-no-rdrand.patch
 # KDE#278744 cvtps2pd with redundant RexW
 Patch7: valgrind-3.11.0-rexw-cvtps2pd.patch
 
+# KDE#353680 Crash with certain glibc versions due to non-implemented TBEGIN
+Patch8: valgrind-3.11.0-s390-hwcap.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
@@ -178,6 +181,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.
@@ -353,6 +357,10 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Mon Oct 12 2015 Mark Wielaard <mjw@redhat.com> - 3.11.0-4
+- Fix parenthesis in valgrind-3.11.0-rexw-cvtps2pd.patch.
+- Add valgrind-3.11.0-s390-hwcap.patch
+
 * Mon Oct 12 2015 Mark Wielaard <mjw@redhat.com> - 3.11.0-3
 - Add valgrind-3.11.0-rexw-cvtps2pd.patch.