Further fixes for bz#345394 specifically for OS X 10.10

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15038

diff --git a/memcheck/tests/filter_strchr b/memcheck/tests/filter_strchr
index cde6cca3931df0614cbd26192d8a40103a5db2c2..0bee4d9157d746ba7bbfc3122882f7b01edf3ec2 100755 (executable)
--- 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 da00dd17157c20d4184d4923932f0b4e2245b62e..02795be5dd2b76a919a7285fdf5c326f75249f8d 100644 (file)
--- 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