maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Centralize the logic for using the integrated assembler. 

llvm-svn: 177360
This commit is contained in:
Rafael Espindola 2013-03-18 23:56:07 +00:00
parent 014349cc8c
commit 0add40ed7d
3 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Driver/ToolChain.cpp
View File

@ -76,6 +76,8 @@ Tool &ToolChain::SelectTool(const JobAction &JA) const {
if (getDriver().ShouldUseClangCompiler(JA))
T = new tools::Clang(*this);
else if (Key == Action::AssembleJobClass && useIntegratedAs())
T = new tools::ClangAs(*this);
else
T = constructTool(Key);

46
clang/lib/Driver/ToolChains.cpp
View File

@ -183,13 +183,8 @@ Tool *Darwin::constructTool(Action::ActionClass AC) const {
case Action::PrecompileJobClass:
case Action::CompileJobClass:
return new tools::Clang(*this);
case Action::AssembleJobClass: {
if (useIntegratedAs())
return new tools::ClangAs(*this);
else
return new tools::darwin::Assemble(*this);
break;
}
case Action::AssembleJobClass:
return new tools::darwin::Assemble(*this);
case Action::LinkJobClass:
return new tools::darwin::Link(*this);
case Action::LipoJobClass:
@ -1663,13 +1658,8 @@ OpenBSD::OpenBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Arg
Tool *OpenBSD::constructTool(Action::ActionClass AC) const {
switch (AC) {
case Action::AssembleJobClass: {
if (useIntegratedAs())
return new tools::ClangAs(*this);
else
return new tools::openbsd::Assemble(*this);
break;
}
case Action::AssembleJobClass:
return new tools::openbsd::Assemble(*this);
case Action::LinkJobClass:
return new tools::openbsd::Link(*this);
default:
@ -1687,13 +1677,8 @@ Bitrig::Bitrig(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)
Tool *Bitrig::constructTool(Action::ActionClass AC) const {
switch (AC) {
case Action::AssembleJobClass: {
if (useIntegratedAs())
return new tools::ClangAs(*this);
else
return new tools::bitrig::Assemble(*this);
break;
}
case Action::AssembleJobClass:
return new tools::bitrig::Assemble(*this);
case Action::LinkJobClass:
return new tools::bitrig::Link(*this); break;
default:
@ -1764,11 +1749,7 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Arg
Tool *FreeBSD::constructTool(Action::ActionClass AC) const {
switch (AC) {
case Action::AssembleJobClass:
if (useIntegratedAs())
return new tools::ClangAs(*this);
else
return new tools::freebsd::Assemble(*this);
break;
return new tools::freebsd::Assemble(*this);
case Action::LinkJobClass:
return new tools::freebsd::Link(*this); break;
default:
@ -1810,14 +1791,9 @@ NetBSD::NetBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)
Tool *NetBSD::constructTool(Action::ActionClass AC) const {
switch (AC) {
case Action::AssembleJobClass:
if (useIntegratedAs())
return new tools::ClangAs(*this);
else
return new tools::netbsd::Assemble(*this);
break;
return new tools::netbsd::Assemble(*this);
case Action::LinkJobClass:
return new tools::netbsd::Link(*this);
break;
default:
return Generic_GCC::constructTool(AC);
}
@ -2265,11 +2241,7 @@ bool Linux::HasNativeLLVMSupport() const {
Tool *Linux::constructTool(Action::ActionClass AC) const {
switch (AC) {
case Action::AssembleJobClass:
if (useIntegratedAs())
return new tools::ClangAs(*this);
else
return new tools::linuxtools::Assemble(*this);
break;
return new tools::linuxtools::Assemble(*this);
case Action::LinkJobClass:
return new tools::linuxtools::Link(*this); break;
default:

6
clang/lib/Driver/WindowsToolChain.cpp
View File

@ -50,11 +50,9 @@ Tool *Windows::constructTool(Action::ActionClass AC) const {
case Action::CompileJobClass:
return new tools::Clang(*this);
case Action::AssembleJobClass:
if (!useIntegratedAs() &&
getTriple().getEnvironment() == llvm::Triple::MachO)
if (getTriple().getEnvironment() == llvm::Triple::MachO)
return new tools::darwin::Assemble(*this);
else
return new tools::ClangAs(*this);
llvm_unreachable("We only have the integrated assembler on this TC");
break;
case Action::LinkJobClass:
return new tools::visualstudio::Link(*this);