From 0ed32f4b21b51edb3fe370c372fceb6bdb6e079d Mon Sep 17 00:00:00 2001
From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sun, 3 Jul 2022 09:04:33 +0200
Subject: [PATCH] Simplify FreeeBSD Helgrind suppresssions

Also add a file for debug builds of the runtime link editor rtld.
This is not used by default.
---
 freebsd-helgrind-dbgrtld.supp | 90 ++++++++++++++++++++++++++++++++
 freebsd-helgrind.supp         | 98 ++---------------------------------
 2 files changed, 94 insertions(+), 94 deletions(-)
 create mode 100644 freebsd-helgrind-dbgrtld.supp

diff --git a/freebsd-helgrind-dbgrtld.supp b/freebsd-helgrind-dbgrtld.supp
new file mode 100644
index 0000000000..ed16159c07
--- /dev/null
+++ b/freebsd-helgrind-dbgrtld.supp
@@ -0,0 +1,90 @@
+{
+   HELGRIND-LIB-RTLD2
+   Helgrind:Race
+   fun:allocate_tls
+}
+{
+   HELGRIND-LIB-RTLD3
+   Helgrind:Race
+   fun:symlook_obj
+}
+{
+   HELGRIND-LIB-RTLD4
+   Helgrind:Race
+   fun:objlist_call_fini
+}
+{
+   HELGRIND-LIB-RTLD5
+   Helgrind:Race
+   fun:_rtld_error
+}
+{
+   HELGRIND-LIB-RTLD6
+   Helgrind:Race
+   fun:errmsg_save
+}
+{
+   HELGRIND-LIB-RTLD7
+   Helgrind:Race
+   fun:rtld_vsnprintf
+}
+{
+   HELGRIND-LIB-RTLD8
+   Helgrind:Race
+   fun:snprintf_func
+}
+{
+   HELGRIND-LIB-RTLD9
+   Helgrind:Race
+   fun:strlen
+}
+{
+   HELGRIND-LIB-RTLD10
+   Helgrind:Race
+   fun:symlook_default
+}
+{
+   HELGRIND-LIB-RTLD11
+   Helgrind:Race
+   ...
+   fun:dl_iterate_phdr
+}
+{
+   HELGRIND-LIB-RTLD12
+   Helgrind:Race
+   fun:morecore
+}
+{
+   HELGRIND-LIB-RTLD13
+   Helgrind:Race
+   fun:__crt_malloc
+}
+{
+   HELGRIND-LIB-RTLD14
+   Helgrind:Race
+   fun:globallist_curr
+}
+{
+   HELGRIND-LIB-RTLD15
+   Helgrind:Race
+   fun:tls_get_addr_common
+}
+{
+   HELGRIND-LIB-RTLD16
+   Helgrind:Race
+   fun:memset
+   ...
+   fun:allocate_tls
+}
+{
+   HELGRIND-LIB-RTLD17
+   Helgrind:Race
+   fun:__crt_free
+}
+{
+   HELGRIND-LIB-RTLD18
+   Helgrind:Race
+   ...
+   fun:free_tls
+}
+
diff --git a/freebsd-helgrind.supp b/freebsd-helgrind.supp
index ee6c424957..6c51bfbd01 100644
--- a/freebsd-helgrind.supp
+++ b/freebsd-helgrind.supp
@@ -6,7 +6,7 @@
    obj:*/lib*/libthr.so.3*
 }
 {
-   HELGRIND-LIB-LDRT1
+   HELGRIND-LIB-RTLD1
    Helgrind:Race
    obj:/libexec/ld-elf*.so.1
 }
@@ -18,20 +18,7 @@
    obj:*/lib*/libthr.so.3
 }
 {
-   HELGRIND-PTHREAD-EXIT1
-   Helgrind:Race
-   fun:_pthread_exit_mask
-   fun:pthread_exit
-}
-{
-   HELGRIND-PTHREAD-EXIT2
-   Helgrind:Race
-   fun:__sys_thr_exit
-   fun:_pthread_exit_mask
-   fun:pthread_exit
-}
-{
-   HELGRIND-PTHREAD-EXIT4
+   HELGRIND-PTHREAD-JOIN
    Helgrind:Race
    fun:_thr_try_gc
    obj:*/lib*/libthr.so.3
@@ -39,65 +26,11 @@
    fun:pthread_join
 }
 {
-   HELGRIND-PTHREAD-EXIT5
-   Helgrind:Race
-   fun:__sys_thr_exit
-   obj:*/lib*/libthr.so.3*
-   fun:_pthread_exit_mask
-   fun:pthread_exit
-}
-{
-   HELGRIND-PTHREAD-EXIT6
-   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
-   fun:_Unwind_ForcedUnwind
-   obj:*/lib*/libthr.so.3
-   obj:*/lib*/libthr.so.3
-   fun:pthread_exit
-}
-{
-   HELGRIND-PTHREAD-EXIT7
+   HELGRIND-PTHREAD-EXIT
    Helgrind:Race
-   obj:*/lib*/libc.so.7
-   fun:_malloc_thread_cleanup
-   obj:*/lib*/libthr.so.3
-   obj:*/lib*/libthr.so.3
+   ...
    fun:pthread_exit
 }
-{
-   HELGRIND-PTHREAD-EXIT8
-   Helgrind:Race
-   fun:__cxa_thread_call_dtors
-   obj:*/lib*/libthr.so.3
-   fun:pthread_exit
-}
-{
-   HELGRIND-PTHREAD-EXIT9
-   Helgrind:Race
-   fun:thr_exit
-   obj:*/lib*/libthr.so.3*
-   fun:_pthread_exit_mask
-}
-{
-   HELGRIND-PTHREAD-EXIT10
-   Helgrind:Race
-   obj:*/lib*/libc.so.7
-   fun:_malloc_thread_cleanup
-   obj:*/lib*/libthr.so.3*
-   fun:_pthread_exit_mask
-   fun:_Tthr_exit
-}
-{
-   HELGRIND-PTHREAD-EXIT11
-   Helgrind:Race
-   fun:__cxa_thread_call_dtors
-   fun:_pthread_exit_mask
-   fun:_Tthr_exit
-}
 {
    HELGRIND-PTHREAD-BARRIER2
    Helgrind:Race
@@ -161,21 +94,6 @@
    obj:*/lib*/libthr.so.3
    fun:pthread_create
 }
-# same as previous, but with debug build of libthr
-{
-   HELGRIND-PTHREAD-CREATE3
-   Helgrind:Race
-   fun:memset
-   fun:_thr_alloc
-   fun:pthread_create
-}
-# another for debug build of libthr
-{
-   HELGRIND-PTHREAD-CREATE4
-   Helgrind:Race
-   fun:thr_new
-   fun:pthread_create
-}
 # PJF again a pthread_self() hazard
 {
    HELGRIND-PTHREAD-SELF1
@@ -219,14 +137,6 @@
    fun:memset
    obj:*/lib*/libthr.so.3
 }
-{
-   HELGRIND-MUTEX-LOCK2
-   Helgrind:Race
-   fun:memset
-   fun:__crt_calloc
-   fun:__thr_calloc
-   fun:mutex_init
-}
 {
    HELGRIND-LIBOMP
    Helgrind:Race
-- 
2.47.2