diff options
14 files changed, 17 insertions, 17 deletions
diff --git a/lldb/source/Core/ArchSpec.cpp b/lldb/source/Core/ArchSpec.cpp index 03ebeb713f2..ce24e5d9302 100644 --- a/lldb/source/Core/ArchSpec.cpp +++ b/lldb/source/Core/ArchSpec.cpp @@ -77,7 +77,7 @@ static const CoreDefinition g_core_definitions[ArchSpec::kNumCores] = { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb , ArchSpec::eCore_thumbv7k , "thumbv7k" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb , ArchSpec::eCore_thumbv7m , "thumbv7m" }, { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb , ArchSpec::eCore_thumbv7em , "thumbv7em" }, - { eByteOrderLittle, 8, 4, 4, llvm::Triple::arm64 , ArchSpec::eCore_arm_arm64 , "arm64" }, + { eByteOrderLittle, 8, 4, 4, llvm::Triple::aarch64, ArchSpec::eCore_arm_arm64 , "arm64" }, { eByteOrderBig , 8, 4, 4, llvm::Triple::mips64 , ArchSpec::eCore_mips64 , "mips64" }, @@ -739,7 +739,7 @@ ArchSpec::SetArchitecture (ArchitectureType arch_type, uint32_t cpu, uint32_t su switch (core_def->machine) { - case llvm::Triple::arm64: + case llvm::Triple::aarch64: case llvm::Triple::arm: case llvm::Triple::thumb: m_triple.setOS (llvm::Triple::IOS); diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp index b043857cc8d..d337a8832b1 100644 --- a/lldb/source/Core/Module.cpp +++ b/lldb/source/Core/Module.cpp @@ -433,7 +433,7 @@ Module::GetClangASTContext () && object_arch.GetTriple().getOS() == llvm::Triple::UnknownOS) { if (object_arch.GetTriple().getArch() == llvm::Triple::arm || - object_arch.GetTriple().getArch() == llvm::Triple::arm64 || + object_arch.GetTriple().getArch() == llvm::Triple::aarch64 || object_arch.GetTriple().getArch() == llvm::Triple::thumb) { object_arch.GetTriple().setOS(llvm::Triple::IOS); diff --git a/lldb/source/Expression/ExpressionSourceCode.cpp b/lldb/source/Expression/ExpressionSourceCode.cpp index c79a2d795ce..bf6de55e6a9 100644 --- a/lldb/source/Expression/ExpressionSourceCode.cpp +++ b/lldb/source/Expression/ExpressionSourceCode.cpp @@ -51,7 +51,7 @@ bool ExpressionSourceCode::GetText (std::string &text, lldb::LanguageType wrappi if (Target *target = exe_ctx.GetTargetPtr()) { - if (target->GetArchitecture().GetMachine() == llvm::Triple::arm64) + if (target->GetArchitecture().GetMachine() == llvm::Triple::aarch64) { target_specific_defines = "typedef bool BOOL;\n"; } diff --git a/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp b/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp index f2db10c3f75..8f7962d095f 100644 --- a/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp +++ b/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp @@ -219,7 +219,7 @@ ABISP ABIMacOSX_arm64::CreateInstance (const ArchSpec &arch) { static ABISP g_abi_sp; - if (arch.GetTriple().getArch() == llvm::Triple::arm64) + if (arch.GetTriple().getArch() == llvm::Triple::aarch64) { if (!g_abi_sp) g_abi_sp.reset (new ABIMacOSX_arm64); diff --git a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp index 0736616cac3..164de3e5840 100644 --- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -326,7 +326,7 @@ DynamicLoaderMacOSXDYLD::LocateDYLD() { return ReadDYLDInfoFromMemoryAndSetNotificationCallback(0x7fff5fc00000ull); } - else if (exe_arch.GetMachine() == llvm::Triple::arm || exe_arch.GetMachine() == llvm::Triple::thumb || exe_arch.GetMachine() == llvm::Triple::arm64) + else if (exe_arch.GetMachine() == llvm::Triple::arm || exe_arch.GetMachine() == llvm::Triple::thumb || exe_arch.GetMachine() == llvm::Triple::aarch64) { return ReadDYLDInfoFromMemoryAndSetNotificationCallback(0x2fe00000); } diff --git a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp index db73f31ee45..3900af9b00d 100644 --- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp +++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp @@ -165,7 +165,7 @@ EmulateInstructionARM64::CreateInstance (const ArchSpec &arch, InstructionType i { if (EmulateInstructionARM64::SupportsEmulatingInstructionsOfTypeStatic(inst_type)) { - if (arch.GetTriple().getArch() == llvm::Triple::arm64) + if (arch.GetTriple().getArch() == llvm::Triple::aarch64) { std::auto_ptr<EmulateInstructionARM64> emulate_insn_ap (new EmulateInstructionARM64 (arch)); if (emulate_insn_ap.get()) diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp index 9012ffa5a2c..135aa5e40da 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp @@ -531,7 +531,7 @@ PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite } break; - case llvm::Triple::arm64: + case llvm::Triple::aarch64: { // TODO: fix this with actual darwin breakpoint opcode for arm64. // right now debugging uses the Z packets with GDB remote so this diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp index 4e2dbdb4635..50e1fbf2863 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp @@ -133,7 +133,7 @@ PlatformDarwinKernel::CreateInstance (bool force, const ArchSpec *arch) is_ios_debug_session = eLazyBoolNo; break; case llvm::Triple::arm: - case llvm::Triple::arm64: + case llvm::Triple::aarch64: case llvm::Triple::thumb: is_ios_debug_session = eLazyBoolYes; break; diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp index 92901e1a6c6..def9ada89e7 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp @@ -92,7 +92,7 @@ PlatformRemoteiOS::CreateInstance (bool force, const ArchSpec *arch) switch (arch->GetMachine()) { case llvm::Triple::arm: - case llvm::Triple::arm64: + case llvm::Triple::aarch64: case llvm::Triple::thumb: { const llvm::Triple &triple = arch->GetTriple(); diff --git a/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp b/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp index d1862398086..63b3238a9e0 100644 --- a/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp +++ b/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp @@ -439,7 +439,7 @@ StopInfoMachException::CreateStopReasonWithMachException } break; - case llvm::Triple::arm64: + case llvm::Triple::aarch64: { if (exc_code == 1 && exc_sub_code == 0) // EXC_ARM_BREAKPOINT { diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 9898cb9db1c..9bc0a968d8e 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -1748,7 +1748,7 @@ GDBRemoteCommunicationClient::GetHostInfo (bool force) { switch (m_host_arch.GetMachine()) { - case llvm::Triple::arm64: + case llvm::Triple::aarch64: case llvm::Triple::arm: case llvm::Triple::thumb: os_name = "ios"; @@ -1789,7 +1789,7 @@ GDBRemoteCommunicationClient::GetHostInfo (bool force) { switch (m_host_arch.GetMachine()) { - case llvm::Triple::arm64: + case llvm::Triple::aarch64: case llvm::Triple::arm: case llvm::Triple::thumb: host_triple.setOS(llvm::Triple::IOS); @@ -3466,7 +3466,7 @@ GDBRemoteCommunicationClient::AvoidGPackets (ProcessGDBRemote *process) if (arch.IsValid() && arch.GetTriple().getVendor() == llvm::Triple::Apple && arch.GetTriple().getOS() == llvm::Triple::IOS - && arch.GetTriple().getArch() == llvm::Triple::arm64) + && arch.GetTriple().getArch() == llvm::Triple::aarch64) { m_avoid_g_packets = eLazyBoolYes; uint32_t gdb_server_version = GetGDBServerProgramVersion(); diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp index b9d59e72ed9..44475981bdd 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp @@ -1338,7 +1338,7 @@ CreateProcessInfoResponse_DebugServerStyle (const ProcessInstanceInfo &proc_info switch (proc_triple.getArch ()) { case llvm::Triple::arm: - case llvm::Triple::arm64: + case llvm::Triple::aarch64: ostype = "ios"; break; default: diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp index 1eed9ef7080..99e1a03adfc 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp @@ -807,7 +807,7 @@ GDBRemoteRegisterContext::WriteAllRegisterValues (const lldb::DataBufferSP &data { const ArchSpec &arch = m_thread.GetProcess()->GetTarget().GetArchitecture(); if (arch.IsValid() - && arch.GetMachine() == llvm::Triple::arm64 + && arch.GetMachine() == llvm::Triple::aarch64 && arch.GetTriple().getVendor() == llvm::Triple::Apple && arch.GetTriple().getOS() == llvm::Triple::IOS) { diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp index 3aa7fbcaad9..a445517da6a 100644 --- a/lldb/source/Target/Thread.cpp +++ b/lldb/source/Target/Thread.cpp @@ -2191,7 +2191,7 @@ Thread::GetUnwinder () case llvm::Triple::x86_64: case llvm::Triple::x86: case llvm::Triple::arm: - case llvm::Triple::arm64: + case llvm::Triple::aarch64: case llvm::Triple::thumb: case llvm::Triple::mips64: case llvm::Triple::hexagon: |
