Index: client/linux/minidump_writer/linux_ptrace_dumper.cc |
diff --git a/client/linux/minidump_writer/linux_ptrace_dumper.cc b/client/linux/minidump_writer/linux_ptrace_dumper.cc |
index 5ea0050de58cb0bf05b7922b331150f900d5571c..c7495e1744916dd1cc6a5b4718f79a02409320c1 100644 |
--- a/client/linux/minidump_writer/linux_ptrace_dumper.cc |
+++ b/client/linux/minidump_writer/linux_ptrace_dumper.cc |
@@ -206,12 +206,18 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { |
return false; |
} |
+#if !(defined(__ANDROID__) && defined(__ARM_EABI__)) |
+ // When running an arm build on an arm64 device, attempting to get the |
+ // floating point registers fails. On Android, the floating point registers |
+ // aren't written to the cpu context anyway, so just don't get them here. |
+ // See http://crbug.com/508324 |
void* fp_addr; |
info->GetFloatingPointRegisters(&fp_addr, NULL); |
if (sys_ptrace(PTRACE_GETFPREGS, tid, NULL, fp_addr) == -1) { |
return false; |
} |
#endif |
+#endif |
Lei Zhang
2015/08/04 23:39:34
nit: add // PTRACE_GETREGSET so it's more obvious
|
#if defined(__i386) |
#if !defined(bit_FXSAVE) // e.g. Clang |