Added support for multi-skin suppressions, of the form:

  skin_name1,skin_name2:supp_name

No spaces are allowed on either side of the comma.

This is useful for sharing suppressions between Addrcheck and Memcheck.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1205 a5019735-40e9-0310-863c-91ae7b9d1cf9

1 files changed, 15 insertions, 15 deletions

diff --git a/glibc-2.2.supp b/glibc-2.2.supp
index b82aee766..a18cfbc73 100644
--- a/glibc-2.2.supp
+++ b/glibc-2.2.supp
@@ -47,13 +47,13 @@
 }
 {
    trecurse/__gconv_release_shlib(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:trecurse
    fun:__gconv_release_shlib
 }
 {
    do_release_shlib/trecurse(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:do_release_shlib
    fun:trecurse
 }
@@ -91,20 +91,20 @@
 
 {
    __twalk/*(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:__twalk
 }
 
 {
    do_release_shlib/__twalk(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:do_release_shlib
    fun:__twalk
 }
 
 {
    __libc_freeres/free_mem/free(Free)
-   Memcheck:Free
+   Addrcheck,Memcheck:Free
    fun:free
    fun:free_mem
    fun:__libc_freeres
@@ -237,13 +237,13 @@
 # two:
 {
    __mpn_construct_double/*(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:__mpn_construct_double
    fun:*
 }
 {
    __mpn_construct_double/*(Addr8)
-   Memcheck:Addr8
+   Addrcheck,Memcheck:Addr8
    fun:__mpn_construct_double
    fun:*
 }
@@ -251,13 +251,13 @@
 # More of the same (gcc bug, I'm pretty sure)
 {
    __fabs/*(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:__fabs
    fun:*
 }
 {
    __fabs/*(Addr8)
-   Memcheck:Addr8
+   Addrcheck,Memcheck:Addr8
    fun:__fabs
    fun:*
 }
@@ -266,7 +266,7 @@
 # Not sure what this is about ... but anyway
 {
    pthread_sighandler/*(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:pthread_sighandler
    fun:*
 }
@@ -309,14 +309,14 @@
 #-------------------
 {
    socketcall.connect(serv_addr)/__libc_connect/*
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    socketcall.connect(serv_addr)
    fun:__libc_connect
    fun:*
 }
 {
    socketcall.connect(serv_addr)/libc-2.2.4.so/libc-2.2.4.so
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    socketcall.connect(serv_addr)
    obj:*libc-2.2.?.so
    obj:*libc-2.2.?.so
@@ -325,7 +325,7 @@
 #----------------------
 {
    write(buf)/__libc_write/libX11.so.6.2/libX11.so.6.2(Param)
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    write(buf)
    fun:__libc_write
    obj:/usr/X11R6/lib/libX11.so.6.2
@@ -333,7 +333,7 @@
 }
 {
    write(buf)/libc-2.2.4.so/libX11.so.6.2/libX11.so.6.2(Param)
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    write(buf)
    obj:*libc-2.2.?.so
    obj:/usr/X11R6/lib/libX11.so.6.2
@@ -350,7 +350,7 @@
 
 {
    writev(vector[...])/__writev/libX11.so.6.2/libX11.so.6.2
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    writev(vector[...])
    fun:__writev
    obj:/usr/X11R6/lib/libX11.so.6.2