Update the memcpy intercept for Helgrind in accordance with that

for Memcheck.  Fixes #293855.

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

diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index 206221e2148944323a61adf93053412f350b94b0..d586a3dca39f25e2ef9b968d76ab8bf90f69284d 100644 (file)
--- a/helgrind/hg_intercepts.c
+++ b/helgrind/hg_intercepts.c
@@ -2450,8 +2450,14 @@ QT4_FUNC(void*, _ZN6QMutexD2Ev, void* mutex)
     http://bugs.kde.org/show_bug.cgi?id=139776
  */
  MEMCPY(NONE, _intel_fast_memcpy)
+
 #elif defined(VGO_darwin)
- MEMCPY(VG_Z_LIBC_SONAME,    memcpy)
+# if DARWIN_VERS <= DARWIN_10_6
+  MEMCPY(VG_Z_LIBC_SONAME,  memcpy)
+# endif
+ MEMCPY(VG_Z_LIBC_SONAME,  memcpyZDVARIANTZDsse3x) /* memcpy$VARIANT$sse3x */
+ MEMCPY(VG_Z_LIBC_SONAME,  memcpyZDVARIANTZDsse42) /* memcpy$VARIANT$sse42 */
+
 #endif