diff options
| author | Jason Molenda <jmolenda@apple.com> | 2019-08-07 02:06:06 +0000 |
|---|---|---|
| committer | Jason Molenda <jmolenda@apple.com> | 2019-08-07 02:06:06 +0000 |
| commit | 6cebeafac31ceb500494bb301e365363c3d5992a (patch) | |
| tree | 16a638ce3fb606f94e88888cfb760d92adea94ba /lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp | |
| parent | 5dbfca85419bda9d432ec43f7ea54d64ee2aab55 (diff) | |
| download | bcm5719-llvm-6cebeafac31ceb500494bb301e365363c3d5992a.tar.gz bcm5719-llvm-6cebeafac31ceb500494bb301e365363c3d5992a.zip | |
Upstream a few small Apple changes to debugserver - arm64_32, Catalyst
Adrian's changes to support Catalyst processes and my
changes to support debugserver running on an arm64_32
device (Apple Watch Series 4, which uses an IPL32 model
on arm64 cpus).
llvm-svn: 368118
Diffstat (limited to 'lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp')
| -rw-r--r-- | lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp b/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp index 0fa4437843a..d2aae9da0c4 100644 --- a/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp +++ b/lldb/tools/debugserver/source/MacOSX/MachThreadList.cpp @@ -12,6 +12,7 @@ #include "MachThreadList.h" +#include "DNB.h" #include "DNBLog.h" #include "DNBThreadResumeActions.h" #include "MachProcess.h" @@ -278,8 +279,12 @@ MachThreadList::UpdateThreadList(MachProcess *process, bool update, #elif defined(__arm__) || defined(__arm64__) || defined(__aarch64__) if (m_is_64_bit) DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM64); - else - DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM); + else { + if (process->GetCPUType() == CPU_TYPE_ARM64_32) + DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM64_32); + else + DNBArchProtocol::SetArchitecture(CPU_TYPE_ARM); + } #endif } |
