aboutsummaryrefslogtreecommitdiff
path: root/clang
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2014-08-04 19:58:38 +0000
committerBill Wendling <isanbard@gmail.com>2014-08-04 19:58:38 +0000
commit569deba64089c8fcdbaa044014aa5224153ca9af (patch)
treeada01107d0105ec1babb0016acf18cd87b190cdd /clang
parent2c74c29d92dbb0d10bd4093aa81e29431d7661c3 (diff)
downloadllvm-569deba64089c8fcdbaa044014aa5224153ca9af.zip
llvm-569deba64089c8fcdbaa044014aa5224153ca9af.tar.gz
llvm-569deba64089c8fcdbaa044014aa5224153ca9af.tar.bz2
Merging r214060:
------------------------------------------------------------------------ r214060 | brad | 2014-07-27 18:57:32 -0700 (Sun, 27 Jul 2014) | 2 lines Add missing override keyword to OpenBSD IsIntegratedAssemblerDefault(). ------------------------------------------------------------------------ llvm-svn: 214765
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Driver/ToolChains.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains.h b/clang/lib/Driver/ToolChains.h
index 73d6959..b6c2cb8 100644
--- a/clang/lib/Driver/ToolChains.h
+++ b/clang/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)