From c45d09f6d776a08c846f6a68ef5f87cede97fac3b9437237075d9d5781520d5e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sat, 28 May 2016 11:02:01 +0000
Subject: [PATCH] - add vex-r3197.diff (bsc#981447)

OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=144
---
 valgrind.changes |  5 +++++
 valgrind.spec    |  4 +++-
 vex-r3197.diff   | 23 +++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 vex-r3197.diff

diff --git a/valgrind.changes b/valgrind.changes
index 167ae36..f2bb7bd 100644
--- a/valgrind.changes
+++ b/valgrind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 28 11:01:13 UTC 2016 - dmueller@suse.com
+
+- add vex-r3197.diff (bsc#981447)
+
 -------------------------------------------------------------------
 Wed Apr 20 09:13:09 UTC 2016 - jslaby@suse.com
 
diff --git a/valgrind.spec b/valgrind.spec
index 04313fc..6619032 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -41,7 +41,8 @@ Patch5:         svn-r15766.patch
 Patch6:         r15702.diff
 Patch7:         r15792.diff
 Patch8:         r15802.diff
-Patch100:       vex-r3210.diff
+Patch100:       vex-r3197.diff
+Patch101:       vex-r3210.diff
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docbook_4
@@ -122,6 +123,7 @@ but it has been successfully used to optimize several KDE applications.
 %patch7
 %patch8
 %patch100
+%patch101
 
 %build
 export FLAGS="%{optflags}"
diff --git a/vex-r3197.diff b/vex-r3197.diff
new file mode 100644
index 0000000..43f5198
--- /dev/null
+++ b/vex-r3197.diff
@@ -0,0 +1,23 @@
+------------------------------------------------------------------------
+r3197 | mjw | 2015-10-01 14:31:19 +0200 (Do, 01. Okt 2015) | 5 Zeilen
+
+Don't advertise RDRAND in cpuid for Core-i7-4910-like avx2 machine.
+
+Bug#353370. In amd64g_dirtyhelper_CPUID_avx2 we set the RDRAND bit
+but we don't implement support for RDRAND. Turn the bit off so programs
+don't try to use RDRAND when running under valgrind.
+------------------------------------------------------------------------
+Index: priv/guest_amd64_helpers.c
+===================================================================
+--- VEX/priv/guest_amd64_helpers.c	(Revision 3196)
++++ VEX/priv/guest_amd64_helpers.c	(Revision 3197)
+@@ -3101,7 +3101,8 @@ void amd64g_dirtyhelper_CPUID_avx2 ( Vex
+          SET_ABCD(0x0000000d, 0x756e6547, 0x6c65746e, 0x49656e69);
+          break;
+       case 0x00000001:
+-         SET_ABCD(0x000306c3, 0x02100800, 0x7ffafbff, 0xbfebfbff);
++         /* Don't advertise RDRAND support, bit 30 in ECX.  */
++         SET_ABCD(0x000306c3, 0x02100800, 0x3ffafbff, 0xbfebfbff);
+          break;
+       case 0x00000002:
+          SET_ABCD(0x76036301, 0x00f0b6ff, 0x00000000, 0x00c10000);