RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

Fix llvm-mc target detection code to match llc.

Browse Source 
llvm-svn: 136115
This commit is contained in:
Evan Cheng 2011-07-26 19:02:16 +00:00
parent 0219419a01
commit 52a35d33ff
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/llvm-mc/llvm-mc.cpp
View File

@ -170,21 +170,42 @@ static const Target *GetTarget(const char *ProgName) {
// Figure out the target triple. // Figure out the target triple.
if (TripleName.empty()) if (TripleName.empty())
TripleName = sys::getHostTriple(); TripleName = sys::getHostTriple();
Triple TheTriple(Triple::normalize(TripleName));
const Target *TheTarget = 0;
if (!ArchName.empty()) { if (!ArchName.empty()) {
llvm::Triple TT(TripleName); for (TargetRegistry::iterator it = TargetRegistry::begin(),
TT.setArchName(ArchName); ie = TargetRegistry::end(); it != ie; ++it) {
TripleName = TT.str(); if (ArchName == it->getName()) {
TheTarget = &*it;
break;
}
}
if (!TheTarget) {
errs() << ProgName << ": error: invalid target '" << ArchName << "'.\n";
return 0;
}
// Adjust the triple to match (if known), otherwise stick with the
// module/host triple.
Triple::ArchType Type = Triple::getArchTypeForLLVMName(ArchName);
if (Type != Triple::UnknownArch)
TheTriple.setArch(Type);
} else {
// Get the target specific parser.
std::string Error;
TheTarget = TargetRegistry::lookupTarget(TheTriple.getTriple(), Error);
if (TheTarget == 0) {
errs() << ProgName << ": error: unable to get target for '"
<< TheTriple.getTriple()
<< "', see --version and --triple.\n";
return 0;
}
} }
// Get the target specific parser. TripleName = TheTriple.getTriple();
std::string Error; return TheTarget;
const Target *TheTarget = TargetRegistry::lookupTarget(TripleName, Error);
if (TheTarget)
return TheTarget;
errs() << ProgName << ": error: unable to get target for '" << TripleName
<< "', see --version and --triple.\n";
return 0;
} }
static tool_output_file *GetOutputStream() { static tool_output_file *GetOutputStream() {