From: Julian Seward <jseward@acm.org>
Date: Wed, 14 May 2008 12:27:16 +0000 (+0000)
Subject: Merge r7350 (Intercept memcpy on 64-bit ld.so's.)
X-Git-Tag: svn/VALGRIND_3_3_1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c9b259639b9d268611b9c6ab631c073833e7f9e;p=thirdparty%2Fvalgrind.git

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 bad862819a..561da75e88 100644
--- 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