commit 7c41246665528d6abc9ef08ffb0aa8ccb6d4d681
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Mar 27 16:49:55 2012 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Mar 27 16:49:55 2012 +0000
tree cb19be2a274e5dd5dbe5c8f857b7add4b4f63f20
parent 54eac25a54a255d5deaa228547d2ef145590929b

Update the memcpy intercept for Helgrind in accordance with that
for Memcheck.  Fixes #293855.



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

helgrind/hg_intercepts.c

diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index 206221e..d586a3d 100644
--- a/helgrind/hg_intercepts.c
+++ b/helgrind/hg_intercepts.c
@@ -2450,8 +2450,14 @@
     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