aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordigit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-08-30 12:01:43 +0000
committerdigit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-08-30 12:01:43 +0000
commit0efce7d2a8369942b0b3b5e6d29b1ddc6d8b41dd (patch)
treeeb4d6e93bec4c747c8051113d08479bcfb61f205 /src
parentFix Breakpad unit tests build for Android. (diff)
downloadbreakpad-0efce7d2a8369942b0b3b5e6d29b1ddc6d8b41dd.tar.xz
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
Diffstat (limited to 'src')
-rw-r--r--src/client/linux/minidump_writer/minidump_writer.cc2
1 files changed, 1 insertions, 1 deletions
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."