Merge from trunk, r12982 (Intercept __GI_memmove, #306612)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_8_BRANCH@12985

diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index b5b6b5d680fa15cbcac0d33cf7f07551d8366d6d..02072daefd5ab61aa286d8ffac9c3e1e24450587 100644 (file)
--- a/memcheck/mc_replace_strmem.c
+++ b/memcheck/mc_replace_strmem.c
@@ -1020,6 +1020,7 @@ static inline void my_exit ( int x )
 
 #if defined(VGO_linux)
  MEMMOVE(VG_Z_LIBC_SONAME, memmove)
+ MEMMOVE(VG_Z_LIBC_SONAME, __GI_memmove)
 
 #elif defined(VGO_darwin)
 # if DARWIN_VERS <= DARWIN_10_6