Use the updated CommandLine api for -fno-blocks.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63563 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index fe5e7f8..c6fee1f 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -490,14 +490,15 @@
llvm::cl::desc("Disallow implicit conversions between "
"vectors with a different number of "
"elements or different element types"));
-static llvm::cl::opt<bool>
-EnableBlocks("fblocks", llvm::cl::desc("enable the 'blocks' language feature"), llvm::cl::ValueDisallowed);
-
-static llvm::cl::inverse_opt
-DisableBlocks("fno-blocks", llvm::cl::opposite_of(EnableBlocks), llvm::cl::ValueDisallowed);
static llvm::cl::opt<bool>
-ObjCNonFragileABI("fobjc-nonfragile-abi", llvm::cl::desc("enable objective-c's nonfragile abi"));
+EnableBlocks("fblocks", llvm::cl::desc("enable the 'blocks' language feature"),
+ llvm::cl::ValueDisallowed, llvm::cl::AllowInverse,
+ llvm::cl::ZeroOrMore);
+
+static llvm::cl::opt<bool>
+ObjCNonFragileABI("fobjc-nonfragile-abi",
+ llvm::cl::desc("enable objective-c's nonfragile abi"));
// FIXME: This (and all GCC -f options) really come in -f... and
@@ -623,7 +624,7 @@
if (NoLaxVectorConversions.getPosition())
Options.LaxVectorConversions = 0;
Options.Exceptions = Exceptions;
- if (EnableBlocks.getPosition() || DisableBlocks.getPosition())
+ if (EnableBlocks.getPosition())
Options.Blocks = EnableBlocks;
// Override the default runtime if the user requested it.