From 6f8eacfafce4e342fd0ca8e20172c767a3faadaa Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Tue, 15 Jan 2019 18:24:03 +0000 Subject: [Solaris] Move enabling IAS for SPARC from the Solaris toolchain to Generic_GCC. llvm-svn: 351217 --- clang/lib/Driver/ToolChains/Gnu.cpp | 6 ++++++ clang/lib/Driver/ToolChains/Solaris.h | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'clang/lib/Driver/ToolChains') diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 935071f8911..75a0bfb8dac 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2475,6 +2475,12 @@ bool Generic_GCC::IsIntegratedAssemblerDefault() const { case llvm::Triple::mips64: case llvm::Triple::mips64el: return true; + case llvm::Triple::sparc: + case llvm::Triple::sparcel: + case llvm::Triple::sparcv9: + if (getTriple().isOSSolaris()) + return true; + return false; default: return false; } diff --git a/clang/lib/Driver/ToolChains/Solaris.h b/clang/lib/Driver/ToolChains/Solaris.h index 9e14269b393..4d9c828b5c6 100644 --- a/clang/lib/Driver/ToolChains/Solaris.h +++ b/clang/lib/Driver/ToolChains/Solaris.h @@ -55,8 +55,6 @@ public: Solaris(const Driver &D, const llvm::Triple &Triple, const llvm::opt::ArgList &Args); - bool IsIntegratedAssemblerDefault() const override { return true; } - void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; -- cgit v1.2.3