[Valgrind-developers] valgrind: r12423: Reinstate intercepts for plain "memcpy" and "memmove" on OSX <= 10.6

[<sv...@va...>]

sewardj	2012-03-07 15:26:50 +0000 (Wed, 07 Mar 2012)

  New Revision: 12423

  Log:
    Reinstate intercepts for plain "memcpy" and "memmove" on OSX <= 10.6
    (not on Lion).  Fixes #285662.

  Modified files:
    trunk/memcheck/mc_replace_strmem.c


  Modified: trunk/memcheck/mc_replace_strmem.c (+6 -4)
===================================================================
--- trunk/memcheck/mc_replace_strmem.c	2012-03-07 13:28:05 +00:00 (rev 12422)
+++ trunk/memcheck/mc_replace_strmem.c	2012-03-07 15:26:50 +00:00 (rev 12423)
@@ -850,8 +850,9 @@
  MEMCPY(NONE, ZuintelZufastZumemcpy)
 
 #elif defined(VGO_darwin)
- //MEMCPY(VG_Z_LIBC_SONAME,  memcpy)
- //MEMCPY(VG_Z_DYLD,         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 */
 
@@ -982,8 +983,9 @@
  MEMMOVE(VG_Z_LIBC_SONAME, memmove)
 
 #elif defined(VGO_darwin)
- //MEMMOVE(VG_Z_LIBC_SONAME, memmove)
- //MEMMOVE(VG_Z_DYLD,        memmove)#
+# if DARWIN_VERS <= DARWIN_10_6
+  MEMMOVE(VG_Z_LIBC_SONAME, memmove)
+# endif
  MEMMOVE(VG_Z_LIBC_SONAME,  memmoveZDVARIANTZDsse3x) /* memmove$VARIANT$sse3x */
  MEMMOVE(VG_Z_LIBC_SONAME,  memmoveZDVARIANTZDsse42) /* memmove$VARIANT$sse42 */