From: Julian Seward <jseward@acm.org>
Date: Mon, 11 Jan 2010 13:02:19 +0000 (+0000)
Subject: Apparently the dynamic linker on ARM-Linux has soname "ld-linux.so.3"
X-Git-Tag: svn/VALGRIND_3_6_0~399
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f75c360fc1c30dd9cf5a01c9dfbe7c6613d8ccc1;p=thirdparty%2Fvalgrind.git

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 d2f34b6895..294dcc8da2 100644
--- 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 3d3b516c93..9c1009d7ab 100644
--- 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"