From: Dylan McKay <me@dylanmckay.io>
Date: Sat, 18 Feb 2017 02:42:36 +0000 (+0000)
Subject: [AVR] Move definition of IsIntegratedAssemblerDefault
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7202773fc4196740561a47eca27671bbfe260b81;p=clang

[AVR] Move definition of IsIntegratedAssemblerDefault

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@295536 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 8eae5ba298..533206e406 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -2922,6 +2922,7 @@ bool Generic_GCC::IsIntegratedAssemblerDefault() const {
   case llvm::Triple::aarch64_be:
   case llvm::Triple::arm:
   case llvm::Triple::armeb:
+  case llvm::Triple::avr:
   case llvm::Triple::bpfel:
   case llvm::Triple::bpfeb:
   case llvm::Triple::thumb:
diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
index 3240357ba6..8646efbf38 100644
--- a/lib/Driver/ToolChains.h
+++ b/lib/Driver/ToolChains.h
@@ -1377,7 +1377,6 @@ protected:
 public:
   AVRToolChain(const Driver &D, const llvm::Triple &Triple,
                const llvm::opt::ArgList &Args);
-  bool IsIntegratedAssemblerDefault() const override { return true; }
 };