This is an archive of the discontinued LLVM Phabricator instance.

Differential D10957

Leave OS as unspecified unknown if it isn't specified in the ELF file
ClosedPublic

Authored by tberghammer on Jul 6 2015, 5:24 AM.

Details

Reviewers
ovyalov
trixirt
Commits
rGed1fa2084c9a: Leave OS as unspecified unknown if it isn't specified in the ELF file
rLLDB241569: Leave OS as unspecified unknown if it isn't specified in the ELF file
rL241569: Leave OS as unspecified unknown if it isn't specified in the ELF file
Summary

Leave OS as unspecified unknown if it isn't specified in the ELF file

This is the redone of rL238623 what was reverted with the refactor in rL239148.

Diff Detail

Repository
rL LLVM

Event Timeline

tberghammer updated this revision to Diff 29079.Jul 6 2015, 5:24 AM
tberghammer retitled this revision from to Leave OS as unspecified unknown if it isn't specified in the ELF file.
tberghammer updated this object.
tberghammer added reviewers: ovyalov, trixirt.
tberghammer added a subscriber: lldb-commits.
emaste added a subscriber: emaste.Jul 6 2015, 8:18 AM
ovyalov accepted this revision.Jul 6 2015, 10:22 AM
ovyalov edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jul 6 2015, 10:22 AM
Closed by commit rL241569: Leave OS as unspecified unknown if it isn't specified in the ELF file (authored by tberghammer). · Explain WhyJul 7 2015, 2:12 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
source/
Core/
17 lines

Diff 29158

lldb/trunk/source/Core/ArchSpec.cpp

Show First 20 Lines • Show All 881 Lines • ▼ Show 20 Lines if (arch_def)
default: default:
m_triple.setOS (llvm::Triple::MacOSX); m_triple.setOS (llvm::Triple::MacOSX);
break; break;
} }
} }
else if (arch_type == eArchTypeELF) else if (arch_type == eArchTypeELF)
{ {
llvm::Triple::OSType ostype;
switch (os) switch (os)
{ {
case llvm::ELF::ELFOSABI_AIX: ostype = llvm::Triple::OSType::AIX; break; case llvm::ELF::ELFOSABI_AIX: m_triple.setOS (llvm::Triple::OSType::AIX); break;
case llvm::ELF::ELFOSABI_FREEBSD: ostype = llvm::Triple::OSType::FreeBSD; break; case llvm::ELF::ELFOSABI_FREEBSD: m_triple.setOS (llvm::Triple::OSType::FreeBSD); break;
case llvm::ELF::ELFOSABI_GNU: ostype = llvm::Triple::OSType::Linux; break; case llvm::ELF::ELFOSABI_GNU: m_triple.setOS (llvm::Triple::OSType::Linux); break;
case llvm::ELF::ELFOSABI_NETBSD: ostype = llvm::Triple::OSType::NetBSD; break; case llvm::ELF::ELFOSABI_NETBSD: m_triple.setOS (llvm::Triple::OSType::NetBSD); break;
case llvm::ELF::ELFOSABI_OPENBSD: ostype = llvm::Triple::OSType::OpenBSD; break; case llvm::ELF::ELFOSABI_OPENBSD: m_triple.setOS (llvm::Triple::OSType::OpenBSD); break;
case llvm::ELF::ELFOSABI_SOLARIS: ostype = llvm::Triple::OSType::Solaris; break; case llvm::ELF::ELFOSABI_SOLARIS: m_triple.setOS (llvm::Triple::OSType::Solaris); break;
default:
ostype = llvm::Triple::OSType::UnknownOS;
} }
m_triple.setOS (ostype);
m_triple.setVendor (llvm::Triple::UnknownVendor);
} }
// Fall back onto setting the machine type if the arch by name failed... // Fall back onto setting the machine type if the arch by name failed...
if (m_triple.getArch () == llvm::Triple::UnknownArch) if (m_triple.getArch () == llvm::Triple::UnknownArch)
m_triple.setArch (core_def->machine); m_triple.setArch (core_def->machine);
} }
} }
} }
CoreUpdated(update_triple); CoreUpdated(update_triple);
▲ Show 20 Lines • Show All 427 Lines • Show Last 20 Lines