diff options
author | Bill Wendling <isanbard@gmail.com> | 2014-08-04 19:58:38 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2014-08-04 19:58:38 +0000 |
commit | a568aaa31f144890b787f6ff03f36bf4874b4489 (patch) | |
tree | 36d2b9a1581d57d9f5d3130715b9bfd841ea2041 | |
parent | 4c14469fb9fd26452210c41868dd00adb3265421 (diff) |
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
-rw-r--r-- | lib/Driver/ToolChains.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |