diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2814,6 +2814,7 @@ case llvm::Triple::bpfel: case llvm::Triple::bpfeb: case llvm::Triple::csky: + case llvm::Triple::hexagon: case llvm::Triple::thumb: case llvm::Triple::thumbeb: case llvm::Triple::ppc: @@ -2832,6 +2833,7 @@ case llvm::Triple::mips64el: case llvm::Triple::msp430: case llvm::Triple::m68k: + case llvm::Triple::ve: return true; default: return false; diff --git a/clang/lib/Driver/ToolChains/Hexagon.h b/clang/lib/Driver/ToolChains/Hexagon.h --- a/clang/lib/Driver/ToolChains/Hexagon.h +++ b/clang/lib/Driver/ToolChains/Hexagon.h @@ -94,9 +94,6 @@ llvm::opt::ArgStringList &CmdArgs) const override; StringRef GetGCCLibAndIncVersion() const { return GCCLibAndIncVersion.Text; } - bool IsIntegratedAssemblerDefault() const override { - return true; - } std::string getHexagonTargetDir( const std::string &InstalledDir, diff --git a/clang/lib/Driver/ToolChains/VEToolchain.h b/clang/lib/Driver/ToolChains/VEToolchain.h --- a/clang/lib/Driver/ToolChains/VEToolchain.h +++ b/clang/lib/Driver/ToolChains/VEToolchain.h @@ -26,7 +26,6 @@ Tool *buildLinker() const override; public: - bool IsIntegratedAssemblerDefault() const override { return true; } bool isPICDefault() const override; bool isPIEDefault(const llvm::opt::ArgList &Args) const override; bool isPICDefaultForced() const override;