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

tom · tom · commit 7299d84820af · 2012-02-23T12:54:50.000Z
explicitly matches /lib/... needs to match /usr/lib/... as well.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12400 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git 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
@@ -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
@@ -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
@@ -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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`ld-2.X possibly applying relocations`
`3`	`3`	`exp-sgcheck:SorG`
`4`		`- obj:/lib/ld-2.so`
`5`		`- obj:/lib/ld-2.so`
	`4`	`+ obj:/lib/ld-2.so*`
	`5`	`+ obj:/lib/ld-2.so*`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`# I'm pretty sure this is a false positive caused by the sg_ stuff`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#{`
`28`	`28`	`# helgrind-glibc2X-001`
`29`	`29`	`# Helgrind:Race`
`30`		`-# obj:/lib/ld-2.so*`
	`30`	`+# obj:/lib/ld-2.so`
`31`	`31`	`#}`
`32`	`32`
`33`	`33`	`# helgrind-glibc2X-002 was merged into helgrind-glibc2X-001`
`@@ -37,13 +37,13 @@`
`37`	`37`	`{`
`38`	`38`	`helgrind-glibc2X-004`
`39`	`39`	`Helgrind:Race`
`40`		`- obj:/lib/libc-2.so*`
	`40`	`+ obj:/lib/libc-2.so`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`{`
`44`	`44`	`helgrind-glibc2X-005`
`45`	`45`	`Helgrind:Race`
`46`		`- obj:/lib/libpthread-2.so*`
	`46`	`+ obj:/lib/libpthread-2.so`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`# helgrind-glibc2X-006 was merged into helgrind-glibc2X-005`
`@@ -78,14 +78,14 @@`
`78`	`78`	`{`
`79`	`79`	`helgrind-glibc2X-101`
`80`	`80`	`Helgrind:Race`
`81`		`- obj:/lib/libpthread-2.so*`
	`81`	`+ obj:/lib/libpthread-2.so`
`82`	`82`	`fun:pthread_*`
`83`	`83`	`}`
`84`	`84`	`{`
`85`	`85`	`helgrind-glibc2X-102`
`86`	`86`	`Helgrind:Race`
`87`	`87`	`fun:mythread_wrapper`
`88`		`- obj:/lib/libpthread-2.so*`
	`88`	`+ obj:/lib/libpthread-2.so`
`89`	`89`	`}`
`90`	`90`	`{`
`91`	`91`	`helgrind-glibc2X-103`
`@@ -110,7 +110,7 @@`
`110`	`110`	`{`
`111`	`111`	`helgrind-glibc2X-107`
`112`	`112`	`Helgrind:Race`
`113`		`- obj:/lib/libpthread-2.so*`
	`113`	`+ obj:/lib/libpthread-2.so`
`114`	`114`	`fun:sem_*`
`115`	`115`	`}`
`116`	`116`	`{`
`@@ -126,7 +126,7 @@`
`126`	`126`	`{`
`127`	`127`	`helgrind-glibc2X-110`
`128`	`128`	`Helgrind:Race`
`129`		`- obj:/lib/libc-2.so*`
	`129`	`+ obj:/lib/libc-2.so`
`130`	`130`	`fun:pthread_*`
`131`	`131`	`}`
`132`	`132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`{`
`7`	`7`	`drd-ld`
`8`	`8`	`drd:ConflictingAccess`
`9`		`- obj:/lib/ld-.so`
	`9`	`+ obj:/lib/ld-*.so`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`#`
`@@ -22,7 +22,7 @@`
`22`	`22`	`{`
`23`	`23`	`drd-libc-stdio`
`24`	`24`	`drd:ConflictingAccess`
`25`		`- obj:/lib/libc-`
	`25`	`+ obj:/lib/libc-*`
`26`	`26`	`}`
`27`	`27`	`{`
`28`	`28`	`drd-libc-thread-cancellation-test`
`@@ -128,7 +128,7 @@`
`128`	`128`	`{`
`129`	`129`	`drd-libpthread-?`
`130`	`130`	`drd:ConflictingAccess`
`131`		`- obj:/lib/libgcc_s.so.1`
	`131`	`+ obj:*/lib/libgcc_s.so.1`
`132`	`132`	`}`
`133`	`133`	`{`
`134`	`134`	`drd-libpthread-nanosleep`
Original file line number	Diff line number	Diff line change
`@@ -39,74 +39,74 @@`
`39`	`39`	`{`
`40`	`40`	`dl-hack3-cond-1`
`41`	`41`	`Memcheck:Cond`
`42`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`43`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`44`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
	`42`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`43`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`44`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
`45`	`45`	`}`
`46`	`46`	`{`
`47`	`47`	`dl-hack3-cond-2`
`48`	`48`	`Memcheck:Cond`
`49`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`50`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`51`		`- obj:/lib/libc-@GLIBC_VERSION@.so*`
	`49`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`50`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`51`	`+ obj:/lib/libc-@GLIBC_VERSION@.so`
`52`	`52`	`}`
`53`	`53`	`{`
`54`	`54`	`dl-hack3-cond-3`
`55`	`55`	`Memcheck:Cond`
`56`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`57`		`- obj:/lib/libc-@GLIBC_VERSION@.so*`
`58`		`- obj:/lib/libc-@GLIBC_VERSION@.so*`
	`56`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`57`	`+ obj:/lib/libc-@GLIBC_VERSION@.so`
	`58`	`+ obj:/lib/libc-@GLIBC_VERSION@.so`
`59`	`59`	`}`
`60`	`60`	`{`
`61`	`61`	`dl-hack3-cond-4`
`62`	`62`	`Memcheck:Cond`
`63`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`64`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`65`		`- obj:/lib/libdl-@GLIBC_VERSION@.so*`
	`63`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`64`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`65`	`+ obj:/lib/libdl-@GLIBC_VERSION@.so`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`{`
`69`	`69`	`dl-hack4-64bit-addr-1`
`70`	`70`	`Memcheck:Addr8`
`71`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`72`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`73`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
	`71`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`72`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`73`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
`74`	`74`	`}`
`75`	`75`	`{`
`76`	`76`	`dl-hack4-64bit-addr-2`
`77`	`77`	`Memcheck:Addr8`
`78`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`79`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`80`		`- obj:/lib/libc-@GLIBC_VERSION@.so*`
	`78`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`79`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`80`	`+ obj:/lib/libc-@GLIBC_VERSION@.so`
`81`	`81`	`}`
`82`	`82`	`{`
`83`	`83`	`dl-hack4-64bit-addr-3`
`84`	`84`	`Memcheck:Addr8`
`85`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`86`		`- obj:/lib/ld-@GLIBC_VERSION@.so*`
`87`		`- obj:/lib/libdl-@GLIBC_VERSION@.so*`
	`85`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`86`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`87`	`+ obj:/lib/libdl-@GLIBC_VERSION@.so`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`{`
`91`	`91`	`dl-hack5-32bit-addr-1`
`92`	`92`	`Memcheck:Addr4`
`93`		`- obj:/lib/ld-@GLIBC_VERSION@.so`
`94`		`- obj:/lib/ld-@GLIBC_VERSION@.so`
`95`		`- obj:/lib/ld-@GLIBC_VERSION@.so`
	`93`	`+ obj:/lib/ld-@GLIBC_VERSION@*.so`
	`94`	`+ obj:/lib/ld-@GLIBC_VERSION@*.so`
	`95`	`+ obj:/lib/ld-@GLIBC_VERSION@*.so`
`96`	`96`	`}`
`97`	`97`	`{`
`98`	`98`	`dl-hack5-32bit-addr-3`
`99`	`99`	`Memcheck:Addr4`
`100`		`- obj:/lib/ld-@GLIBC_VERSION@.so`
`101`		`- obj:/lib/ld-@GLIBC_VERSION@.so`
`102`		`- obj:/lib/libdl-@GLIBC_VERSION@.so*`
	`100`	`+ obj:/lib/ld-@GLIBC_VERSION@*.so`
	`101`	`+ obj:/lib/ld-@GLIBC_VERSION@*.so`
	`102`	`+ obj:/lib/libdl-@GLIBC_VERSION@.so`
`103`	`103`	`}`
`104`	`104`	`{`
`105`	`105`	`dl-hack5-32bit-addr-4`
`106`	`106`	`Memcheck:Addr4`
`107`		`- obj:/lib/ld-@GLIBC_VERSION@.so`
`108`		`- obj:/lib/libdl-@GLIBC_VERSION@.so*`
`109`		`- obj:/lib/ld-@GLIBC_VERSION@.so`
	`107`	`+ obj:/lib/ld-@GLIBC_VERSION@*.so`
	`108`	`+ obj:/lib/libdl-@GLIBC_VERSION@.so`
	`109`	`+ obj:/lib/ld-@GLIBC_VERSION@*.so`
`110`	`110`	`}`
`111`	`111`
`112`	`112`
`@@ -149,9 +149,9 @@`
`149`	`149`	`{`
`150`	`150`	`glibc-@[email protected](x86)`
`151`	`151`	`Memcheck:Addr4`
`152`		`- obj:/lib/ld-@GLIBC_VERSION@*.so`
`153`		`- obj:/lib/ld-@GLIBC_VERSION@*.so`
`154`		`- obj:/lib/ld-@GLIBC_VERSION@*.so`
	`152`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`153`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
	`154`	`+ obj:/lib/ld-@GLIBC_VERSION@.so`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`{`
`@@ -225,7 +225,7 @@`
`225`	`225`	`MVL-401-linuxthreads-pthread_create`
`226`	`226`	`Memcheck:Param`
`227`	`227`	`write(buf)`
`228`		`- obj:/lib/libpthread-0.10.so`
	`228`	`+ obj:*/lib/libpthread-0.10.so`
`229`	`229`	`fun:pthread_create`
`230`	`230`	`}`
`231`	`231`