From 0efce7d2a8369942b0b3b5e6d29b1ddc6d8b41dd Mon Sep 17 00:00:00 2001 From: "digit@chromium.org" Date: Thu, 30 Aug 2012 12:01:43 +0000 Subject: Fix Linux/ARM GetInstructionPointer() in minidump_writer.cc On ARM, the 'ip' register (a.k.a. r12) is not the same than 'pc' (a.k.a. r15) which holds the real instruction pointer. Review URL: https://breakpad.appspot.com/443002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1021 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/client/linux/minidump_writer/minidump_writer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc index e3eb6c34..eb2e6d64 100644 --- a/src/client/linux/minidump_writer/minidump_writer.cc +++ b/src/client/linux/minidump_writer/minidump_writer.cc @@ -1076,7 +1076,7 @@ class MinidumpWriter { } uintptr_t GetInstructionPointer() { - return ucontext_->uc_mcontext.arm_ip; + return ucontext_->uc_mcontext.arm_pc; } #else #error "This code has not been ported to your platform yet." -- cgit v1.2.1