Simplified DRD suppression patterns.

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

diff --git a/glibc-2.X-drd.supp b/glibc-2.X-drd.supp
index a4f713c0274b1771c819b8f15599b62b798cccda..6f113740f8f5769228537195ce74d06aeb279919 100644 (file)
--- a/glibc-2.X-drd.supp
+++ b/glibc-2.X-drd.supp
@@ -26,34 +26,19 @@
 {
    dl-dlsym-1
    drd:ConflictingAccess
-   obj:/lib/ld-*.so
-   obj:/lib/tls/*/cmov/libc-*.so
+   ...
    fun:_dl_sym
 }
 {
    dl-dlsym-2
    drd:ConflictingAccess
-   obj:/lib/ld-*.so
-   obj:/lib/libc-*.so
-   obj:/lib/libdl-*.so
-   obj:/lib/ld-*.so
-   obj:/lib/libdl-*.so
+   ...
    fun:dlsym
 }
 {
    dl-dlsym-3
    drd:ConflictingAccess
-   obj:/lib/ld-*.so
-   obj:/lib/tls/*/cmov/libc-*.so
-   obj:/lib/ld-*.so
-   fun:__libc_dlsym
-}
-{
-   dl-dlsym-4
-   drd:ConflictingAccess
-   obj:/lib/ld-*.so
-   obj:/lib/libc-*.so
-   obj:/lib/ld-*.so
+   ...
    fun:__libc_dlsym
 }
 {
@@ -77,12 +62,7 @@
 {
    libc-exit-io-cleanup
    drd:ConflictingAccess
-   obj:/lib*/libc-*.so
-   obj:/lib*/libc-*.so
-   obj:/lib*/libc-*.so
-   obj:/lib*/libc-*.so
-   obj:/lib*/libc-*.so
-   obj:/lib*/libc-*.so
+   ...
    fun:exit
 }
 {
@@ -134,16 +114,7 @@
 {
    pthread
    drd:ConflictingAccess
-   obj:/lib*/libc-*.so
-   fun:__libc_thread_freeres
-   fun:start_thread
-   fun:clone
-}
-{
-   pthread
-   drd:ConflictingAccess
-   obj:/lib*/libc-*.so
-   obj:/lib*/libc-*.so
+   ...
    fun:__libc_thread_freeres
    fun:start_thread
    fun:clone
@@ -253,28 +224,9 @@
 {
    pthread
    drd:ConflictingAccess
+   ...
    fun:__deallocate_stack
 }
-{
-   pthread
-   drd:ConflictingAccess
-   fun:__deallocate_stack
-}
-{
-   pthread
-   drd:ConflictingAccess
-   fun:free_stacks
-   fun:__deallocate_stack
-}
-{
-   pthread
-   drd:ConflictingAccess
-   obj:/lib*/libpthread-*
-   obj:/lib*/libpthread-*
-   fun:__deallocate_stack
-   fun:start_thread
-   fun:clone
-}
 {
    pthread
    drd:ConflictingAccess
@@ -336,7 +288,7 @@
 {
    pthread-unwind
    drd:ConflictingAccess
-   fun:_Unwind_ForcedUnwind
+   ...
    fun:__pthread_unwind
 }
 {
@@ -357,36 +309,6 @@
    fun:uw_frame_state_for
    fun:_Unwind_ForcedUnwind_Phase2
 }
-{
-   pthread-unwind-3
-   drd:ConflictingAccess
-   obj:*
-   obj:*
-   obj:*
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-}
-{
-   pthread-unwind-4
-   drd:ConflictingAccess
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-}
-{
-   pthread-unwind-5
-   drd:ConflictingAccess
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   fun:_Unwind_ForcedUnwind
-   fun:__pthread_unwind
-}
 {
    gomp
    drd:ConflictingAccess