Add clang -cc1 parsing for LangOptions.

 - This is the last major parsing piece, main FIXMEs remain.

llvm-svn: 90059

1 files changed, 1 insertions, 9 deletions

diff --git a/clang/tools/clang-cc/Options.cpp b/clang/tools/clang-cc/Options.cpp
index 36231f5c75e..2bcad53a3f2 100644
--- a/clang/tools/clang-cc/Options.cpp
+++ b/clang/tools/clang-cc/Options.cpp
@@ -1122,13 +1122,6 @@ void clang::InitializeLangOptions(LangOptions &Options,
   if (Trigraphs.getPosition())
     Options.Trigraphs = Trigraphs;  // Command line option wins if specified.
 
-  // If in a conformant language mode (e.g. -std=c99) Blocks defaults to off
-  // even if they are normally on for the target.  In GNU modes (e.g.
-  // -std=gnu99) the default for blocks depends on the target settings.
-  // However, blocks are not turned off when compiling Obj-C or Obj-C++ code.
-  if (!Options.ObjC1 && !Options.GNUMode)
-    Options.Blocks = 0;
-
   // Default to not accepting '$' in identifiers when preprocessing assembler.
   Options.DollarIdents = !Options.AsmPreprocessor;
   if (DollarsInIdents.getPosition())  // Explicit setting overrides default.
@@ -1143,8 +1136,7 @@ void clang::InitializeLangOptions(LangOptions &Options,
       Options.LaxVectorConversions = 0;
   Options.Exceptions = Exceptions;
   Options.Rtti = !NoRtti;
-  if (EnableBlocks.getPosition())
-    Options.Blocks = EnableBlocks;
+  Options.Blocks = EnableBlocks;
   Options.CharIsSigned = !NoSignedChar;
   if (ShortWChar.getPosition())
     Options.ShortWChar = ShortWChar;