From bcedae48bd45042c428ffbda28a8a2786680886d Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Sun, 24 Nov 2013 23:28:23 +0000 Subject: [PATCH] Remove the Darwin_Generic_GCC toolchain. This is currently unused by any test. The code path would still be hit by clang on ppc, but * PPC has not been supported on current versions of OS X * A port of current clang to older OS X on ppc should be using toolchains::DarwinClang. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@195585 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Driver.cpp | 8 +------- lib/Driver/ToolChains.cpp | 6 ------ lib/Driver/ToolChains.h | 13 ------------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 530791072f..8cfaa6c44b 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1926,13 +1926,7 @@ const ToolChain &Driver::getToolChain(const ArgList &Args, case llvm::Triple::Darwin: case llvm::Triple::MacOSX: case llvm::Triple::IOS: - if (Target.getArch() == llvm::Triple::x86 || - Target.getArch() == llvm::Triple::x86_64 || - Target.getArch() == llvm::Triple::arm || - Target.getArch() == llvm::Triple::thumb) - TC = new toolchains::DarwinClang(*this, Target, Args); - else - TC = new toolchains::Darwin_Generic_GCC(*this, Target, Args); + TC = new toolchains::DarwinClang(*this, Target, Args); break; case llvm::Triple::DragonFly: TC = new toolchains::DragonFly(*this, Target, Args); diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 8888ba138d..5f0b167f29 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -921,12 +921,6 @@ void Darwin::CheckObjCARC() const { getDriver().Diag(diag::err_arc_unsupported_on_toolchain); } -std::string -Darwin_Generic_GCC::ComputeEffectiveClangTriple(const ArgList &Args, - types::ID InputType) const { - return ComputeLLVMTriple(Args, InputType); -} - /// Generic_GCC - A tool chain using the 'gcc' command to perform /// all subcommands; this relies on gcc translating the majority of /// command line options. diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index 50d370003b..60fb75d9a8 100644 --- a/lib/Driver/ToolChains.h +++ b/lib/Driver/ToolChains.h @@ -407,19 +407,6 @@ public: /// } }; -/// Darwin_Generic_GCC - Generic Darwin tool chain using gcc. -class LLVM_LIBRARY_VISIBILITY Darwin_Generic_GCC : public Generic_GCC { -public: - Darwin_Generic_GCC(const Driver &D, const llvm::Triple &Triple, - const llvm::opt::ArgList &Args) - : Generic_GCC(D, Triple, Args) {} - - std::string ComputeEffectiveClangTriple(const llvm::opt::ArgList &Args, - types::ID InputType) const; - - virtual bool isPICDefault() const { return false; } -}; - class LLVM_LIBRARY_VISIBILITY Generic_ELF : public Generic_GCC { virtual void anchor(); public: -- 2.40.0