From: Julian Seward <jseward@acm.org>
Date: Fri, 9 Nov 2007 23:26:54 +0000 (+0000)
Subject: I got a bit confused with glibc-2.6.X suppressions whilst merging from
X-Git-Tag: svn/VALGRIND_3_3_0~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28af011553855536e8155af4c5f948b261a9fbf5;p=thirdparty%2Fvalgrind.git

I got a bit confused with glibc-2.6.X suppressions whilst merging from
branches/THRCHECK (sorry Dirk).  I'll fix them shortly.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7126
---

diff --git a/glibc-2.6.supp b/glibc-2.6.supp
index 3f8792c3a0..10ba3624b4 100644
--- a/glibc-2.6.supp
+++ b/glibc-2.6.supp
@@ -1,7 +1,7 @@
 
 ##----------------------------------------------------------------------##
 
-# Errors to suppress by default with glibc 2.4.x
+# Errors to suppress by default with glibc 2.6.x
 
 # Format of this file is:
 # {
@@ -40,23 +40,44 @@
 }
 
 {
-   dl-hack3
+   dl-hack3-1
    Memcheck:Cond
    obj:/lib*/ld-2.6*.so*
    obj:/lib*/ld-2.6*.so*
    obj:/lib*/ld-2.6*.so*
 }
-
 {
-   dl-hack3
+   dl-hack3-2
    Memcheck:Cond
-   obj:/lib*/ld-2.6*.so
-   obj:/lib*/ld-2.6*.so
-   obj:/lib*/libc-2.6*.so
-   obj:/lib*/libdl-2.6*.so
-   obj:/lib*/ld-2.6*.so
+   obj:/lib*/ld-2.6*.so*
+   obj:/lib*/ld-2.6*.so*
+   obj:/lib*/libc-2.6*.so*
+}
+
+{
+   dl-hack4-64bit-1
+   Memcheck:Addr8
+   obj:/lib64/ld-2.6*.so*
+   obj:/lib64/ld-2.6*.so*
+   obj:/lib64/ld-2.6*.so*
+}
+{
+   dl-hack4-64bit-2
+   Memcheck:Addr8
+   obj:/lib64/ld-2.6*.so*
+   obj:/lib64/ld-2.6*.so*
+   obj:/lib64/libc-2.6*.so*
+}
+{
+   dl-hack4-64bit-3
+   Memcheck:Addr8
+   obj:/lib64/ld-2.6*.so*
+   obj:/lib64/ld-2.6*.so*
+   obj:/lib64/libdl-2.6*.so*
 }
 
+
+
 ##----------------------------------------------------------------------##
 {
    glibc-2.5.x-on-SUSE-10.2-(PPC)-1
@@ -94,17 +115,9 @@
 {
    glibc-2.6-on-SUSE-10.3-(x86)
    Memcheck:Addr4
-   obj:/lib*/ld-2.6*.so*
-   obj:/lib*/ld-2.6*.so*
-   obj:/lib*/ld-2.6*.so*
-}
-
-{
-   glibc-2.6-on-SUSE-10.3-(x86_64)
-   Memcheck:Addr8
-   obj:/lib*/ld-2.6*.so
-   obj:/lib*/ld-2.6*.so
-   obj:/lib*/ld-2.6*.so
+   obj:/lib/ld-2.6*.so
+   obj:/lib/ld-2.6*.so
+   obj:/lib/ld-2.6*.so
 }
 
 ##----------------------------------------------------------------------##