Merge branch 'maint'

diff --git a/t/valgrind/default.supp b/t/valgrind/default.supp
index 2482b3b06a7d49e9bc01545395df8095189d053a..9e013fa3b25b82a10b71ceabfa664c796c4d7a3f 100644 (file)
--- a/t/valgrind/default.supp
+++ b/t/valgrind/default.supp
@@ -4,6 +4,12 @@
        obj:*libz.so*
 }
 
+{
+       ignore-zlib-errors-value8
+       Memcheck:Value8
+       obj:*libz.so*
+}
+
 {
        ignore-zlib-errors-value4
        Memcheck:Value4
@@ -11,7 +17,25 @@
 }
 
 {
-       writing-data-from-zlib-triggers-errors
+       ignore-ldso-cond
+       Memcheck:Cond
+       obj:*ld-*.so
+}
+
+{
+       ignore-ldso-addr8
+       Memcheck:Addr8
+       obj:*ld-*.so
+}
+
+{
+       ignore-ldso-addr4
+       Memcheck:Addr4
+       obj:*ld-*.so
+}
+
+{
+       writing-data-from-zlib-triggers-even-more-errors
        Memcheck:Param
        write(buf)
        obj:/lib/ld-*.so