diff options
| author | Todd Fiala <todd.fiala@gmail.com> | 2014-07-09 01:29:05 +0000 |
|---|---|---|
| committer | Todd Fiala <todd.fiala@gmail.com> | 2014-07-09 01:29:05 +0000 |
| commit | 013434e547264f46db5a559b2fcdda5a791484ec (patch) | |
| tree | 78dfc73d8343f5918821a0c97090f10650740f4d /lldb/tools/debugserver/source/DNB.cpp | |
| parent | 52d760399c5fa4b5690fbd614ecc40460b8b6895 (diff) | |
| download | bcm5719-llvm-013434e547264f46db5a559b2fcdda5a791484ec.tar.gz bcm5719-llvm-013434e547264f46db5a559b2fcdda5a791484ec.zip | |
__arm64__ and __aarch64__ #ifdef adjustments
Change by Paul Osmialowski
See http://reviews.llvm.org/D4379 for details.
llvm-svn: 212583
Diffstat (limited to 'lldb/tools/debugserver/source/DNB.cpp')
| -rw-r--r-- | lldb/tools/debugserver/source/DNB.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/tools/debugserver/source/DNB.cpp b/lldb/tools/debugserver/source/DNB.cpp index 4114aac4de2..abd1661af52 100644 --- a/lldb/tools/debugserver/source/DNB.cpp +++ b/lldb/tools/debugserver/source/DNB.cpp @@ -2309,7 +2309,7 @@ DNBInitialize() #if defined (__i386__) || defined (__x86_64__) DNBArchImplI386::Initialize(); DNBArchImplX86_64::Initialize(); -#elif defined (__arm__) || defined (__arm64__) +#elif defined (__arm__) || defined (__arm64__) || defined (__aarch64__) DNBArchMachARM::Initialize(); DNBArchMachARM64::Initialize(); #endif @@ -2329,7 +2329,7 @@ DNBSetArchitecture (const char *arch) return DNBArchProtocol::SetArchitecture (CPU_TYPE_I386); else if ((strcasecmp (arch, "x86_64") == 0) || (strcasecmp (arch, "x86_64h") == 0)) return DNBArchProtocol::SetArchitecture (CPU_TYPE_X86_64); - else if (strstr (arch, "arm64") == arch || strstr (arch, "armv8") == arch) + else if (strstr (arch, "arm64") == arch || strstr (arch, "armv8") == arch || strstr (arch, "aarch64") == arch) return DNBArchProtocol::SetArchitecture (CPU_TYPE_ARM64); else if (strstr (arch, "arm") == arch) return DNBArchProtocol::SetArchitecture (CPU_TYPE_ARM); |
