summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Smith <brad@comstyle.com>2019-01-15 18:24:03 +0000
committerBrad Smith <brad@comstyle.com>2019-01-15 18:24:03 +0000
commit7e2096bc31de2f2651f6f17799fa264e5d3943bd (patch)
tree5648a09d960da21d82ffe95898b402bc81c0e938
parent16fcf99610f36c7c11d20097c070a93b648e19c9 (diff)
[Solaris] Move enabling IAS for SPARC from the Solaris toolchain to Generic_GCC.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@351217 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Driver/ToolChains/Gnu.cpp6
-rw-r--r--lib/Driver/ToolChains/Solaris.h2
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index 935071f891..75a0bfb8da 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/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/lib/Driver/ToolChains/Solaris.h b/lib/Driver/ToolChains/Solaris.h
index 9e14269b39..4d9c828b5c 100644
--- a/lib/Driver/ToolChains/Solaris.h
+++ b/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;