From: Roland McGrath <roland@redhat.com>
Date: Wed, 18 Aug 2010 09:54:29 +0000 (-0700)
Subject: Don't suppress full file names found in core-file link_map.
X-Git-Tag: elfutils-0.149~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7503c89a9539c46c910e6e737c2a98d3b7c177ac;p=thirdparty%2Felfutils.git

Don't suppress full file names found in core-file link_map.
---

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index f0a8529d2..eb8aa8ac1 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-18  Roland McGrath  <roland@redhat.com>
+
+	* link_map.c (report_r_debug): Use found name if we have no name,
+	even if we already have an Elf handle.
+
 2010-06-30  Roland McGrath  <roland@redhat.com>
 
 	* linux-kernel-modules.c (dwfl_linux_kernel_find_elf): Don't be
diff --git a/libdwfl/link_map.c b/libdwfl/link_map.c
index 403b2df68..8ec06269c 100644
--- a/libdwfl/link_map.c
+++ b/libdwfl/link_map.c
@@ -398,9 +398,7 @@ report_r_debug (uint_fast8_t elfclass, uint_fast8_t elfdata,
 	     the full file name from l_name.  Opening the file by this
 	     name will be the fallback when no build ID match is found.
 	     XXX hook for sysroot */
-	  if (name != NULL
-	      && mod->main.elf == NULL
-	      && mod->main.name == NULL)
+	  if (name != NULL && mod->main.name == NULL)
 	    mod->main.name = strdup (name);
 	}
       else if (name != NULL)