Merge r7350 (Intercept memcpy on 64-bit ld.so's.)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8080

diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index bad862819a4f92b417fd2b6794f8cdf47257790f..561da75e88f5d8a59c2e8535fe76c4eb857d709f 100644 (file)
--- a/memcheck/mc_replace_strmem.c
+++ b/memcheck/mc_replace_strmem.c
@@ -401,6 +401,7 @@ MEMCHR(m_libc_soname, memchr)
 
 MEMCPY(m_libc_soname, memcpy)
 MEMCPY(m_ld_so_1,     memcpy) /* ld.so.1 */
+MEMCPY(m_ld64_so_1,   memcpy) /* ld64.so.1 */
 /* icc9 blats these around all over the place.  Not only in the main
    executable but various .so's.  They are highly tuned and read
    memory beyond the source boundary (although work correctly and