From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sun, 3 Nov 2024 19:00:33 +0000 (+0100)
Subject: Helgrind FreeBSD: make previous hack conditonal on version
X-Git-Tag: VALGRIND_3_25_0~254
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fa368ebb129cd3fbb0406d16a4d4f3d6ffc1fca;p=thirdparty%2Fvalgrind.git

Helgrind FreeBSD: make previous hack conditonal on version

Don't want to ignore any pthread_mutex_lock calls on FreeBSD
14.1 and earlier.
---

diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index 2e63dad87..ba16e33f9 100644
--- a/helgrind/hg_intercepts.c
+++ b/helgrind/hg_intercepts.c
@@ -113,6 +113,8 @@
 #define LIBC_FUNC(ret_ty, f, args...) \
    ret_ty I_WRAP_SONAME_FNNAME_ZZ(VG_Z_LIBC_SONAME,f)(args); \
    ret_ty I_WRAP_SONAME_FNNAME_ZZ(VG_Z_LIBC_SONAME,f)(args)
+
+#include <osreldate.h>
 #endif
 
 // Do a client request.  These are macros rather than a functions so
@@ -944,7 +946,9 @@ static int exit_WRK(int status)
    OrigFn fn;
    VALGRIND_GET_ORIG_FN(fn);
 
+#if (__FreeBSD_version >= 1401500)
    hg_in_exit = 1;
+#endif
 
    CALL_FN_W_W(ret, fn, status);