From 538f0cd8b54cf1526c673d0fb78a4b9a56cb910b Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Wed, 17 Feb 2016 22:25:08 +0100
Subject: [PATCH] Remove valgrind-3.11.0-no-stv.patch (gcc6 has been fixed).

---
 valgrind-3.11.0-no-stv.patch | 22 ----------------------
 valgrind.spec                |  7 +++----
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 valgrind-3.11.0-no-stv.patch

diff --git a/valgrind-3.11.0-no-stv.patch b/valgrind-3.11.0-no-stv.patch
deleted file mode 100644
index c1a2207..0000000
--- a/valgrind-3.11.0-no-stv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- valgrind-3.11.0.orig/configure	2015-11-15 18:08:05.399929722 +0100
-+++ valgrind-3.11.0/configure	2016-01-30 19:33:09.616564942 +0100
-@@ -8630,7 +8630,7 @@
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- 
--PREFERRED_STACK_BOUNDARY_2="-mpreferred-stack-boundary=2"
-+PREFERRED_STACK_BOUNDARY_2="-mpreferred-stack-boundary=2 -mno-stv"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
---- valgrind-3.11.0.orig/configure.ac	2015-11-15 18:08:05.497930840 +0100
-+++ valgrind-3.11.0/configure.ac	2016-01-30 19:32:54.833417794 +0100
-@@ -1836,7 +1836,7 @@
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
-   return 0;
- ]])], [
--PREFERRED_STACK_BOUNDARY_2="-mpreferred-stack-boundary=2"
-+PREFERRED_STACK_BOUNDARY_2="-mpreferred-stack-boundary=2 -mno-stv"
- AC_MSG_RESULT([yes])
- ], [
- PREFERRED_STACK_BOUNDARY_2=""
diff --git a/valgrind.spec b/valgrind.spec
index 80c2396..8785724 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -101,9 +101,6 @@ Patch17: valgrind-3.11.0-x86_unwind.patch
 # KDE#358478 drd/tests/std_thread.cpp doesn't build with GCC6
 Patch18: valgrind-3.11.0-drd_std_thread.patch
 
-# GCC#69454 Workaround for ix86_expand_prologue internal compiler error
-Patch19: valgrind-3.11.0-no-stv.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
@@ -226,7 +223,6 @@ Valgrind User Manual for details.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -419,6 +415,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Wed Feb 17 2016 Mark Wielaard <mjw@redhat.com>
+- Remove valgrind-3.11.0-no-stv.patch (gcc6 has been fixed).
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.11.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild