Revert r164907 and r164902 (+ follow-ups). They broke building on 10.6.

See PR14013.

llvm-svn: 165962

5 files changed, 1 insertions, 81 deletions

diff --git a/clang/test/CodeGenObjC/optimized-setter-ios-device.m b/clang/test/CodeGenObjC/optimized-setter-ios-device.m
deleted file mode 100644
index 6fa322ab0f5..00000000000
--- a/clang/test/CodeGenObjC/optimized-setter-ios-device.m
+++ /dev/null
@@ -1,33 +0,0 @@
-// RUN: %clang_cc1 %s -emit-llvm -fobjc-runtime=ios-6.0.0 -triple thumbv7-apple-ios6.0.0 -o - | FileCheck %s
-// rdar://11915017
-
-@interface I
-// void objc_setProperty_nonatomic(id self, SEL _cmd, id newValue, ptrdiff_t offset);
-// objc_setProperty(..., NO, NO) 
-@property (nonatomic, retain) id nonatomicProperty;
-
-// void objc_setProperty_nonatomic_copy(id self, SEL _cmd, id newValue, ptrdiff_t offset);
-// objc_setProperty(..., NO, YES)
-@property (nonatomic, copy) id nonatomicPropertyCopy;
-
-// void objc_setProperty_atomic(id self, SEL _cmd, id newValue, ptrdiff_t offset);
-// objc_setProperty(..., YES, NO)
-@property (retain) id atomicProperty;
-
-// void objc_setProperty_atomic_copy(id self, SEL _cmd, id newValue, ptrdiff_t offset);
-// objc_setProperty(..., YES, YES)
-@property (copy) id atomicPropertyCopy;
-@end
-
-@implementation I
-@synthesize nonatomicProperty;
-@synthesize nonatomicPropertyCopy;
-@synthesize atomicProperty;
-@synthesize atomicPropertyCopy;
-@end
-
-// CHECK: call arm_aapcscc void @objc_setProperty_nonatomic
-// CHECK: call arm_aapcscc void @objc_setProperty_nonatomic_copy
-// CHECK: call arm_aapcscc void @objc_setProperty_atomic
-// CHECK: call arm_aapcscc void @objc_setProperty_atomic_copy
-
diff --git a/clang/test/CodeGenObjC/optimized-setter.m b/clang/test/CodeGenObjC/optimized-setter.m
index 6f5cfb12633..0e1b3885951 100644
--- a/clang/test/CodeGenObjC/optimized-setter.m
+++ b/clang/test/CodeGenObjC/optimized-setter.m
@@ -1,5 +1,4 @@
-// RUN: %clang_cc1 %s -emit-llvm -fobjc-runtime=macosx-10.8 -triple x86_64-apple-macosx10.8.0 -o - | FileCheck %s
-// RUN: %clang_cc1 %s -emit-llvm -fobjc-runtime=ios-6.0.0  -triple x86_64-apple-ios6.0.0 -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -triple x86_64-apple-macosx10.8.0 -o - | FileCheck %s
 // rdar://10179974
 
 @interface I
diff --git a/clang/test/CodeGenObjC/unoptimized-setter.m b/clang/test/CodeGenObjC/unoptimized-setter.m
deleted file mode 100644
index adcf0870160..00000000000
--- a/clang/test/CodeGenObjC/unoptimized-setter.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// RUN: %clang_cc1 %s -emit-llvm -fobjc-runtime=macosx-10.6.0 -triple x86_64-apple-macosx10.6.0 -o - | FileCheck %s
-// rdar://11858187
-
-@interface I
-// void objc_setProperty_nonatomic(id self, SEL _cmd, id newValue, ptrdiff_t offset);
-// objc_setProperty(..., NO, NO) 
-@property (nonatomic, retain) id nonatomicProperty;
-
-// void objc_setProperty_nonatomic_copy(id self, SEL _cmd, id newValue, ptrdiff_t offset);
-// objc_setProperty(..., NO, YES)
-@property (nonatomic, copy) id nonatomicPropertyCopy;
-
-// void objc_setProperty_atomic(id self, SEL _cmd, id newValue, ptrdiff_t offset);
-// objc_setProperty(..., YES, NO)
-@property (retain) id atomicProperty;
-
-// void objc_setProperty_atomic_copy(id self, SEL _cmd, id newValue, ptrdiff_t offset);
-// objc_setProperty(..., YES, YES)
-@property (copy) id atomicPropertyCopy;
-@end
-
-@implementation I
-@synthesize nonatomicProperty;
-@synthesize nonatomicPropertyCopy;
-@synthesize atomicProperty;
-@synthesize atomicPropertyCopy;
-@end
-
-// CHECK-NOT: call void @objc_setProperty_nonatomic
-// CHECK-NOT: call void @objc_setProperty_nonatomic_copy
-// CHECK-NOT: call void @objc_setProperty_atomic
-// CHECK-NOT: call void @objc_setProperty_atomic_copy
diff --git a/clang/test/Driver/darwin-ld.c b/clang/test/Driver/darwin-ld.c
index cd511e034f1..02fccde1ad2 100644
--- a/clang/test/Driver/darwin-ld.c
+++ b/clang/test/Driver/darwin-ld.c
@@ -122,10 +122,6 @@
 // RUN: FileCheck -check-prefix=LINK_NO_CRT1 %s < %t.log
 // LINK_NO_CRT1-NOT: crt
 
-// RUN: %clang -target armv7-apple-ios6.0 -miphoneos-version-min=6.0 -### %t.o 2> %t.log
-// RUN: FileCheck -check-prefix=LINK_NO_IOS_CRT1 %s < %t.log
-// LINK_NO_IOS_CRT1-NOT: crt
-
 // RUN: %clang -target i386-apple-darwin12 -pg -### %t.o 2> %t.log
 // RUN: FileCheck -check-prefix=LINK_PG %s < %t.log
 // LINK_PG: -lgcrt1.o
diff --git a/clang/test/Driver/pic.c b/clang/test/Driver/pic.c
index 5b69dba36df..52508a5b5cc 100644
--- a/clang/test/Driver/pic.c
+++ b/clang/test/Driver/pic.c
@@ -93,13 +93,3 @@
 // RUN:   | FileCheck %s --check-prefix=CHECK-DYNAMIC-NO-PIC1
 // RUN: %clang -c %s -target i386-apple-darwin -mdynamic-no-pic -fPIC -### 2>&1 \
 // RUN:   | FileCheck %s --check-prefix=CHECK-DYNAMIC-NO-PIC2
-
-// Checks for ARM
-// RUN: %clang -c %s -target armv7-apple-ios -fapple-kext -miphoneos-version-min=6.0.0 -### 2>&1 \
-// RUN:   | FileCheck %s --check-prefix=CHECK-PIC2
-// RUN: %clang -c %s -target armv7-apple-ios -mkernel -miphoneos-version-min=6.0.0 -### 2>&1 \
-// RUN:   | FileCheck %s --check-prefix=CHECK-PIC2
-// RUN: %clang -c %s -target armv7-apple-ios -fapple-kext -miphoneos-version-min=5.0.0 -### 2>&1 \
-// RUN:   | FileCheck %s --check-prefix=CHECK-NO-PIC
-// RUN: %clang -c %s -target armv7-apple-ios -fapple-kext -miphoneos-version-min=6.0.0 -static -### 2>&1 \
-// RUN:   | FileCheck %s --check-prefix=CHECK-NO-PIC