Apparently the dynamic linker on ARM-Linux has soname "ld-linux.so.3"

rather than "ld-linux.so.2".  No, don't ask me why.  Anyway, on
Helgrind, don't instrument code in ld-linux.so.3.  This makes Helgrind
pretty much usable on ARM-Linux.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11025

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index d2f34b6895617201be84a209b4e468aad2c72f38..294dcc8da2e6bd81fcc308dbfdb168546f4a31bf 100644 (file)
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -3885,6 +3885,7 @@ static Bool is_in_dynamic_linker_shared_object( Addr64 ga )
    if (0) VG_(printf)("%s\n", soname);
 
 #  if defined(VGO_linux)
+   if (VG_STREQ(soname, VG_U_LD_LINUX_SO_3))        return True;
    if (VG_STREQ(soname, VG_U_LD_LINUX_SO_2))        return True;
    if (VG_STREQ(soname, VG_U_LD_LINUX_X86_64_SO_2)) return True;
    if (VG_STREQ(soname, VG_U_LD64_SO_1))            return True;

diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
index 3d3b516c93b2e48ad0d6b45e3c7288b50929bd00..9c1009d7ab6d948ebfc9d8c27d07fa2f4eb517c8 100644 (file)
--- a/include/pub_tool_redir.h
+++ b/include/pub_tool_redir.h
@@ -215,6 +215,9 @@
 
 #if defined(VGO_linux)
 
+#define  VG_Z_LD_LINUX_SO_3         ldZhlinuxZdsoZd3           // ld-linux.so.3
+#define  VG_U_LD_LINUX_SO_3         "ld-linux.so.3"
+
 #define  VG_Z_LD_LINUX_SO_2         ldZhlinuxZdsoZd2           // ld-linux.so.2
 #define  VG_U_LD_LINUX_SO_2         "ld-linux.so.2"