Fold -fobjc-nonfragile-abi2 into -fobjc-nonfragile-abi.

// rdar://8818375

llvm-svn: 122831

19 files changed, 22 insertions, 22 deletions

diff --git a/clang/test/Analysis/unused-ivars.m b/clang/test/Analysis/unused-ivars.m
index c88d14880bd..20531efaad6 100644
--- a/clang/test/Analysis/unused-ivars.m
+++ b/clang/test/Analysis/unused-ivars.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fobjc-nonfragile-abi2 -fblocks -analyze -analyzer-check-objc-unused-ivars %s -verify
+// RUN: %clang_cc1 -fobjc-nonfragile-abi -fblocks -analyze -analyzer-check-objc-unused-ivars %s -verify
 
 //===--- BEGIN: Delta-debugging reduced headers. --------------------------===//
 
diff --git a/clang/test/CodeGenObjC/debug-info-default-synth-ivar.m b/clang/test/CodeGenObjC/debug-info-default-synth-ivar.m
index a74ee341688..967a361d6c4 100644
--- a/clang/test/CodeGenObjC/debug-info-default-synth-ivar.m
+++ b/clang/test/CodeGenObjC/debug-info-default-synth-ivar.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -emit-llvm -g %s -o %t 
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -emit-llvm -g %s -o %t 
 // RUN: grep DW_TAG_member %t | count 5
 // rdar://8493239
 
diff --git a/clang/test/CodeGenObjC/debug-info-getter-name.m b/clang/test/CodeGenObjC/debug-info-getter-name.m
index 05619aeccd2..0263f112aeb 100644
--- a/clang/test/CodeGenObjC/debug-info-getter-name.m
+++ b/clang/test/CodeGenObjC/debug-info-getter-name.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -S -g %s -o %t
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -S -g %s -o %t
 // RUN: grep "\[InstanceVariablesEverywhereButTheInterface someString\]" %t | count 6
 
 //rdar: //8498026
diff --git a/clang/test/CodeGenObjC/default-property-synthesis.m b/clang/test/CodeGenObjC/default-property-synthesis.m
index b3eeb22004a..72acb768a11 100644
--- a/clang/test/CodeGenObjC/default-property-synthesis.m
+++ b/clang/test/CodeGenObjC/default-property-synthesis.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -emit-llvm -o %t %s
 // rdar://7923851.
 
 // Superclass declares property. Subclass redeclares the same property.
diff --git a/clang/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m b/clang/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m
index b474caa7a48..012ccadd9f9 100644
--- a/clang/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m
+++ b/clang/test/CodeGenObjC/ivar-layout-nonfragile-abi2.m
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
-// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -emit-llvm -o %t %s
+// RUN: %clang_cc1 -x objective-c++ -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -emit-llvm -o %t %s
 // rdar: // 7824380
 
 @interface Super {
diff --git a/clang/test/CodeGenObjC/objc2-nonfragile-abi-impl.m b/clang/test/CodeGenObjC/objc2-nonfragile-abi-impl.m
index ff943303b74..cb830b8dcc9 100644
--- a/clang/test/CodeGenObjC/objc2-nonfragile-abi-impl.m
+++ b/clang/test/CodeGenObjC/objc2-nonfragile-abi-impl.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi2 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -emit-llvm -o %t %s
 // rdar://7547942.
 
 @interface Base @end
diff --git a/clang/test/Index/complete-synthesized.m b/clang/test/Index/complete-synthesized.m
index 2c26d36a344..1a4858449f4 100644
--- a/clang/test/Index/complete-synthesized.m
+++ b/clang/test/Index/complete-synthesized.m
@@ -35,20 +35,20 @@
 }
 @end
 
-// RUN: c-index-test -code-completion-at=%s:24:1 -Xclang -fobjc-nonfragile-abi2 %s | FileCheck -check-prefix=CHECK-CC1 %s
+// RUN: c-index-test -code-completion-at=%s:24:1 -Xclang -fobjc-nonfragile-abi %s | FileCheck -check-prefix=CHECK-CC1 %s
 // CHECK-CC1: NotImplemented:{TypedText _Bool} (50)
 // CHECK-CC1: ObjCIvarDecl:{ResultType float}{TypedText _prop2} (35)
 // CHECK-CC1-NOT: prop2
 // CHECK-CC1: ObjCPropertyDecl:{ResultType short}{TypedText prop3} (35)
 // CHECK-CC1: ObjCPropertyDecl:{ResultType double}{TypedText prop4} (35)
 
-// RUN: c-index-test -code-completion-at=%s:30:2 -Xclang -fobjc-nonfragile-abi2 %s | FileCheck -check-prefix=CHECK-CC2 %s
+// RUN: c-index-test -code-completion-at=%s:30:2 -Xclang -fobjc-nonfragile-abi %s | FileCheck -check-prefix=CHECK-CC2 %s
 // CHECK-CC2: NotImplemented:{TypedText _Bool} (50)
 // CHECK-CC2: ObjCIvarDecl:{ResultType float}{TypedText _prop2} (35)
 // CHECK-CC2-NOT: prop3
 // CHECK-CC2: ObjCPropertyDecl:{ResultType double}{TypedText prop4} (35)
 
-// RUN: c-index-test -code-completion-at=%s:34:2 -Xclang -fobjc-nonfragile-abi2 %s | FileCheck -check-prefix=CHECK-CC3 %s
+// RUN: c-index-test -code-completion-at=%s:34:2 -Xclang -fobjc-nonfragile-abi %s | FileCheck -check-prefix=CHECK-CC3 %s
 // CHECK-CC3: NotImplemented:{TypedText _Bool} (50)
 // CHECK-CC3: ObjCIvarDecl:{ResultType float}{TypedText _prop2} (35)
 // CHECK-CC3: ObjCPropertyDecl:{ResultType double}{TypedText prop4}
diff --git a/clang/test/SemaObjC/default-synthesize-1.m b/clang/test/SemaObjC/default-synthesize-1.m
index c364c41fc78..a55834dd301 100644
--- a/clang/test/SemaObjC/default-synthesize-1.m
+++ b/clang/test/SemaObjC/default-synthesize-1.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
 
 @interface NSObject 
 - (void) release;
diff --git a/clang/test/SemaObjC/default-synthesize.m b/clang/test/SemaObjC/default-synthesize.m
index 1477478dfb8..33e3bd6f346 100644
--- a/clang/test/SemaObjC/default-synthesize.m
+++ b/clang/test/SemaObjC/default-synthesize.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
 
 @interface NSString @end
 
diff --git a/clang/test/SemaObjC/direct-synthesized-ivar-access.m b/clang/test/SemaObjC/direct-synthesized-ivar-access.m
index 4dedafc29ed..a72fb5f19c7 100644
--- a/clang/test/SemaObjC/direct-synthesized-ivar-access.m
+++ b/clang/test/SemaObjC/direct-synthesized-ivar-access.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -Wnonfragile-abi2 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -Wnonfragile-abi2 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
 // rdar://8673791
 
 @interface I {
diff --git a/clang/test/SemaObjC/duplicate-ivar-in-class-extension.m b/clang/test/SemaObjC/duplicate-ivar-in-class-extension.m
index b66736f330f..0507b352f60 100644
--- a/clang/test/SemaObjC/duplicate-ivar-in-class-extension.m
+++ b/clang/test/SemaObjC/duplicate-ivar-in-class-extension.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
 
 @interface Root @end
 
diff --git a/clang/test/SemaObjC/ivar-in-class-extension.m b/clang/test/SemaObjC/ivar-in-class-extension.m
index 4130d8f9625..b5772f6a4ca 100644
--- a/clang/test/SemaObjC/ivar-in-class-extension.m
+++ b/clang/test/SemaObjC/ivar-in-class-extension.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
 
 @interface SomeClass  @end
 
diff --git a/clang/test/SemaObjC/ivar-in-implementations.m b/clang/test/SemaObjC/ivar-in-implementations.m
index 4060526b44d..74db3224007 100644
--- a/clang/test/SemaObjC/ivar-in-implementations.m
+++ b/clang/test/SemaObjC/ivar-in-implementations.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
 
 @interface Super @end
 
diff --git a/clang/test/SemaObjC/property-and-class-extension.m b/clang/test/SemaObjC/property-and-class-extension.m
index 51bf8de77e2..926538af61c 100644
--- a/clang/test/SemaObjC/property-and-class-extension.m
+++ b/clang/test/SemaObjC/property-and-class-extension.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
 
 /**
 When processing @synthesize, treat ivars in a class extension the same as ivars in the class @interface, 
diff --git a/clang/test/SemaObjC/property-and-ivar-use.m b/clang/test/SemaObjC/property-and-ivar-use.m
index b9235c1dd3d..70e55346990 100644
--- a/clang/test/SemaObjC/property-and-ivar-use.m
+++ b/clang/test/SemaObjC/property-and-ivar-use.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -verify %s
 // Do not issue error if 'ivar' used previously belongs to the inherited class
 // and has same name as @dynalic property in current class.
 
diff --git a/clang/test/SemaObjC/provisional-ivar-lookup.m b/clang/test/SemaObjC/provisional-ivar-lookup.m
index 6d57885d61f..04d6a419309 100644
--- a/clang/test/SemaObjC/provisional-ivar-lookup.m
+++ b/clang/test/SemaObjC/provisional-ivar-lookup.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1  -fsyntax-only -fobjc-default-synthesize-properties -fobjc-nonfragile-abi2 -verify %s
+// RUN: %clang_cc1  -fsyntax-only -fobjc-default-synthesize-properties -fobjc-nonfragile-abi -verify %s
 
 // rdar:// 8565343
 @interface Foo  {
diff --git a/clang/test/SemaObjC/synth-provisional-ivars.m b/clang/test/SemaObjC/synth-provisional-ivars.m
index 482ccc1e647..e8179aaa00d 100644
--- a/clang/test/SemaObjC/synth-provisional-ivars.m
+++ b/clang/test/SemaObjC/synth-provisional-ivars.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
 
 int bar;
 
diff --git a/clang/test/SemaObjC/synthesized-ivar.m b/clang/test/SemaObjC/synthesized-ivar.m
index 06530144b85..3bc372bcd81 100644
--- a/clang/test/SemaObjC/synthesized-ivar.m
+++ b/clang/test/SemaObjC/synthesized-ivar.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
 @interface I
 {
 }
diff --git a/clang/test/SemaObjC/warn-implicit-atomic-property.m b/clang/test/SemaObjC/warn-implicit-atomic-property.m
index ad9cbd60678..0b4590a42db 100644
--- a/clang/test/SemaObjC/warn-implicit-atomic-property.m
+++ b/clang/test/SemaObjC/warn-implicit-atomic-property.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -Wimplicit-atomic-properties -fobjc-nonfragile-abi2 -fobjc-default-synthesize-properties -verify %s
+// RUN: %clang_cc1 -fsyntax-only -Wimplicit-atomic-properties -fobjc-nonfragile-abi -fobjc-default-synthesize-properties -verify %s
 // rdar://8774580
 
 @interface Super