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 73d6959371133556315617290b944b8912f5b1de..b6c2cb81e4088ea39e353daaf7a088b6dba8d43d 100644 (file)
--- 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)