instead of forcing blocks on by default, make them default to off, but let

specific targets default them to on.  Default blocks to on on 10.6 and later.
Add a -fblocks option that allows the user to override the target's default.
Use -fblocks in the various testcases that use blocks.

llvm-svn: 60563

14 files changed, 14 insertions, 14 deletions

diff --git a/clang/test/Analysis/misc-ps.m b/clang/test/Analysis/misc-ps.m
index 8fb825218dd..0069af89433 100644
--- a/clang/test/Analysis/misc-ps.m
+++ b/clang/test/Analysis/misc-ps.m
@@ -1,4 +1,4 @@
-// RUN: clang -checker-cfref --verify %s
+// RUN: clang -checker-cfref --verify -fblocks %s
 
 // Reduced test case from crash in <rdar://problem/6253157>
 @class NSObject;
diff --git a/clang/test/Parser/block-pointer-decl.c b/clang/test/Parser/block-pointer-decl.c
index a9da3256a94..9920f5f68b3 100644
--- a/clang/test/Parser/block-pointer-decl.c
+++ b/clang/test/Parser/block-pointer-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -parse-noop %s
+// RUN: clang -fsyntax-only -verify -parse-noop -fblocks %s
 
 struct blockStruct {
   int (^a)(float, int);
diff --git a/clang/test/Rewriter/block-test.c b/clang/test/Rewriter/block-test.c
index 82b63a09f9d..c65815ff9a5 100644
--- a/clang/test/Rewriter/block-test.c
+++ b/clang/test/Rewriter/block-test.c
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-blocks %s -o -
+// RUN: clang -rewrite-blocks %s -fblocks -o -
 
 static int (^block)(const void *, const void *) = (int (^)(const void *, const void *))0;
 static int (*func)(int (^block)(void *, void *)) = (int (*)(int (^block)(void *, void *)))0;
diff --git a/clang/test/Sema/block-args.c b/clang/test/Sema/block-args.c
index 42e2859c975..d518fef0442 100644
--- a/clang/test/Sema/block-args.c
+++ b/clang/test/Sema/block-args.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang %s -fsyntax-only -verify -fblocks
 
 void take(void*);
 
diff --git a/clang/test/Sema/block-as-object.m b/clang/test/Sema/block-as-object.m
index 8afab4c3f7d..28f8d775d0c 100644
--- a/clang/test/Sema/block-as-object.m
+++ b/clang/test/Sema/block-as-object.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang %s -fsyntax-only -verify -fblocks
 
 @interface Whatever
 - copy;
diff --git a/clang/test/Sema/block-byref-args.c b/clang/test/Sema/block-byref-args.c
index 9b568f05842..29f5a3aeeb9 100644
--- a/clang/test/Sema/block-byref-args.c
+++ b/clang/test/Sema/block-byref-args.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang %s -fsyntax-only -verify -fblocks
 
 #include <stdio.h>
 
diff --git a/clang/test/Sema/block-call.c b/clang/test/Sema/block-call.c
index 871dbf792bc..66bf725922a 100644
--- a/clang/test/Sema/block-call.c
+++ b/clang/test/Sema/block-call.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang -fsyntax-only -verify %s -fblocks
 
 int (*FP)();
 int (^IFP) ();
diff --git a/clang/test/Sema/block-literal.c b/clang/test/Sema/block-literal.c
index 6cca26999de..d5d41abb6cb 100644
--- a/clang/test/Sema/block-literal.c
+++ b/clang/test/Sema/block-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang -fsyntax-only %s -verify -fblocks
 
 void I( void (^)(void));
 void (^noop)(void);
diff --git a/clang/test/Sema/block-misc.c b/clang/test/Sema/block-misc.c
index c4d0c2dbf84..5509867c30a 100644
--- a/clang/test/Sema/block-misc.c
+++ b/clang/test/Sema/block-misc.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang -fsyntax-only -verify %s -fblocks
 void donotwarn();
 
 int (^IFP) ();
diff --git a/clang/test/Sema/block-return.c b/clang/test/Sema/block-return.c
index b88fb9b5be0..e835c963172 100644
--- a/clang/test/Sema/block-return.c
+++ b/clang/test/Sema/block-return.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang -fsyntax-only %s -verify -fblocks
 
 typedef void (^CL)(void);
 
diff --git a/clang/test/Sema/block-storageclass.c b/clang/test/Sema/block-storageclass.c
index 662bd738c83..0ae723d44cf 100644
--- a/clang/test/Sema/block-storageclass.c
+++ b/clang/test/Sema/block-storageclass.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang %s -fsyntax-only -verify -fblocks
 
 #include <stdio.h>
 void _Block_byref_release(void*src){}
diff --git a/clang/test/SemaCXX/blocks.cpp b/clang/test/SemaCXX/blocks.cpp
index c273a1626ad..8b4b3aeb88c 100644
--- a/clang/test/SemaCXX/blocks.cpp
+++ b/clang/test/SemaCXX/blocks.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang -fsyntax-only -verify %s -fblocks
 
 void tovoid(void*);
 
diff --git a/clang/test/SemaObjC/block-ivar.m b/clang/test/SemaObjC/block-ivar.m
index d1f56b651d3..422018359a8 100644
--- a/clang/test/SemaObjC/block-ivar.m
+++ b/clang/test/SemaObjC/block-ivar.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang -fsyntax-only -verify %s -fblocks
 
 @interface NSObject {
   struct objc_object *isa;
diff --git a/clang/test/SemaObjC/property-10.m b/clang/test/SemaObjC/property-10.m
index 2de5205a1fd..866fd37490e 100644
--- a/clang/test/SemaObjC/property-10.m
+++ b/clang/test/SemaObjC/property-10.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang -fsyntax-only -verify %s  -fblocks
 
 // Check property attribute consistency.