diff --git a/NEWS b/NEWS index 5cbf336b3..ca7b0f499 100644 --- a/NEWS +++ b/NEWS @@ -42,6 +42,7 @@ where XXXXXX is the bug number as listed below. 406561 mcinfcallWSRU gdbserver_test fails on ppc64 407218 Add support for the copy_file_range syscall +407307 Intercept stpcpy also in ld.so for arm64 n-i-bz Fix minor one time leaks in dhat. n-i-bz Add --run-cxx-freeres=no in outer args to avoid inner crashes. diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h index c97941ff4..15ba67fdb 100644 --- a/include/pub_tool_redir.h +++ b/include/pub_tool_redir.h @@ -313,7 +313,9 @@ #define VG_Z_LD_SO_1 ldZdsoZd1 // ld.so.1 #define VG_U_LD_SO_1 "ld.so.1" +#define VG_Z_LD_LINUX_AARCH64_SO_1 ldZhlinuxZhaarch64ZdsoZd1 #define VG_U_LD_LINUX_AARCH64_SO_1 "ld-linux-aarch64.so.1" + #define VG_U_LD_LINUX_ARMHF_SO_3 "ld-linux-armhf.so.3" #endif diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c index 89a7dccb7..19143cf15 100644 --- a/shared/vg_replace_strmem.c +++ b/shared/vg_replace_strmem.c @@ -1160,6 +1160,7 @@ static inline void my_exit ( int x ) STPCPY(VG_Z_LIBC_SONAME, __stpcpy_sse2_unaligned) STPCPY(VG_Z_LD_LINUX_SO_2, stpcpy) STPCPY(VG_Z_LD_LINUX_X86_64_SO_2, stpcpy) + STPCPY(VG_Z_LD_LINUX_AARCH64_SO_1,stpcpy) #elif defined(VGO_darwin) //STPCPY(VG_Z_LIBC_SONAME, stpcpy)