Darwin: fix redir for memccpy

diff --git a/memcheck/tests/filter_libc_variants b/memcheck/tests/filter_libc_variants
index dce64d4a714b7fa112fceecf8bc1543224eb1e9b..bfffa84689d4457c0b2b9e364499583d877c5514 100755 (executable)
--- a/memcheck/tests/filter_libc_variants
+++ b/memcheck/tests/filter_libc_variants
@@ -2,4 +2,4 @@
 
 ./filter_stderr "$@" |
 
-sed 's/ _platform_memcmp / memcmp /;s/ bcmp / memcmp /'
+sed 's/ _platform_memcmp / memcmp /;s/ bcmp / memcmp /;s/ _platform_memccpy / memccpy /'

diff --git a/memcheck/tests/memccpy2.vgtest b/memcheck/tests/memccpy2.vgtest
index 29039f15378aa77e750e667ca709b98cb4c9e971..988a8cb1c4db1f3815a7ff60d8c29e805915c4af 100644 (file)
--- a/memcheck/tests/memccpy2.vgtest
+++ b/memcheck/tests/memccpy2.vgtest
@@ -1,2 +1,3 @@
 prog: memccpy2
 vgopts: -q
+stderr_filter: filter_libc_variants

diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
index 6cc26d9a82216828881a5a02e17d387930534632..28fda80ee2ad2f7c4112cfe908d0178ccde3a646 100644 (file)
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -2380,8 +2380,10 @@ static inline void my_exit ( int x )
       return NULL; \
  }
 
-#if defined(VGO_linux) || defined(VGO_freebsd) || defined(VGO_darwin) || defined(VGO_solaris)
+#if defined(VGO_linux) || defined(VGO_freebsd) || defined(VGO_solaris)
  MEMCCPY(VG_Z_LIBC_SONAME, memccpy)
+#elif defined(VGO_darwin)
+ MEMCCPY(libsystemZuplatformZddylib, _platform_memccpy)
 #endif
 
  /*---------------------- wcpncpy ----------------------*/