From: Bill Wendling <isanbard@gmail.com>
Date: Mon, 4 Aug 2014 19:58:38 +0000 (+0000)
Subject: Merging r214060:
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a568aaa31f144890b787f6ff03f36bf4874b4489;p=clang

Merging r214060:
------------------------------------------------------------------------
r214060 | brad | 2014-07-27 18:57:32 -0700 (Sun, 27 Jul 2014) | 2 lines

Add missing override keyword to OpenBSD IsIntegratedAssemblerDefault().

------------------------------------------------------------------------


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

diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
index 73d6959371..b6c2cb81e4 100644
--- a/lib/Driver/ToolChains.h
+++ b/lib/Driver/ToolChains.h
@@ -542,7 +542,7 @@ public:
     return 2;
   }
 
-  virtual bool IsIntegratedAssemblerDefault() const {
+  virtual bool IsIntegratedAssemblerDefault() const override {
     if (getTriple().getArch() == llvm::Triple::ppc ||
         getTriple().getArch() == llvm::Triple::sparc ||
         getTriple().getArch() == llvm::Triple::sparcv9)