bz#347233 - Fix memcheck/tests/strchr on OS X 10.10 (Haswell)

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

diff --git a/NEWS b/NEWS
index 647847adf6cb5885892719cae4fc8a4e23415fd1..b702d0ade286e9430aa58e14dba0b59ae16bf646 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -173,6 +173,7 @@ where XXXXXX is the bug number as listed below.
 346487  Compiler generates "note" about a future ABI change for PPC64
 346801  Fix link error on OS X: _vgModuleLocal_sf_maybe_extend_stack
 347151  Fix suppression for pthread_rwlock_init on OS X 10.8
+347233  Fix memcheck/tests/strchr on OS X 10.10 (Haswell) 
 347379  valgrind --leak-check=full memleak errors from system libraries on OS X 10.8
         == 217236
 347389  unhandled syscall: 373 (Linux ARM syncfs)

diff --git a/memcheck/tests/filter_strchr b/memcheck/tests/filter_strchr
index 0bee4d9157d746ba7bbfc3122882f7b01edf3ec2..b770c320515573a9918b35fb05c104ca9a594026 100755 (executable)
--- a/memcheck/tests/filter_strchr
+++ b/memcheck/tests/filter_strchr
@@ -5,4 +5,5 @@
 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/: _platform_strchr\$VARIANT\$Haswell (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 02795be5dd2b76a919a7285fdf5c326f75249f8d..d4e54492df4ae99fdd0c5eb31229def258ecb340 100644 (file)
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -248,6 +248,7 @@ static inline void my_exit ( int x )
 # if DARWIN_VERS == DARWIN_10_10
   /* _platform_strchr$VARIANT$Generic */
   STRCHR(libsystemZuplatformZddylib, _platform_strchr$VARIANT$Generic)
+  STRCHR(libsystemZuplatformZddylib, _platform_strchr$VARIANT$Haswell)
 # endif
 #endif