From 8a5e8c6bb7c77a8b47005a6fe5bb479293b408a2 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Tue, 4 Nov 2025 07:30:42 +0100 Subject: [PATCH] Darwin: fix redir for memccpy --- memcheck/tests/filter_libc_variants | 2 +- memcheck/tests/memccpy2.vgtest | 1 + shared/vg_replace_strmem.c | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/memcheck/tests/filter_libc_variants b/memcheck/tests/filter_libc_variants index dce64d4a71..bfffa84689 100755 --- 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 29039f1537..988a8cb1c4 100644 --- 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 6cc26d9a82..28fda80ee2 100644 --- 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 ----------------------*/ -- 2.47.3