Import recent suppression upgrades from 3_3_BRANCH:

revs 8163 8166 8167 8168.

Also, mention glibc-2.X.supp.in in Makefile.am so it gets included
in the distro tarball.

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

diff --git a/Makefile.am b/Makefile.am
index cbd41c2fb8ff4b0ad2aec7cf73520a08fd1554ed..aa644d3ac713082290eb1b3e835a5dab52cba854 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@ DIST_SUBDIRS  = $(SUBDIRS)
 
 SUPP_FILES = \
        glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \
-       glibc-2.6.supp glibc-2.7.supp aix5libc.supp xfree-3.supp xfree-4.supp \
+       glibc-2.6.supp glibc-2.7.supp glibc-2.X.supp.in \
+       aix5libc.supp xfree-3.supp xfree-4.supp \
        glibc-2.34567-NPTL-helgrind.supp \
        glibc-2.2-LinuxThreads-helgrind.supp \
        glibc-2.X-drd.supp

diff --git a/glibc-2.X.supp.in b/glibc-2.X.supp.in
index a0475d0c55a2f6ced6974fa2dc1be8db13fed9e3..c3c9798061796b630bb71a5060e3dd16adb1bd48 100644 (file)
--- a/glibc-2.X.supp.in
+++ b/glibc-2.X.supp.in
@@ -3,6 +3,9 @@
 
 # Errors to suppress by default with glibc @GLIBC_VERSION@.x
 
+# IMPORTANT: DO NOT EDIT glibc-2.X.supp, as it is as a generated
+# file.  Instead edit glibc-2.X.supp.in.
+
 # Format of this file is:
 # {
 #     name_of_suppression
@@ -23,61 +26,86 @@
 # and the optional extra info is:
 #     if Param: name of system call param
 
-{
-   dl-hack1
-   Memcheck:Cond
-   fun:_dl_start
-   fun:_start
-}
+##----------------------------------------------------------------------##
+##--- generic suppressions                                           ---##
+##----------------------------------------------------------------------##
 
 {
-   dl-hack2
+   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*
+   obj:/lib*/ld-@GLIBC_VERSION@*.so*
 }
-
 {
-   dl-hack3-1
+   dl-hack3-cond-2
    Memcheck:Cond
    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*
 }
 {
-   dl-hack3-2
+   dl-hack3-cond-4
    Memcheck:Cond
    obj:/lib*/ld-@GLIBC_VERSION@*.so*
    obj:/lib*/ld-@GLIBC_VERSION@*.so*
-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
+   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
 }
 
 {
-   dl-hack4-64bit-1
+   dl-hack4-64bit-addr-1
    Memcheck:Addr8
-   obj:/lib64/ld-@GLIBC_VERSION@*.so*
-   obj:/lib64/ld-@GLIBC_VERSION@*.so*
-   obj:/lib64/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-2
+   dl-hack4-64bit-addr-2
    Memcheck:Addr8
-   obj:/lib64/ld-@GLIBC_VERSION@*.so*
-   obj:/lib64/ld-@GLIBC_VERSION@*.so*
-   obj:/lib64/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-3
+   dl-hack4-64bit-addr-3
    Memcheck:Addr8
-   obj:/lib64/ld-@GLIBC_VERSION@*.so*
-   obj:/lib64/ld-@GLIBC_VERSION@*.so*
-   obj:/lib64/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
+}
+{
+   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*
+}
+{
+   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
+}
 
 
+##----------------------------------------------------------------------##
+##--- Misc ad-hoc hacks                                              ---##
 ##----------------------------------------------------------------------##
 {
    glibc-2.5.x-on-SUSE-10.2-(PPC)-1

diff --git a/xfree-4.supp b/xfree-4.supp
index 2f1aa794434da71290dd8118b3719c078bf21669..8c53a7ae90739965eb00d8136206ce71e99864c6 100644 (file)
--- a/xfree-4.supp
+++ b/xfree-4.supp
@@ -214,7 +214,39 @@
    fun:_XSend
 }
 
-
+{
+   X on SUSE11 writev uninit padding
+   Memcheck:Param
+   writev(vector[...])
+   fun:writev
+   obj:/usr/lib*/libxcb.so*
+   obj:/usr/lib*/libxcb.so*
+}
+{
+   X on SUSE11 writev uninit padding 2
+   Memcheck:Param
+   writev(vector[...])
+   obj:/lib*/ld-2.*.so*
+   obj:/usr/lib*/libxcb.so*
+   obj:/usr/lib*/libxcb.so*
+}
+{
+   X on SUSE11 writev uninit padding 3
+   Memcheck:Param
+   writev(vector[...])
+   obj:/lib*/ld-2.*.so*
+   obj:/usr/lib*/libORBit*.so*
+   obj:/usr/lib*/libORBit*.so*
+}
+{
+   X on SUSE11 writev uninit padding 4
+   Memcheck:Param
+   writev(vector[...])
+   obj:/lib*/libc-2.*.so*
+   obj:/usr/lib*/libORBit*.so*
+   obj:/usr/lib*/libORBit*.so*
+}
+ 
 
 # There's something strange about a % 127 in XftFontOpenInfo
 # (hashing) which gcc turns into a multiply by 33818641 and