Merge (from 3_3_BRANCH) some parts of r8168 (Fix up suppressions for Ubuntu 8.04.)
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8261 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/xfree-4.supp b/xfree-4.supp
index 8c53a7a..0ccc46e 100644
--- 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*
+}