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

diff --git a/darwin17.supp b/darwin17.supp
index 78f33477ca21fe5a09edfcf155f4cc2781afb32e..5e9f3c096063c5e15b6a7b267f62498c7bd07ed7 100644 (file)
--- 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 71b0e14cf5d49d30b6ef49b0fee99141126e9492..30065d537a81f3d03b04210881935975009adff1 100644 (file)
--- 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)