|
From: <sv...@va...> - 2005-05-12 18:00:14
|
Author: sewardj
Date: 2005-05-12 19:00:12 +0100 (Thu, 12 May 2005)
New Revision: 3682
Modified:
trunk/glibc-2.3.supp
trunk/xfree-4.supp
Log:
* move libc-specific suppressions into glibc-2.3.supp
* enhance the xfree suppressions so they match 64-bit X libraries
Modified: trunk/glibc-2.3.supp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/glibc-2.3.supp 2005-05-12 17:58:57 UTC (rev 3681)
+++ trunk/glibc-2.3.supp 2005-05-12 18:00:12 UTC (rev 3682)
@@ -381,3 +381,79 @@
fun:__pthread_initialize_minimal
obj:/lib64/tls/libpthread*.so*
}
+
+
+
+##----------------------------------------------------------------------=
##
+# Hacks pertaining to the fact that our intercept mechanism can't
+# always get hold of strlen early enough, due to idiocy in the low
+# level memory manager.
+
+## HACK to do with strlen not being intercepted early enough
+{
+ strlen-not-intercepted-early-enough-HACK-1
+ Memcheck:Addr4
+ fun:strlen
+ fun:_dl_map_object_from_fd
+ fun:_dl_map_object
+}
+
+{
+ strlen-not-intercepted-early-enough-HACK-2
+ Memcheck:Addr4
+ fun:strlen
+ fun:decompose_rpath
+ fun:cache_rpath
+ fun:_dl_map_object
+}
+
+{
+ strlen-not-intercepted-early-enough-HACK-3
+ Memcheck:Cond
+ fun:strlen
+ fun:_dl_new_object
+ fun:_dl_map_object_from_fd
+ fun:_dl_map_object
+}
+
+{
+ strlen-not-intercepted-early-enough-HACK-4
+ Memcheck:Cond
+ fun:strlen
+ fun:expand_dynamic_string_token
+ fun:_dl_map_object
+}
+
+{
+ strlen-not-intercepted-early-enough-HACK-5
+ Memcheck:Cond
+ fun:strlen
+ fun:fillin_rpath
+ fun:_dl_init_paths
+}
+
+
+## HACK to do with index not being intercepted early enough
+{
+ index-not-intercepted-early-enough-HACK-1
+ Memcheck:Cond
+ fun:index
+ fun:expand_dynamic_string_token
+ fun:_dl_map_object
+}
+{
+ index-not-intercepted-early-enough-HACK-2
+ Memcheck:Cond
+ fun:index
+ fun:_dl_map_object
+ fun:map_doit
+ fun:_dl_catch_error
+}
+{
+ index-not-intercepted-early-enough-HACK-3
+ Memcheck:Cond
+ fun:index
+ fun:_dl_map_object
+ fun:dl_main
+ fun:_dl_sysdep_start
+}
Modified: trunk/xfree-4.supp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/xfree-4.supp 2005-05-12 17:58:57 UTC (rev 3681)
+++ trunk/xfree-4.supp 2005-05-12 18:00:12 UTC (rev 3682)
@@ -30,89 +30,89 @@
Addrcheck,Memcheck:Param
write(buf)
fun:*libc_write
- obj:/usr/X11R6/lib/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libX11.so.6.2
fun:*X11TransWrite
}
=20
{
libX11.so.6.2/libX11.so.6.2/libX11.so.6.2(Cond)
Memcheck:Cond
- obj:/usr/X11R6/lib/libX11.so.6.2
- obj:/usr/X11R6/lib/libX11.so.6.2
- obj:/usr/X11R6/lib/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libX11.so.6.2
}
=20
{
libXt.so.6.2/libXt.so.6.2/libXt.so.6.2(Cond)
Memcheck:Cond
- obj:/usr/X11R6/lib/libXt.so.6.0
- obj:/usr/X11R6/lib/libXt.so.6.0
- obj:/usr/X11R6/lib/libXt.so.6.0
+ obj:/usr/X11R6/lib*/libXt.so.6.0
+ obj:/usr/X11R6/lib*/libXt.so.6.0
+ obj:/usr/X11R6/lib*/libXt.so.6.0
}
=20
=20
{
libXaw.so.7.0/libXaw.so.7.0/libXaw.so.7.0(Cond)
Memcheck:Cond
- obj:/usr/X11R6/lib/libXaw.so.7.0
- obj:/usr/X11R6/lib/libXaw.so.7.0
- obj:/usr/X11R6/lib/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
}
=20
{
libXmu.so.6.2/libXmu.so.6.2/libXmu.so.6.2(Cond)
Memcheck:Cond
- obj:/usr/X11R6/lib/libXmu.so.6.2
- obj:/usr/X11R6/lib/libXmu.so.6.2
- obj:/usr/X11R6/lib/libXmu.so.6.2
+ obj:/usr/X11R6/lib*/libXmu.so.6.2
+ obj:/usr/X11R6/lib*/libXmu.so.6.2
+ obj:/usr/X11R6/lib*/libXmu.so.6.2
}
=20
{
libXt.so.6.0/libXt.so.6.0/libXaw.so.7.0(Cond)
Memcheck:Cond
- obj:/usr/X11R6/lib/libXt.so.6.0
- obj:/usr/X11R6/lib/libXt.so.6.0
- obj:/usr/X11R6/lib/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXt.so.6.0
+ obj:/usr/X11R6/lib*/libXt.so.6.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
}
=20
{
libXaw.so.7.0/libXaw.so.7.0/libXt.so.6.0(Value4)
Memcheck:Value4
- obj:/usr/X11R6/lib/libXaw.so.7.0
- obj:/usr/X11R6/lib/libXaw.so.7.0
- obj:/usr/X11R6/lib/libXt.so.6.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXt.so.6.0
}
=20
{
libXaw.so.7.0/libXaw.so.7.0/libXt.so.6.0(Cond)
Memcheck:Cond
- obj:/usr/X11R6/lib/libXaw.so.7.0
- obj:/usr/X11R6/lib/libXaw.so.7.0
- obj:/usr/X11R6/lib/libXt.so.6.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXt.so.6.0
}
=20
{
libX11.so.6.2/libX11.so.6.2/libXaw.so.7.0(Cond)
Memcheck:Cond
- obj:/usr/X11R6/lib/libX11.so.6.2
- obj:/usr/X11R6/lib/libX11.so.6.2
- obj:/usr/X11R6/lib/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
}
=20
{
libX11.so.6.2/libXaw.so.7.0/libXaw.so.7.0(Cond)
Memcheck:Cond
- obj:/usr/X11R6/lib/libX11.so.6.2
- obj:/usr/X11R6/lib/libXaw.so.7.0
- obj:/usr/X11R6/lib/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
+ obj:/usr/X11R6/lib*/libXaw.so.7.0
}
=20
{
libXpm.so.4.11/libXpm.so.4.11/libXpm.so.4.11
Memcheck:Cond
- obj:/usr/X11R6/lib/libXpm.so.4.11
- obj:/usr/X11R6/lib/libXpm.so.4.11
- obj:/usr/X11R6/lib/libXpm.so.4.11
+ obj:/usr/X11R6/lib*/libXpm.so.4.11
+ obj:/usr/X11R6/lib*/libXpm.so.4.11
+ obj:/usr/X11R6/lib*/libXpm.so.4.11
}
=20
{
@@ -141,7 +141,7 @@
write(buf)
fun:*
fun:_X11TransWrite
- obj:/usr/X11R6/lib/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libX11.so.6.2
}
=20
{
@@ -150,7 +150,7 @@
write(buf)
fun:write
fun:_X11TransWrite
- obj:/usr/X11R6/lib/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libX11.so.6.2
}
=20
{
@@ -178,73 +178,10 @@
Memcheck:Param
writev(vector[...])
fun:writev
- obj:/usr/X11R6/lib/libX11.so.6.2
+ obj:/usr/X11R6/lib*/libX11.so.6.2
fun:_X11TransWritev
fun:_XSend
}
=20
-##
-## HACK to do with strlen not being intercepted early enough
-{
- strlen-not-intercepted-early-enough-HACK-1
- Memcheck:Addr4
- fun:strlen
- fun:_dl_map_object_from_fd
- fun:_dl_map_object
-}
-
-{
- strlen-not-intercepted-early-enough-HACK-2
- Memcheck:Addr4
- fun:strlen
- fun:decompose_rpath
- fun:cache_rpath
- fun:_dl_map_object
-}
-
-{
- strlen-not-intercepted-early-enough-HACK-3
- Memcheck:Cond
- fun:strlen
- fun:_dl_new_object
- fun:_dl_map_object_from_fd
- fun:_dl_map_object
-}
-
-{
- strlen-not-intercepted-early-enough-HACK-4
- Memcheck:Cond
- fun:strlen
- fun:expand_dynamic_string_token
- fun:_dl_map_object
- fun:map_doit
-}
-
-## HACK to do with index not being intercepted early enough
-{
- index-not-intercepted-early-enough-HACK-1
- Memcheck:Cond
- fun:index
- fun:expand_dynamic_string_token
- fun:_dl_map_object
- fun:map_doit
-}
-{
- index-not-intercepted-early-enough-HACK-2
- Memcheck:Cond
- fun:index
- fun:_dl_map_object
- fun:map_doit
- fun:_dl_catch_error
-}
-{
- index-not-intercepted-early-enough-HACK-3
- Memcheck:Cond
- fun:index
- fun:_dl_map_object
- fun:dl_main
- fun:_dl_sysdep_start
-}
-
##----------------------------------------------------------------------=
##
=20
|