commit 9951323b382138ba9ffbb33901af85bc0ad5dc3f
author rhyskidd <rhyskidd@a5019735-40e9-0310-863c-91ae7b9d1cf9> Thu Mar 26 10:14:25 2015 +0000
committer rhyskidd <rhyskidd@a5019735-40e9-0310-863c-91ae7b9d1cf9> Thu Mar 26 10:14:25 2015 +0000
tree 9c0d009487f2a16399950d62d31195f7ce5f79dd
parent 900c5357f377ae0cf0dba255e660b1c2df5d93bc

Further fixes for bz#345394 specifically for OS X 10.10

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15038 a5019735-40e9-0310-863c-91ae7b9d1cf9

memcheck/tests/filter_strchr

diff --git a/memcheck/tests/filter_strchr b/memcheck/tests/filter_strchr
index cde6cca..0bee4d9 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:/"

shared/vg_replace_strmem.c

diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
index da00dd1..02795be 100644
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -204,7 +204,7 @@
  //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 @@
 # 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