From d442b97795942f8f87aee4413ff227420bc0d05c Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Thu, 26 Mar 2015 10:14:25 +0000 Subject: [PATCH] Further fixes for bz#345394 specifically for OS X 10.10 git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15038 --- memcheck/tests/filter_strchr | 1 + shared/vg_replace_strmem.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/memcheck/tests/filter_strchr b/memcheck/tests/filter_strchr index cde6cca393..0bee4d9157 100755 --- a/memcheck/tests/filter_strchr +++ b/memcheck/tests/filter_strchr @@ -4,4 +4,5 @@ ./filter_stderr "$@" | sed -e "s/: strchr (vg_replace_strmem.c:/: index (vg_replace_strmem.c:/; s/: _platform_strchr (vg_replace_strmem.c:/: index (vg_replace_strmem.c:/; + s/: _platform_strchr\$VARIANT\$Generic (vg_replace_strmem.c:/: index (vg_replace_strmem.c:/; s/: strrchr (vg_replace_strmem.c:/: rindex (vg_replace_strmem.c:/" diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c index da00dd1715..02795be5dd 100644 --- a/shared/vg_replace_strmem.c +++ b/shared/vg_replace_strmem.c @@ -204,7 +204,7 @@ static inline void my_exit ( int x ) //STRRCHR(VG_Z_DYLD, strrchr) //STRRCHR(VG_Z_DYLD, rindex) STRRCHR(VG_Z_LIBC_SONAME, strrchr) -# if DARWIN_VERS == DARWIN_10_9 +# if DARWIN_VERS == DARWIN_10_9 || DARWIN_VERS == DARWIN_10_10 STRRCHR(libsystemZucZddylib, strrchr) # endif @@ -245,6 +245,10 @@ static inline void my_exit ( int x ) # if DARWIN_VERS == DARWIN_10_9 STRCHR(libsystemZuplatformZddylib, _platform_strchr) # endif +# if DARWIN_VERS == DARWIN_10_10 + /* _platform_strchr$VARIANT$Generic */ + STRCHR(libsystemZuplatformZddylib, _platform_strchr$VARIANT$Generic) +# endif #endif -- 2.47.3