From: Roland McGrath <roland@redhat.com>
Date: Wed, 2 Feb 2011 00:09:43 +0000 (-0800)
Subject: libdwfl: Fix prelink address_sync to find 64-bit PT_INTERP.
X-Git-Tag: elfutils-0.152~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fdd461bda5fe2921dc0ce91aaba9e21805bbdd2;p=thirdparty%2Felfutils.git

libdwfl: Fix prelink address_sync to find 64-bit PT_INTERP.
---

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 16fb71d3c..81b4fcdde 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-01  Roland McGrath  <roland@redhat.com>
+
+	* dwfl_module_getdwarf.c (find_prelink_address_sync): Fix pasto in
+	last change, so we recognize PT_INTERP in ELFCLASS64 correctly.
+
 2011-01-11  Roland McGrath  <roland@redhat.com>
 
 	* dwfl_module_getdwarf.c (open_elf): Remove section-based
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index 0825722dd..83ca85351 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -423,9 +423,9 @@ find_prelink_address_sync (Dwfl_Module *mod)
     else
       {
 	for (uint_fast16_t i = 0; i < phnum; ++i)
-	  if (phdr.p32[i].p_type == PT_INTERP)
+	  if (phdr.p64[i].p_type == PT_INTERP)
 	    {
-	      interp = phdr.p32[i].p_vaddr;
+	      interp = phdr.p64[i].p_vaddr;
 	      break;
 	    }
       }