summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/debug/createdump/threadinfo.cpp18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/debug/createdump/threadinfo.cpp b/src/debug/createdump/threadinfo.cpp
index 8af76477b7..685f9e64c0 100644
--- a/src/debug/createdump/threadinfo.cpp
+++ b/src/debug/createdump/threadinfo.cpp
@@ -198,7 +198,6 @@ ThreadInfo::UnwindThread(CrashInfo& crashInfo, IXCLRDataProcess* pClrDataProcess
bool
ThreadInfo::GetRegistersWithPTrace()
{
-#if defined(__aarch64__)
struct iovec gpRegsVec = { &m_gpRegisters, sizeof(m_gpRegisters) };
if (ptrace((__ptrace_request)PTRACE_GETREGSET, m_tid, NT_PRSTATUS, &gpRegsVec) == -1)
{
@@ -210,21 +209,15 @@ ThreadInfo::GetRegistersWithPTrace()
struct iovec fpRegsVec = { &m_fpRegisters, sizeof(m_fpRegisters) };
if (ptrace((__ptrace_request)PTRACE_GETREGSET, m_tid, NT_FPREGSET, &fpRegsVec) == -1)
{
+#if defined(__arm__)
+ // Some aarch64 kernels may not support NT_FPREGSET for arm processes. We treat this failure as non-fatal.
+#else
fprintf(stderr, "ptrace(PTRACE_GETREGSET, %d, NT_FPREGSET) FAILED %d (%s)\n", m_tid, errno, strerror(errno));
return false;
+#endif
}
assert(sizeof(m_fpRegisters) == fpRegsVec.iov_len);
-#else
- if (ptrace((__ptrace_request)PTRACE_GETREGS, m_tid, nullptr, &m_gpRegisters) == -1)
- {
- fprintf(stderr, "ptrace(GETREGS, %d) FAILED %d (%s)\n", m_tid, errno, strerror(errno));
- return false;
- }
- if (ptrace((__ptrace_request)PTRACE_GETFPREGS, m_tid, nullptr, &m_fpRegisters) == -1)
- {
- fprintf(stderr, "ptrace(GETFPREGS, %d) FAILED %d (%s)\n", m_tid, errno, strerror(errno));
- return false;
- }
+
#if defined(__i386__)
if (ptrace((__ptrace_request)PTRACE_GETFPXREGS, m_tid, nullptr, &m_fpxRegisters) == -1)
{
@@ -243,7 +236,6 @@ ThreadInfo::GetRegistersWithPTrace()
return false;
}
#endif
-#endif
return true;
}
void ThreadInfo::SetRegisters(elf_prstatus *prstatus)