From: Roland McGrath <roland@redhat.com>
Date: Wed, 22 Apr 2009 19:29:32 +0000 (-0700)
Subject: Fix relocation when symbols are resolved in non-ET_REL modules.
X-Git-Tag: elfutils-0.141~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c65558baa0382d59398234c5a05debdc5a98eb1b;p=thirdparty%2Felfutils.git

Fix relocation when symbols are resolved in non-ET_REL modules.
---

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 86a08e932..f0b0a284a 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-22  Roland McGrath  <roland@redhat.com>
 
+	* relocate.c (resolve_symbol): Apply correct bias to st_value found in
+	a non-ET_REL module.
+
 	* dwfl_module_build_id.c (__libdwfl_find_build_id): Fix last change to
 	adjust properly for non-ET_REL.
 
diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c
index b236ca50a..2c0f30108 100644
--- a/libdwfl/relocate.c
+++ b/libdwfl/relocate.c
@@ -267,9 +267,15 @@ resolve_symbol (Dwfl_Module *referer, struct reloc_symtab_cache *symtab,
 		  continue;
 
 		/* We found it!  */
-		if (shndx == SHN_ABS)
+		if (shndx == SHN_ABS) /* XXX maybe should apply bias? */
 		  return DWFL_E_NOERROR;
 
+		if (m->e_type != ET_REL)
+		  {
+		    sym->st_value += m->symfile->bias;
+		    return DWFL_E_NOERROR;
+		  }
+
 		/* In an ET_REL file, the symbol table values are relative
 		   to the section, not to the module's load base.  */
 		size_t symshstrndx = SHN_UNDEF;