From 7c295624b162368c1344a8f55e2d3d052af8b29d Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 8 Jun 2011 18:32:00 +0200
Subject: [PATCH] valgrind-3.6.1-2

---
 valgrind-3.6.1-ppc64-build.patch | 20 ++++++++++++++++++++
 valgrind.spec                    | 26 +++++++++++++++++---------
 2 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 valgrind-3.6.1-ppc64-build.patch

diff --git a/valgrind-3.6.1-ppc64-build.patch b/valgrind-3.6.1-ppc64-build.patch
new file mode 100644
index 0000000..44430b3
--- /dev/null
+++ b/valgrind-3.6.1-ppc64-build.patch
@@ -0,0 +1,20 @@
+--- valgrind/coregrind/m_dispatch/dispatch-ppc64-linux.S	(revision 11699)
++++ valgrind/coregrind/m_dispatch/dispatch-ppc64-linux.S	(revision 11700)
+@@ -310,7 +310,7 @@
+ 	/* start over */
+ 	b	.VG_(run_innerloop__dispatch_unprofiled)
+ 	/*NOTREACHED*/
+-        .size VG_(run_innerloop), .-VG_(run_innerloop)
++        .size .VG_(run_innerloop), .-.VG_(run_innerloop)
+ 
+ 
+ /*----------------------------------------------------*/
+@@ -385,7 +385,7 @@
+ 	/* start over */
+ 	b	.VG_(run_innerloop__dispatch_profiled)
+ 	/*NOTREACHED*/
+-        .size VG_(run_a_noredir_translation), .-VG_(run_a_noredir_translation)
++        .size .VG_(run_a_noredir_translation), .-.VG_(run_a_noredir_translation)
+ 
+ 
+ /*----------------------------------------------------*/
diff --git a/valgrind.spec b/valgrind.spec
index 932c724..23e8247 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.6.1-cachegrind-improvements.patch
@@ -22,6 +22,7 @@ Patch15: valgrind-3.6.1-ppc64-pwrite64.patch
 Patch16: valgrind-3.6.1-pie.patch
 Patch17: valgrind-3.6.1-gen_insn_test.patch
 Patch18: valgrind-3.6.1-x86-ldso-strlen.patch
+Patch19: valgrind-3.6.1-ppc64-build.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -32,7 +33,7 @@ Obsoletes: valgrind-callgrind
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
 %endif
 %if 0%{?fedora} >= 15
-BuildRequires: glibc-devel >= 2.13
+BuildRequires: glibc-devel >= 2.14
 %else
 BuildRequires: glibc-devel >= 2.12
 %endif
@@ -114,8 +115,9 @@ for details.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
-chmod 755 none/tests/s390x/filter_stderr
+chmod 755 none/tests/s390x/filter_stderr || :
 
 %build
 CC=gcc
@@ -157,12 +159,6 @@ gcc $RPM_OPT_FLAGS -o close_fds close_fds.c
 # XXX pth_cancel2 hangs on x86_64
 echo 'int main (void) { return 0; }' > none/tests/pth_cancel2.c
 
-# test
-make check || :
-echo ===============TESTING===================
-./close_fds make regtest || :
-echo ===============END TESTING===============
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -187,6 +183,12 @@ popd
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/valgrind/*.supp.in
 
+%check
+make %{?_smp_mflags} check || :
+echo ===============TESTING===================
+./close_fds make regtest || :
+echo ===============END TESTING===============
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -215,6 +217,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jun  8 2011 Jakub Jelinek <jakub@redhat.com> 3.6.1-2
+- fix build on ppc64 (#711608)
+- don't fail if s390x support patch hasn't been applied,
+  move testing into %%check (#708522)
+- rebuilt against glibc 2.14
+
 * Wed Feb 23 2011 Jakub Jelinek <jakub@redhat.com> 3.6.1-1
 - update to 3.6.1