Fedora 17 is merging /lib into /usr/lib so any suppression which

explicitly matches /lib/... needs to match /usr/lib/... as well.

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

diff --git a/exp-sgcheck.supp b/exp-sgcheck.supp
index a0553f0d87dd446e2558af444239e227e9de7594..b2d4aebfd91d9ed10d9f18a9edbcecd96e8518e8 100644 (file)
--- a/exp-sgcheck.supp
+++ b/exp-sgcheck.supp
@@ -1,8 +1,8 @@
 {
    ld-2.X possibly applying relocations
    exp-sgcheck:SorG
-   obj:/*lib*/ld-2.*so*
-   obj:/*lib*/ld-2.*so*
+   obj:*/*lib*/ld-2.*so*
+   obj:*/*lib*/ld-2.*so*
 }
 
 # I'm pretty sure this is a false positive caused by the sg_ stuff

diff --git a/glibc-2.34567-NPTL-helgrind.supp b/glibc-2.34567-NPTL-helgrind.supp
index 2e2abee077d21e33b28ea386bf69a21f8547d182..08d39819e5e28c13184131790497a82efd47bfd5 100644 (file)
--- a/glibc-2.34567-NPTL-helgrind.supp
+++ b/glibc-2.34567-NPTL-helgrind.supp
@@ -27,7 +27,7 @@
 #{
 #   helgrind-glibc2X-001
 #   Helgrind:Race
-#   obj:/lib*/ld-2.*so*
+#   obj:*/lib*/ld-2.*so*
 #}
 
 # helgrind-glibc2X-002 was merged into helgrind-glibc2X-001
@@ -37,13 +37,13 @@
 {
    helgrind-glibc2X-004
    Helgrind:Race
-   obj:/lib*/libc-2.*so*
+   obj:*/lib*/libc-2.*so*
 }
 
 {
    helgrind-glibc2X-005
    Helgrind:Race
-   obj:/lib*/libpthread-2.*so*
+   obj:*/lib*/libpthread-2.*so*
 }
 
 # helgrind-glibc2X-006 was merged into helgrind-glibc2X-005
@@ -78,14 +78,14 @@
 {
    helgrind-glibc2X-101
    Helgrind:Race
-   obj:/lib*/libpthread-2.*so*
+   obj:*/lib*/libpthread-2.*so*
    fun:pthread_*
 }
 {
    helgrind-glibc2X-102
    Helgrind:Race
    fun:mythread_wrapper
-   obj:/lib*/libpthread-2.*so*
+   obj:*/lib*/libpthread-2.*so*
 }
 {
    helgrind-glibc2X-103
@@ -110,7 +110,7 @@
 {
    helgrind-glibc2X-107
    Helgrind:Race
-   obj:/lib*/libpthread-2.*so*
+   obj:*/lib*/libpthread-2.*so*
    fun:sem_*
 }
 {
@@ -126,7 +126,7 @@
 {
    helgrind-glibc2X-110
    Helgrind:Race
-   obj:/lib*/libc-2.*so*
+   obj:*/lib*/libc-2.*so*
    fun:pthread_*
 }
 {

diff --git a/glibc-2.X-drd.supp b/glibc-2.X-drd.supp
index d15ca2d2ad7977bb9edf33f3f43f716cc607ec7a..454de2dd9b136e8fe45ddb2f3bacd9d6a7f75cdb 100644 (file)
--- a/glibc-2.X-drd.supp
+++ b/glibc-2.X-drd.supp
@@ -6,7 +6,7 @@
 {
    drd-ld
    drd:ConflictingAccess
-   obj:/lib*/ld-*.so
+   obj:*/lib*/ld-*.so
 }
 
 #
@@ -22,7 +22,7 @@
 {
    drd-libc-stdio
    drd:ConflictingAccess
-   obj:/lib*/libc-*
+   obj:*/lib*/libc-*
 }
 {
    drd-libc-thread-cancellation-test
@@ -128,7 +128,7 @@
 {
    drd-libpthread-?
    drd:ConflictingAccess
-   obj:/lib/libgcc_s.so.1
+   obj:*/lib/libgcc_s.so.1
 }
 {
    drd-libpthread-nanosleep

diff --git a/glibc-2.X.supp.in b/glibc-2.X.supp.in
index bb896217d1447487cfe098d430921762b7744622..8edeb4a8acba0512c18c3647d941286f431a0da2 100644 (file)
--- a/glibc-2.X.supp.in
+++ b/glibc-2.X.supp.in
@@ -39,74 +39,74 @@
 {
    dl-hack3-cond-1
    Memcheck:Cond
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
 }
 {
    dl-hack3-cond-2
    Memcheck:Cond
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
 }
 {
    dl-hack3-cond-3
    Memcheck:Cond
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
 }
 {
    dl-hack3-cond-4
    Memcheck:Cond
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
 }
 
 {
    dl-hack4-64bit-addr-1
    Memcheck:Addr8
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
 }
 {
    dl-hack4-64bit-addr-2
    Memcheck:Addr8
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
 }
 {
    dl-hack4-64bit-addr-3
    Memcheck:Addr8
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
 }
 
 {
    dl-hack5-32bit-addr-1
    Memcheck:Addr4
-   obj:/lib*/ld-@GLIBC_VERSION@*.so
-   obj:/lib*/ld-@GLIBC_VERSION@*.so
-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
 }
 {
    dl-hack5-32bit-addr-3
    Memcheck:Addr4
-   obj:/lib*/ld-@GLIBC_VERSION@*.so
-   obj:/lib*/ld-@GLIBC_VERSION@*.so
-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
 }
 {
    dl-hack5-32bit-addr-4
    Memcheck:Addr4
-   obj:/lib*/ld-@GLIBC_VERSION@*.so
-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+   obj:*/lib*/ld-@GLIBC_VERSION@*.so
 }
 
 
@@ -149,9 +149,9 @@
 {
    glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86)
    Memcheck:Addr4
-   obj:/lib/ld-@GLIBC_VERSION@*.so
-   obj:/lib/ld-@GLIBC_VERSION@*.so
-   obj:/lib/ld-@GLIBC_VERSION@*.so
+   obj:*/lib/ld-@GLIBC_VERSION@*.so
+   obj:*/lib/ld-@GLIBC_VERSION@*.so
+   obj:*/lib/ld-@GLIBC_VERSION@*.so
 }
 
 {
@@ -225,7 +225,7 @@
    MVL-401-linuxthreads-pthread_create
    Memcheck:Param
    write(buf)
-   obj:/lib/libpthread-0.10.so
+   obj:*/lib/libpthread-0.10.so
    fun:pthread_create
 }