From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Tue, 17 Dec 2013 17:17:32 +0000 (+0100)
Subject: Fix forgotten call of ebl_dwarf_to_regno.
X-Git-Tag: elfutils-0.158~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cd283c92084706a20519f82d3ec5477af332fec;p=thirdparty%2Felfutils.git

Fix forgotten call of ebl_dwarf_to_regno.

Signed-off-by: Jan Kratochvil <jan.kratochvil@redhat.com>
---

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 76538e64d..a025a96bd 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* frame_unwind.c (handle_cfi): Call ebl_dwarf_to_regno for RA.
+
 2013-12-17  Mark Wielaard  <mjw@redhat.com>
 
 	* linux-pid-attach.c (pid_next_thread): Call rewinddir on first
diff --git a/libdwfl/frame_unwind.c b/libdwfl/frame_unwind.c
index 630efcb6f..3635df103 100644
--- a/libdwfl/frame_unwind.c
+++ b/libdwfl/frame_unwind.c
@@ -539,7 +539,7 @@ handle_cfi (Dwfl_Frame *state, Dwarf_Addr pc, Dwarf_CFI *cfi, Dwarf_Addr bias)
 	    {
 	      /* REGNO is undefined.  */
 	      unsigned ra = frame->fde->cie->return_address_register;
-	      if (regno == ra)
+	      if (ebl_dwarf_to_regno (ebl, &ra) && regno == ra)
 		unwound->pc_state = DWFL_FRAME_STATE_PC_UNDEFINED;
 	      continue;
 	    }