Fix up suppressions for Ubuntu 8.04.

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8168

diff --git a/glibc-2.7.supp b/glibc-2.7.supp
index 1079dcfb88374c65886fb48869bfd9ac38779a60..217ac1bff04b08b4789972ecfdf4c866200c799f 100644 (file)
--- a/glibc-2.7.supp
+++ b/glibc-2.7.supp
@@ -22,9 +22,74 @@
 #     if Param: name of system call param
 
 {
-   dl-hack3-1
+   dl-hack3-cond-1
    Memcheck:Cond
    obj:/lib*/ld-2.7*.so*
    obj:/lib*/ld-2.7*.so*
    obj:/lib*/ld-2.7*.so*
 }
+{
+   dl-hack3-cond-2
+   Memcheck:Cond
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/libc-2.7*.so*
+}
+{
+   dl-hack3-cond-3
+   Memcheck:Cond
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/libc-2.7*.so*
+   obj:/lib*/libc-2.7*.so*
+}
+{
+   dl-hack3-cond-4
+   Memcheck:Cond
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/libdl-2.7*.so*
+}
+
+{
+   dl-hack4-64bit-addr-1
+   Memcheck:Addr8
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.7*.so*
+}
+{
+   dl-hack4-64bit-addr-2
+   Memcheck:Addr8
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/libc-2.7*.so*
+}
+{
+   dl-hack4-64bit-addr-3
+   Memcheck:Addr8
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/ld-2.7*.so*
+   obj:/lib*/libdl-2.7*.so*
+}
+
+{
+   dl-hack5-32bit-addr-1
+   Memcheck:Addr4
+   obj:/lib/ld-2.7*.so
+   obj:/lib/ld-2.7*.so
+   obj:/lib/ld-2.7*.so
+}
+{
+   dl-hack5-32bit-addr-3
+   Memcheck:Addr4
+   obj:/lib/ld-2.7*.so
+   obj:/lib/ld-2.7*.so
+   obj:/lib/libdl-2.7*.so*
+}
+{
+   dl-hack5-32bit-addr-4
+   Memcheck:Addr4
+   obj:/lib/ld-2.7*.so
+   obj:/lib/libdl-2.7*.so*
+   obj:/lib/ld-2.7*.so
+}

diff --git a/glibc-2.8.supp b/glibc-2.8.supp
index fb499d4c009a8d6d28024e97bd65b89cfa59c349..dd25421f5790c75803f720513aa8b4268bb76f81 100644 (file)
--- a/glibc-2.8.supp
+++ b/glibc-2.8.supp
@@ -53,23 +53,23 @@
 {
    dl-hack4-64bit-addr-1
    Memcheck:Addr8
-   obj:/lib64/ld-2.8*.so*
-   obj:/lib64/ld-2.8*.so*
-   obj:/lib64/ld-2.8*.so*
+   obj:/lib*/ld-2.8*.so*
+   obj:/lib*/ld-2.8*.so*
+   obj:/lib*/ld-2.8*.so*
 }
 {
    dl-hack4-64bit-addr-2
    Memcheck:Addr8
-   obj:/lib64/ld-2.8*.so*
-   obj:/lib64/ld-2.8*.so*
-   obj:/lib64/libc-2.8*.so*
+   obj:/lib*/ld-2.8*.so*
+   obj:/lib*/ld-2.8*.so*
+   obj:/lib*/libc-2.8*.so*
 }
 {
    dl-hack4-64bit-addr-3
    Memcheck:Addr8
-   obj:/lib64/ld-2.8*.so*
-   obj:/lib64/ld-2.8*.so*
-   obj:/lib64/libdl-2.8*.so*
+   obj:/lib*/ld-2.8*.so*
+   obj:/lib*/ld-2.8*.so*
+   obj:/lib*/libdl-2.8*.so*
 }
 
 {

diff --git a/xfree-4.supp b/xfree-4.supp
index f194416a7af20b0d267aaef6002036ec75ac8a8c..242da99cce166fb4e047736338bde8c710e76a41 100644 (file)
--- a/xfree-4.supp
+++ b/xfree-4.supp
@@ -304,3 +304,26 @@
 
 ##----------------------------------------------------------------------##
 
+## More general versions of some of the old X suppressions above
+{
+   Ubuntu804 libXaw.so.7.0/libXaw.so.7.0/libXaw.so.7.0(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXaw*so*
+   obj:/usr/*lib*/libXaw*so*
+   obj:/usr/*lib*/libXaw*so*
+}
+{
+   Ubuntu804 libXaw.so.7.0/libXaw.so.7.0/libXt(Cond)
+   Memcheck:Cond
+   obj:/usr/*lib*/libXaw*so*
+   obj:/usr/*lib*/libXaw*so*
+   obj:/usr/*lib*/libXt*so*
+}
+
+{
+   Ubuntu804-hack-1
+   Memcheck:Overlap
+   fun:mempcpy
+   fun:_IO_default_xsputn
+   obj:/lib*/libc-2.*so*
+}