replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update lldb to track recent Triple arm64 enum removal and collapse into aarch64. 

See the following llvm change for details:

r213743 | tnorthover | 2014-07-23 05:32:47 -0700 (Wed, 23 Jul 2014) | 9 lines
AArch64: remove arm64 triple enumerator.

This change fixes build breaks on Linux and MacOSX lldb.

llvm-svn: 213755
This commit is contained in:
Todd Fiala 2014-07-23 14:37:35 +00:00
parent 14ff2df05c
commit d8eaa17587
14 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/source/Core/ArchSpec.cpp
View File

@ -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);

2
lldb/source/Core/Module.cpp
View File

@ -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);

2
lldb/source/Expression/ExpressionSourceCode.cpp
View File

@ -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";
}

2
lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp
View File

@ -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);

2
lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
View File

@ -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);
}

2
lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
View File

@ -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())

2
lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
View File

@ -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

2
lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
View File

@ -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;

2
lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
View File

@ -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();

2
lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp
View File

@ -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
{

6
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
View File

@ -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();

2
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
View File

@ -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:

2
lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
View File

@ -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)
{

2
lldb/source/Target/Thread.cpp
View File

@ -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: