Re: [Libunwind-devel] PATCH] aarch64 PLT entry recognition & fixes

[Dave Watson]

On 08/29/18 06:48 PM, Doug Moore wrote:
> Jonathan Byrd offered a patch with this description on 15 Nov 2016.  His
> attached patch changed 4 files, including dwarf/Gparser.c.  When the patch
> was committed on 18 Aug 2017, Gparser.c was not changed.  Was that a choice,
> or an error?  Since I'm finding that I have PLT entry recognition problems
> on aarch64, I wonder if it might have been an error.

Looks like there were merge conflicts originally, I probably screwed
up the merge.  This is the only necessary fix?  I will commit it.

Thanks!

diff --git a/src/dwarf/Gparser.c b/src/dwarf/Gparser.c
index 3a47255..1e59642 100644
--- a/src/dwarf/Gparser.c
+++ b/src/dwarf/Gparser.c
@@ -792,7 +792,7 @@ apply_reg_state (struct dwarf_cursor *c, struct
dwarf_reg_state *rs)
           break;
 
         case DWARF_WHERE_REG:
-          c->loc[i] = DWARF_REG_LOC (c, dwarf_to_unw_regnum(rs->reg[i].val));
+          c->loc[i] = c->loc[rs->reg[i].val];
           break;
 
         case DWARF_WHERE_EXPR: