From 885573e9d5efa9f76315cd776feb9ab7f4ef07f8 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Jan 20 2010 09:24:19 +0000
Subject: 3.5.0-13


---

diff --git a/valgrind-3.5.0-DW_OP_mod.patch b/valgrind-3.5.0-DW_OP_mod.patch
new file mode 100644
index 0000000..0df7c05
--- /dev/null
+++ b/valgrind-3.5.0-DW_OP_mod.patch
@@ -0,0 +1,20 @@
+--- valgrind/coregrind/m_debuginfo/d3basics.c.jj	2010-01-20 09:46:56.000000000 +0100
++++ valgrind/coregrind/m_debuginfo/d3basics.c	2010-01-20 09:52:33.000000000 +0100
+@@ -770,12 +770,12 @@ GXResult ML_(evaluate_Dwarf3_Expr) ( UCh
+             PUSH(sw1);
+             break;
+          case DW_OP_mod:
+-            POP(sw2);
+-            if (sw2 == 0)
++            POP(uw2);
++            if (uw2 == 0)
+                FAIL("evaluate_Dwarf3_Expr: division by zero");
+-            POP(sw1);
+-            sw1 %= sw2;
+-            PUSH(sw1);
++            POP(uw1);
++            uw1 %= uw2;
++            PUSH(uw1);
+             break;
+ #define BINARY(name, op, s) \
+          case DW_OP_##name:		\
diff --git a/valgrind-3.5.0-pkgconfig.patch b/valgrind-3.5.0-pkgconfig.patch
new file mode 100644
index 0000000..bcb1ef6
--- /dev/null
+++ b/valgrind-3.5.0-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- valgrind/valgrind.pc.in.jj	2009-10-09 12:52:05.000000000 +0200
++++ valgrind/valgrind.pc.in	2010-01-20 10:17:40.000000000 +0100
+@@ -11,6 +11,6 @@ Name: Valgrind
+ Description: A dynamic binary instrumentation framework
+ Version: @VERSION@
+ Requires:
+-Libs: -L${libdir}/valgrind/@VGCONF_ARCH_PRI@-@VGCONF_OS@ -lcoregrind -lvex -lgcc
++Libs: -L${libdir}/valgrind -lcoregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@ -lvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@ -lgcc
+ Cflags: -I${includedir}
+ 
diff --git a/valgrind-3.5.0-ppc-tests.patch b/valgrind-3.5.0-ppc-tests.patch
index 8d2236f..f0119ba 100644
--- a/valgrind-3.5.0-ppc-tests.patch
+++ b/valgrind-3.5.0-ppc-tests.patch
@@ -8,10 +8,10 @@
 -register double f15 __asm__ ("f15");
 -register double f16 __asm__ ("f16");
 -register double f17 __asm__ ("f17");
-+register double f14 __asm__ ("46");
-+register double f15 __asm__ ("47");
-+register double f16 __asm__ ("48");
-+register double f17 __asm__ ("49");
++register double f14 __asm__ ("fr14");
++register double f15 __asm__ ("fr15");
++register double f16 __asm__ ("fr16");
++register double f17 __asm__ ("fr17");
  register HWord_t r14 __asm__ ("r14");
  register HWord_t r15 __asm__ ("r15");
  register HWord_t r16 __asm__ ("r16");
@@ -25,10 +25,10 @@
 -register double f15 __asm__ ("f15");
 -register double f16 __asm__ ("f16");
 -register double f17 __asm__ ("f17");
-+register double f14 __asm__ ("46");
-+register double f15 __asm__ ("47");
-+register double f16 __asm__ ("48");
-+register double f17 __asm__ ("49");
++register double f14 __asm__ ("fr14");
++register double f15 __asm__ ("fr15");
++register double f16 __asm__ ("fr16");
++register double f17 __asm__ ("fr17");
  register HWord_t r14 __asm__ ("r14");
  register HWord_t r15 __asm__ ("r15");
  register HWord_t r16 __asm__ ("r16");
diff --git a/valgrind.spec b/valgrind.spec
index ae1fbb1..291f0e5 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -23,6 +23,8 @@ Patch16: valgrind-3.5.0-glibc-2.11.patch
 Patch17: valgrind-3.5.0-syscalls2.patch
 Patch18: valgrind-3.5.0-dynbss.patch
 Patch19: valgrind-3.5.0-adjtimex.patch
+Patch20: valgrind-3.5.0-DW_OP_mod.patch
+Patch21: valgrind-3.5.0-pkgconfig.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -95,6 +97,8 @@ or valgrind plugins.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -180,6 +184,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jan 20 2010 Jakub Jelinek <jakub@redhat.com> 3.5.0-13
+- DW_OP_mod is unsigned modulus instead of signed
+- fix up valgrind.pc (#551277)
+
 * Mon Dec 21 2009 Jakub Jelinek <jakub@redhat.com> 3.5.0-12
 - don't require offset field to be set in adjtimex's
   ADJ_OFFSET_SS_READ mode (#545866)