From: Julian Seward <jseward@acm.org>
Date: Sat, 30 Aug 2014 19:21:48 +0000 (+0000)
Subject: Helgrind needs to know the soname of ld.so, and on arm64-linux
X-Git-Tag: svn/VALGRIND_3_10_0~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24b6d8ea1f2e8d5067525703e2c18efa1fb0bb1e;p=thirdparty%2Fvalgrind.git

Helgrind needs to know the soname of ld.so, and on arm64-linux
it is different (ld-linux-aarch64.so.1) from all other targets.
(Why?)  This makes Helgrind at least somewhat usable on arm64-linux.


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

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index de01c89940..274d3feb26 100644
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -4477,6 +4477,7 @@ static Bool is_in_dynamic_linker_shared_object( Addr64 ga )
    if (VG_STREQ(soname, VG_U_LD64_SO_1))            return True;
    if (VG_STREQ(soname, VG_U_LD64_SO_2))            return True;
    if (VG_STREQ(soname, VG_U_LD_SO_1))              return True;
+   if (VG_STREQ(soname, VG_U_LD_LINUX_AARCH64_SO_1)) return True;
 #  elif defined(VGO_darwin)
    if (VG_STREQ(soname, VG_U_DYLD)) return True;
 #  else
diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
index 62732c1b97..b99ef2c584 100644
--- a/include/pub_tool_redir.h
+++ b/include/pub_tool_redir.h
@@ -301,6 +301,8 @@
 #define  VG_Z_LD_SO_1               ldZdsoZd1                  // ld.so.1
 #define  VG_U_LD_SO_1               "ld.so.1"
 
+#define  VG_U_LD_LINUX_AARCH64_SO_1 "ld-linux-aarch64.so.1"
+
 #endif
 
 /* --- Executable name for Darwin Mach-O linker. --- */