Disable blocks support in C++ mode.

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

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 8e5bca22f81b2f5562f30c354707e1f7acf207a4..f415de11ceb39e42c2ee71958a258097e79afe62 100644 (file)
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -487,6 +487,9 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK,
   } else {
     Options.NeXTRuntime = Target->useNeXTRuntimeAsDefault();
   }
+
+  if (Options.CPlusPlus)
+    Options.Blocks = 0;   
 }
 
 static llvm::cl::opt<bool>