aboutsummaryrefslogtreecommitdiff
path: root/src/client/linux/dump_writer_common/thread_info.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/linux/dump_writer_common/thread_info.cc')
-rw-r--r--src/client/linux/dump_writer_common/thread_info.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/linux/dump_writer_common/thread_info.cc b/src/client/linux/dump_writer_common/thread_info.cc
index 905941ee..f8488366 100644
--- a/src/client/linux/dump_writer_common/thread_info.cc
+++ b/src/client/linux/dump_writer_common/thread_info.cc
@@ -178,7 +178,12 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
out->flt_save.data_offset = fpregs.rdp;
out->flt_save.data_selector = 0; // We don't have this.
out->flt_save.mx_csr = fpregs.mxcsr;
+#if defined (__ANDROID__)
+ // Internal bug b/18097559
+ out->flt_save.mx_csr_mask = fpregs.mxcsr_mask;
+#else
out->flt_save.mx_csr_mask = fpregs.mxcr_mask;
+#endif
my_memcpy(&out->flt_save.float_registers, &fpregs.st_space, 8 * 16);
my_memcpy(&out->flt_save.xmm_registers, &fpregs.xmm_space, 16 * 16);
}