summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libunwind-arm.h2
-rw-r--r--src/arm/Gresume.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h
index 80f87c07..0bea7958 100644
--- a/include/libunwind-arm.h
+++ b/include/libunwind-arm.h
@@ -244,7 +244,7 @@ typedef enum
UNW_TDEP_LAST_REG = UNW_ARM_D31,
- UNW_TDEP_IP = UNW_ARM_R14, /* A little white lie. */
+ UNW_TDEP_IP = UNW_ARM_R15,
UNW_TDEP_SP = UNW_ARM_R13,
UNW_TDEP_EH = UNW_ARM_R0 /* FIXME. */
}
diff --git a/src/arm/Gresume.c b/src/arm/Gresume.c
index 3b9dfb33..ed284e72 100644
--- a/src/arm/Gresume.c
+++ b/src/arm/Gresume.c
@@ -50,7 +50,7 @@ arm_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
regs[6] = uc->regs[10];
regs[7] = uc->regs[11]; /* FP */
regs[8] = uc->regs[13]; /* SP */
- regs[9] = uc->regs[14]; /* LR */
+ regs[9] = uc->regs[15]; /* PC */
struct regs_overlay {
char x[sizeof(regs)];