FreeBSD: add libc suppressions for Helgrind and DRD

diff --git a/freebsd-drd.supp b/freebsd-drd.supp
index 2248389587f4ca0c0ce55797dda725451bfde008..93ad79f4bd46d81715f424d58150cd597c77bc17 100644 (file)
--- a/freebsd-drd.supp
+++ b/freebsd-drd.supp
@@ -31,7 +31,7 @@
 {
    DRD-MANY1
    drd:ConflictingAccess
-   obj:/lib/libthr.so.3
+   obj:*/lib*/libthr.so.3
    obj:/libexec/ld-elf*.so.1
 }
 {
@@ -52,7 +52,7 @@
 {
    DRD-MANY4
    drd:ConflictingAccess
-   obj:/lib/libthr.so.3
+   obj:*/lib*/libthr.so.3
 }
 {
    DRD-UNWIND1
@@ -190,3 +190,53 @@
    drd:ConflictingAccess
    fun:_ZL11*
 }
+{
+   DRD-FREEBSD131-FOPEN1
+   drd:ConflictingAccess
+   obj:*/lib*/libc.so.7
+   fun:fopen
+}
+{
+   DRD-FREEBSD131-FOPEN2
+   drd:ConflictingAccess
+   fun:fopen
+   obj:*/lib*/libc.so.7
+}
+{
+   DRD-FREEBSD131-FGETS
+   drd:ConflictingAccess
+   obj:*/lib*/libc.so.7
+   ...
+   fun:fgets
+}
+{
+   DRD-FREEBSD131-FCLOSE
+   drd:ConflictingAccess
+   obj:*/lib*/libc.so.7
+   fun:fclose
+}
+{
+   DRD-FREEBSD131-RES-VINIT
+   drd:ConflictingAccess
+   fun:__h_errno_set
+   fun:__res_vinit
+   obj:*/lib*/libc.so.7
+}
+{
+   DRD-FREEBSD131-ERRNO-SET
+   drd:ConflictingAccess
+   fun:__h_errno_set
+   obj:*/lib*/libc.so.7
+}
+{
+   DRD-FREEBSD131-LOCALECONV
+   drd:ConflictingAccess
+   fun:localeconv_l
+   obj:*/lib*/libc.so.7
+}
+{
+   DRD-FREEBSD131-VSPRINTF
+   drd:ConflictingAccess
+   obj:*/lib*/libc.so.7
+   fun:vsprintf
+}

diff --git a/freebsd-helgrind.supp b/freebsd-helgrind.supp
index 32af0a7626121375ec6397d82cc6180acc0a5312..be10339c629caeb7258a10917c57fe53ad8ed8a2 100644 (file)
--- a/freebsd-helgrind.supp
+++ b/freebsd-helgrind.supp
@@ -3,7 +3,7 @@
 {
    HELGRIND-LIBTHR1
    Helgrind:Race
-   obj:*/lib*/libthr.so.3*
+   obj:*/lib*/libthr.so.3
 }
 {
    HELGRIND-LIB-RTLD1
@@ -99,7 +99,7 @@
    HELGRIND-PTHREAD-SELF1
    Helgrind:Race
    fun:mythread_wrapper
-   obj:*/lib*/libthr.so.3*
+   obj:*/lib*/libthr.so.3
 }
 {
    HELGRIND-SEM-CLOCKWAIT1
@@ -145,11 +145,11 @@
 {
    HELGRIND-CXX-UNWIND
    Helgrind:Race
-   obj:/lib/libcxxrt.so.1
-   obj:/lib/libthr.so.3
-   obj:/lib/libthr.so.3
-   obj:/lib/libthr.so.3
-   obj:/lib/libgcc_s.so.1
+   obj:*/lib*/libcxxrt.so.1
+   obj:*/lib*/libthr.so.3
+   obj:*/lib*/libthr.so.3
+   obj:*/lib*/libthr.so.3
+   obj:*/lib*/libgcc_s.so.1
    fun:_Unwind_ForcedUnwind
 }
 {
@@ -167,3 +167,53 @@
    Helgrind:Race
    fun:_ZNSt3__119__thread_local_dataEv
 }
+{
+   HELGRIND-LIBC-FOPEN1
+   Helgrind:Race
+   obj:*/lib*/libc.so.7
+   fun:fopen
+}
+{
+   HELGRIND-LIBC-FOPEN2
+   Helgrind:Race
+   fun:fopen
+   obj:*/lib*/libc.so.7
+}
+{
+   HELGRIND-LIBC-FGETS
+   Helgrind:Race
+   obj:*/lib*/libc.so.7
+   ...
+   fun:fgets
+}
+{
+   HELGRIND-LIBC-FCLOSE
+   Helgrind:Race
+   obj:*/lib*/libc.so.7
+   fun:fclose
+}
+{
+   HELGRIND-LIBC-RES-STATE
+   Helgrind:Race
+   fun:__res_state
+   obj:*/lib*/libc.so.7
+}
+{
+   HELGRIND-LIBC-ERRNO-SET
+   Helgrind:Race
+   fun:__h_errno_set
+   ...
+   obj:*/lib*/libc.so.7
+}
+{
+   HELGRIND-LIBC-LOCALECONV-L
+   Helgrind:Race
+   fun:localeconv_l
+   obj:*/lib*/libc.so.7
+}
+{
+   HELGRIND-LIBC-VSPRINTF
+   Helgrind:Race
+   obj:*/lib*/libc.so.7
+   fun:vsprintf
+}