- up to 3.7.0

[packages/valgrind.git] / valgrind-debuginfo.patch

diff --git a/valgrind-debuginfo.patch b/valgrind-debuginfo.patch
index 64bf4db6650a7e9fd537a39e75f80f56a9b644cf..bab4da9191aa7824935c454288214187e6369e0b 100644 (file)
--- a/valgrind-debuginfo.patch
+++ b/valgrind-debuginfo.patch
@@ -1,14 +1,13 @@
-diff -ruN valgrind-3.2.3./coregrind/m_debuginfo/readelf.c valgrind-3.2.3/coregrind/m_debuginfo/readelf.c
---- valgrind-3.2.3./coregrind/m_debuginfo/readelf.c    2007-01-13 00:19:50.000000000 +0100
-+++ valgrind-3.2.3/coregrind/m_debuginfo/readelf.c     2007-04-21 14:34:39.564762671 +0200
-@@ -790,7 +790,9 @@
-       VG_(sprintf)(debugpath, "%s/.debug/%s", objdir, debugname);
-       if ((addr = open_debug_file(debugpath, crc, size)) == 0) {
-          VG_(sprintf)(debugpath, "/usr/lib/debug%s/%s", objdir, debugname);
--         addr = open_debug_file(debugpath, crc, size);
-+         if ((addr = open_debug_file(debugpath, crc, size)) == 0) {
-+            addr = open_debug_file(debugname, crc, size);
-+       }
+--- coregrind/m_debuginfo/readelf.c~   2011-10-26 23:24:44.000000000 +0200
++++ coregrind/m_debuginfo/readelf.c    2011-12-10 16:02:00.557983343 +0100
+@@ -1198,7 +1198,9 @@
+          VG_(sprintf)(debugpath, "%s/.debug/%s", objdir, debugname);
+          if ((addr = open_debug_file(debugpath, NULL, crc, &size)) == 0) {
+             VG_(sprintf)(debugpath, "/usr/lib/debug%s/%s", objdir, debugname);
+-            addr = open_debug_file(debugpath, NULL, crc, &size);
++            if ((addr = open_debug_file(debugpath, NULL, crc, &size)) == 0) {
++                addr = open_debug_file(debugname, NULL, crc, size);
++            }
+          }
        }
-    }