diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-06-29 16:00:11 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-06-29 16:00:11 +0000 |
commit | 557fb62e800631fe93137c42530a164cfebfab7c (patch) | |
tree | a58a8cc5c356d91fa33199180d5337a4487af533 /clang/lib/Driver/ToolChains.cpp | |
parent | 6189422f08aeef2ac0958cd9533b8d6bc4352d7e (diff) | |
download | bcm5719-llvm-557fb62e800631fe93137c42530a164cfebfab7c.tar.gz bcm5719-llvm-557fb62e800631fe93137c42530a164cfebfab7c.zip |
Revert r211866, r211895 and r211995, "Driver: use GNU::Link for the Generic_GCC toolchain". It broke users of Generic_GCC, cygwin and mingw32.
It reverts commits as follows:
r211866: "Driver: use GNU::Link for the Generic_GCC toolchain"
r211895: "Replace GetProgramPath("ld") with GetLinkerPath()."
r211995: "Driver: add a cygwin linker tool"
llvm-svn: 211998
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
-rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 4efc9a10782..d02c84d315b 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -2102,7 +2102,7 @@ Tool *Generic_GCC::buildAssembler() const { } Tool *Generic_GCC::buildLinker() const { - return new tools::gnutools::Link(*this); + return new tools::gcc::Link(*this); } void Generic_GCC::printVerboseInfo(raw_ostream &OS) const { @@ -3476,17 +3476,6 @@ Tool *DragonFly::buildLinker() const { return new tools::dragonfly::Link(*this); } -/// Cygwin toolchain -Cygwin::Cygwin(const Driver &D, const llvm::Triple &Triple, - const llvm::opt::ArgList &Args) - : Generic_GCC(D, Triple, Args) { - ToolChain::path_list &LibPaths = getFilePaths(); - LibPaths.push_back("/usr/lib"); -} - -Tool *Cygwin::buildLinker() const { - return new tools::cygwin::Link(*this); -} /// XCore tool chain XCore::XCore(const Driver &D, const llvm::Triple &Triple, |