From a32cff8baf39143b4b20fdc585ac8b4a130ac7c8 Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Thu, 14 May 2015 13:03:08 +0000 Subject: [PATCH] bz#347233 - Fix memcheck/tests/strchr on OS X 10.10 (Haswell) git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15229 --- NEWS | 1 + memcheck/tests/filter_strchr | 1 + shared/vg_replace_strmem.c | 1 + 3 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 647847adf6..b702d0ade2 100644 --- 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 0bee4d9157..b770c32051 100755 --- 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 02795be5dd..d4e54492df 100644 --- 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 -- 2.47.3