From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sun, 2 Apr 2023 13:22:54 +0000 (+0200)
Subject: Darwin: more suppressions for Darwin 17, and another strchr wrapper
X-Git-Tag: VALGRIND_3_21_0~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b32875d20cf8288b05ed2e5846454ba93d7aad30;p=thirdparty%2Fvalgrind.git

Darwin: more suppressions for Darwin 17, and another strchr wrapper
---

diff --git a/darwin17.supp b/darwin17.supp
index 78f33477ca..5e9f3c0960 100644
--- a/darwin17.supp
+++ b/darwin17.supp
@@ -766,3 +766,50 @@ macos-__pthread_rwlock_init-see-our-bug-196528
 Memcheck:Cond
 fun:pthread_rwlock_init
 }
+
+# macOS 10.13 mach-o loader at startup
+{
+   OSX1013:map_images-1
+   Memcheck:Leak
+   match-leak-kinds: all
+   fun:*alloc
+   fun:NXCreate*TableFromZone
+}
+
+{
+   OSX1013:map_images-2
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:calloc
+   fun:map_images_nolock
+   fun:map_images
+}
+{
+   OSX1013:map_images-3
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:calloc
+   fun:_ZL12realizeClassP10objc_class
+}
+{
+   OSX1013:map_images-4
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc_zone_malloc
+   ...
+   fun:map_images_nolock
+}
+{
+   OSX1013:map_images-5
+   Memcheck:Leak
+   match-leak-kinds: indirect
+   fun:malloc_zone_calloc
+   fun:*NXHash*
+}
+
+{
+   OSX1013:_pthread_start
+   Helgrind:Race
+   fun:_pthread_start
+   fun:thread_start
+}
diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
index 71b0e14cf5..30065d537a 100644
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -293,6 +293,7 @@ static inline void my_exit ( int x )
   /* _platform_strchr$VARIANT$Haswell */
   STRCHR(libsystemZuplatformZddylib, _platform_strchr$VARIANT$Haswell)
 # endif
+ STRCHR(libsystemZuplatformZddylib, _platform_strchr$VARIANT$Base)
 
 #elif defined(VGO_solaris)
  STRCHR(VG_Z_LIBC_SONAME,          strchr)