Rename clang to clang-cc.

Tests and drivers updated, still need to shuffle dirs.

llvm-svn: 67602

49 files changed, 53 insertions, 53 deletions

diff --git a/clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m b/clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m
index abfe6afcc7c..2c58b921767 100644
--- a/clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m
+++ b/clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @protocol P @end
 
diff --git a/clang/test/CodeGenObjC/bitfield-1.m b/clang/test/CodeGenObjC/bitfield-1.m
index d4a63d3d0e0..d7396b1dd2e 100644
--- a/clang/test/CodeGenObjC/bitfield-1.m
+++ b/clang/test/CodeGenObjC/bitfield-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 @interface Object
 - (id) alloc;
diff --git a/clang/test/CodeGenObjC/bitfield-ivar-metadata.m b/clang/test/CodeGenObjC/bitfield-ivar-metadata.m
index c73fa6717f1..542a2424caa 100644
--- a/clang/test/CodeGenObjC/bitfield-ivar-metadata.m
+++ b/clang/test/CodeGenObjC/bitfield-ivar-metadata.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 @interface INTF
 {
diff --git a/clang/test/CodeGenObjC/blocks-unsupported.m b/clang/test/CodeGenObjC/blocks-unsupported.m
index bd224e50b77..e3faea995e6 100644
--- a/clang/test/CodeGenObjC/blocks-unsupported.m
+++ b/clang/test/CodeGenObjC/blocks-unsupported.m
@@ -1,4 +1,4 @@
-// RUN: clang -fblocks -fno-__block -fnext-runtime --emit-llvm -o %t %s -verify
+// RUN: clang-cc -fblocks -fno-__block -fnext-runtime --emit-llvm -o %t %s -verify
 
 @class Foo;
 @protocol P;
diff --git a/clang/test/CodeGenObjC/blocks.m b/clang/test/CodeGenObjC/blocks.m
index e9ca2238bab..da115612956 100644
--- a/clang/test/CodeGenObjC/blocks.m
+++ b/clang/test/CodeGenObjC/blocks.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -fblocks -S -o - %s
+// RUN: clang-cc -emit-llvm -fblocks -S -o - %s
 // rdar://6676764
 
 struct S {
diff --git a/clang/test/CodeGenObjC/category-super-class-meth.m b/clang/test/CodeGenObjC/category-super-class-meth.m
index 82ced633186..95d8b3103c9 100644
--- a/clang/test/CodeGenObjC/category-super-class-meth.m
+++ b/clang/test/CodeGenObjC/category-super-class-meth.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 @interface BASE
 + (int) BaseMeth;
diff --git a/clang/test/CodeGenObjC/class-getter-dotsyntax.m b/clang/test/CodeGenObjC/class-getter-dotsyntax.m
index 54ed890cc4d..3c82f78d08b 100644
--- a/clang/test/CodeGenObjC/class-getter-dotsyntax.m
+++ b/clang/test/CodeGenObjC/class-getter-dotsyntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 @interface Test { }
 + (Test *)crash;
diff --git a/clang/test/CodeGenObjC/class-type.m b/clang/test/CodeGenObjC/class-type.m
index 12a8a31b9d6..c8a1c18b9c9 100644
--- a/clang/test/CodeGenObjC/class-type.m
+++ b/clang/test/CodeGenObjC/class-type.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
 
 @interface I0 {
   struct { int a; } a;
diff --git a/clang/test/CodeGenObjC/compatibility-alias.m b/clang/test/CodeGenObjC/compatibility-alias.m
index 0982a90b708..11e5a27ab71 100644
--- a/clang/test/CodeGenObjC/compatibility-alias.m
+++ b/clang/test/CodeGenObjC/compatibility-alias.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @interface Int1 @end
 
diff --git a/clang/test/CodeGenObjC/constant-strings.m b/clang/test/CodeGenObjC/constant-strings.m
index 879f91a4324..d4fefd90365 100644
--- a/clang/test/CodeGenObjC/constant-strings.m
+++ b/clang/test/CodeGenObjC/constant-strings.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 id a = @"Hello World!";
 
diff --git a/clang/test/CodeGenObjC/continuation-class.m b/clang/test/CodeGenObjC/continuation-class.m
index 9ac51c70bf0..925f3cd0c50 100644
--- a/clang/test/CodeGenObjC/continuation-class.m
+++ b/clang/test/CodeGenObjC/continuation-class.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 @interface Object
 - (id)new;
diff --git a/clang/test/CodeGenObjC/dot-syntax-1.m b/clang/test/CodeGenObjC/dot-syntax-1.m
index cd12d85c0ec..6c4dcbbef0d 100644
--- a/clang/test/CodeGenObjC/dot-syntax-1.m
+++ b/clang/test/CodeGenObjC/dot-syntax-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 #include <stdio.h>
 
diff --git a/clang/test/CodeGenObjC/dot-syntax.m b/clang/test/CodeGenObjC/dot-syntax.m
index 39e9c49309c..68c8ad0b758 100644
--- a/clang/test/CodeGenObjC/dot-syntax.m
+++ b/clang/test/CodeGenObjC/dot-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 #include <stdio.h>
 
diff --git a/clang/test/CodeGenObjC/encode-test-1.m b/clang/test/CodeGenObjC/encode-test-1.m
index 3646fef23b3..b4f3b0f9c33 100644
--- a/clang/test/CodeGenObjC/encode-test-1.m
+++ b/clang/test/CodeGenObjC/encode-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep -e "{Base=b2b3b4b5}" %t | count 1 &&
 // RUN: grep -e "{Derived=b2b3b4b5b5b4b3}" %t | count 1
 
diff --git a/clang/test/CodeGenObjC/encode-test-2.m b/clang/test/CodeGenObjC/encode-test-2.m
index 0df54ca0bac..6901168b1d0 100644
--- a/clang/test/CodeGenObjC/encode-test-2.m
+++ b/clang/test/CodeGenObjC/encode-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep -e "@\\\22<X>\\\22" %t  &&
 // RUN: grep -e "@\\\22<X><Y>\\\22" %t  &&
 // RUN: grep -e "@\\\22<X><Y><Z>\\\22" %t  &&
diff --git a/clang/test/CodeGenObjC/encode-test-3.m b/clang/test/CodeGenObjC/encode-test-3.m
index 698be50c57a..116e825e32a 100644
--- a/clang/test/CodeGenObjC/encode-test-3.m
+++ b/clang/test/CodeGenObjC/encode-test-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep -e "\^i" %t | count 1 &&
 // RUN: grep -e "\[0i\]" %t | count 1
 
diff --git a/clang/test/CodeGenObjC/encode-test-4.m b/clang/test/CodeGenObjC/encode-test-4.m
index 4d39a532d2e..90b300200a0 100644
--- a/clang/test/CodeGenObjC/encode-test-4.m
+++ b/clang/test/CodeGenObjC/encode-test-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s -O2 | grep "ret i32 1"
+// RUN: clang-cc -emit-llvm -o - %s -O2 | grep "ret i32 1"
 
 int a() {
   return @encode(int) == @encode(int);
diff --git a/clang/test/CodeGenObjC/encode-test.m b/clang/test/CodeGenObjC/encode-test.m
index 8d307e8f5e4..6d2f64e4363 100644
--- a/clang/test/CodeGenObjC/encode-test.m
+++ b/clang/test/CodeGenObjC/encode-test.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep -e "\^{Innermost=CC}" %t | count 1 &&
 // RUN: grep -e "{Derived=#ib32b8b3b8sb16b8b8b2b8ccb6}" %t | count 1 &&
 // RUN: grep -e "{B1=#@c}" %t | count 1 &&
diff --git a/clang/test/CodeGenObjC/forward-class-impl-metadata.m b/clang/test/CodeGenObjC/forward-class-impl-metadata.m
index c502aa4e748..b3976d64584 100644
--- a/clang/test/CodeGenObjC/forward-class-impl-metadata.m
+++ b/clang/test/CodeGenObjC/forward-class-impl-metadata.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
 
 @interface BASE  {
 @private
diff --git a/clang/test/CodeGenObjC/hidden.m b/clang/test/CodeGenObjC/hidden.m
index 2cc3aefde49..6b86ca0581c 100644
--- a/clang/test/CodeGenObjC/hidden.m
+++ b/clang/test/CodeGenObjC/hidden.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 __attribute__((visibility("hidden")))
 @interface Hidden
diff --git a/clang/test/CodeGenObjC/implicit-property.m b/clang/test/CodeGenObjC/implicit-property.m
index 11d2a5603b8..206d496252d 100644
--- a/clang/test/CodeGenObjC/implicit-property.m
+++ b/clang/test/CodeGenObjC/implicit-property.m
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm -triple=i686-apple-darwin8 -o %t %s
-// RUNX: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s
+// RUNX: clang-cc -emit-llvm -o %t %s
 
 @interface A
  -(void) setOk:(int)arg;
diff --git a/clang/test/CodeGenObjC/link-errors.m b/clang/test/CodeGenObjC/link-errors.m
index c25fe675ce5..b50d93993fc 100644
--- a/clang/test/CodeGenObjC/link-errors.m
+++ b/clang/test/CodeGenObjC/link-errors.m
@@ -1,8 +1,8 @@
-// RUN: clang -triple i386-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep '.lazy_reference .objc_class_name_A' %t | count 1 &&
 // RUN: grep '.lazy_reference .objc_class_name_Unknown' %t | count 1 &&
 // RUN: grep '.lazy_reference .objc_class_name_Protocol' %t | count 1 &&
-// RUN: clang -triple i386-apple-darwin9 -DWITH_IMPL -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -DWITH_IMPL -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep '.lazy_reference .objc_class_name_Root' %t | count 1
 
 @interface Root
diff --git a/clang/test/CodeGenObjC/message-arrays.m b/clang/test/CodeGenObjC/message-arrays.m
index aed841e06fd..c618672feab 100644
--- a/clang/test/CodeGenObjC/message-arrays.m
+++ b/clang/test/CodeGenObjC/message-arrays.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 void f0(id a) {
   // This should have an implicit cast
diff --git a/clang/test/CodeGenObjC/messages-2.m b/clang/test/CodeGenObjC/messages-2.m
index dcea93b8616..ca0eb949338 100644
--- a/clang/test/CodeGenObjC/messages-2.m
+++ b/clang/test/CodeGenObjC/messages-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 #include <stdio.h>
 
diff --git a/clang/test/CodeGenObjC/messages.m b/clang/test/CodeGenObjC/messages.m
index fab3c5d8580..b2bda672158 100644
--- a/clang/test/CodeGenObjC/messages.m
+++ b/clang/test/CodeGenObjC/messages.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 typedef struct {
   int x;
diff --git a/clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m b/clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m
index 208b162b50f..5196b8244db 100644
--- a/clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m
+++ b/clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 @interface Object
 - (id) new;
diff --git a/clang/test/CodeGenObjC/no-category-class.m b/clang/test/CodeGenObjC/no-category-class.m
index c0f0efa941d..34bf603da57 100644
--- a/clang/test/CodeGenObjC/no-category-class.m
+++ b/clang/test/CodeGenObjC/no-category-class.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
 
 @interface NSObject
 @end
diff --git a/clang/test/CodeGenObjC/objc-align.m b/clang/test/CodeGenObjC/objc-align.m
index 33d7f30db58..eca5959a392 100644
--- a/clang/test/CodeGenObjC/objc-align.m
+++ b/clang/test/CodeGenObjC/objc-align.m
@@ -1,7 +1,7 @@
 // 32-bit
 
 // RUNX: llvm-gcc -m32 -emit-llvm -S -o %t %s &&
-// RUN: clang -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
 // RUN: grep '@"\\01L_OBJC_CATEGORY_A_Cat" = internal global .*, section "__OBJC,__category,regular,no_dead_strip", align 4' %t &&
 // RUN: grep '@"\\01L_OBJC_CLASS_A" = internal global .*, section "__OBJC,__class,regular,no_dead_strip", align 4' %t &&
 // RUN: grep '@"\\01L_OBJC_CLASS_C" = internal global .*, section "__OBJC,__class,regular,no_dead_strip", align 4' %t &&
@@ -14,7 +14,7 @@
 
 // 64-bit
 
-// RUNX: clang -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
+// RUNX: clang-cc -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
 // RUNX: grep '@"OBJC_CLASS_$_A" = global' %t &&
 // RUNX: grep '@"OBJC_CLASS_$_C" = global' %t &&
 // RUNX: grep '@"OBJC_METACLASS_$_A" = global' %t &&
diff --git a/clang/test/CodeGenObjC/objc2-property-encode.m b/clang/test/CodeGenObjC/objc2-property-encode.m
index deae4b722b4..2bff2fc1a4e 100644
--- a/clang/test/CodeGenObjC/objc2-property-encode.m
+++ b/clang/test/CodeGenObjC/objc2-property-encode.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep -e "T@\\\\22NSString\\\\22" %t
 @interface NSString @end
 
diff --git a/clang/test/CodeGenObjC/objc2-protocol-enc.m b/clang/test/CodeGenObjC/objc2-protocol-enc.m
index b0c1e7ad575..559b0b8c76a 100644
--- a/clang/test/CodeGenObjC/objc2-protocol-enc.m
+++ b/clang/test/CodeGenObjC/objc2-protocol-enc.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep -e "T@\\\22<X>\\\22" %t &&
 // RUN: grep -e "T@\\\22<X><Y>\\\22" %t &&
 // RUN: grep -e "T@\\\22<X><Y><Z>\\\22" %t &&
diff --git a/clang/test/CodeGenObjC/objc2-retain-codegen.m b/clang/test/CodeGenObjC/objc2-retain-codegen.m
index b2872496246..d78bc366d39 100644
--- a/clang/test/CodeGenObjC/objc2-retain-codegen.m
+++ b/clang/test/CodeGenObjC/objc2-retain-codegen.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -fobjc-gc-only -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -fobjc-gc-only -emit-llvm -o %t %s
 
 @interface I0 {
   I0 *_f0;
diff --git a/clang/test/CodeGenObjC/objc2-strong-cast-1.m b/clang/test/CodeGenObjC/objc2-strong-cast-1.m
index 7e62146f9c0..8cad08c88a6 100644
--- a/clang/test/CodeGenObjC/objc2-strong-cast-1.m
+++ b/clang/test/CodeGenObjC/objc2-strong-cast-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
 
 @interface I {
   __attribute__((objc_gc(strong))) int *i_IdocumentIDs;
diff --git a/clang/test/CodeGenObjC/objc2-strong-cast.m b/clang/test/CodeGenObjC/objc2-strong-cast.m
index 60fd37392ab..d0fcb6ced92 100644
--- a/clang/test/CodeGenObjC/objc2-strong-cast.m
+++ b/clang/test/CodeGenObjC/objc2-strong-cast.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
 
 @interface I {
   __attribute__((objc_gc(strong))) signed long *_documentIDs;
diff --git a/clang/test/CodeGenObjC/objc2-weak-compare.m b/clang/test/CodeGenObjC/objc2-weak-compare.m
index 5889b1ff8db..7a9381d2b40 100644
--- a/clang/test/CodeGenObjC/objc2-weak-compare.m
+++ b/clang/test/CodeGenObjC/objc2-weak-compare.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
 
 @interface PBXTarget 
 {
diff --git a/clang/test/CodeGenObjC/objc2-weak-ivar.m b/clang/test/CodeGenObjC/objc2-weak-ivar.m
index 611bffd1e9b..134e3a976fe 100644
--- a/clang/test/CodeGenObjC/objc2-weak-ivar.m
+++ b/clang/test/CodeGenObjC/objc2-weak-ivar.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
 @class NSObject;
 
 @interface Foo  {
diff --git a/clang/test/CodeGenObjC/overloadable.m b/clang/test/CodeGenObjC/overloadable.m
index fe00fadb879..5a5868e7b4d 100644
--- a/clang/test/CodeGenObjC/overloadable.m
+++ b/clang/test/CodeGenObjC/overloadable.m
@@ -1,5 +1,5 @@
 // rdar://6657613
-// RUN: clang -emit-llvm %s -o %t && 
+// RUN: clang-cc -emit-llvm %s -o %t && 
 
 @class C;
 
diff --git a/clang/test/CodeGenObjC/predefined-expr-in-method.m b/clang/test/CodeGenObjC/predefined-expr-in-method.m
index d835ed827b3..812ef97252d 100644
--- a/clang/test/CodeGenObjC/predefined-expr-in-method.m
+++ b/clang/test/CodeGenObjC/predefined-expr-in-method.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 @interface A
 @end
diff --git a/clang/test/CodeGenObjC/property-aggr-type.m b/clang/test/CodeGenObjC/property-aggr-type.m
index 486cfa0b704..0cb7a5e2f40 100644
--- a/clang/test/CodeGenObjC/property-aggr-type.m
+++ b/clang/test/CodeGenObjC/property-aggr-type.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 @interface Object
 - (id) new;
diff --git a/clang/test/CodeGenObjC/property-agrr-getter.m b/clang/test/CodeGenObjC/property-agrr-getter.m
index 518250eaa60..0a1df123bff 100644
--- a/clang/test/CodeGenObjC/property-agrr-getter.m
+++ b/clang/test/CodeGenObjC/property-agrr-getter.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 typedef struct {
   unsigned f0;
diff --git a/clang/test/CodeGenObjC/property-getter-dot-syntax.m b/clang/test/CodeGenObjC/property-getter-dot-syntax.m
index 962862b5366..d98e9bab6da 100644
--- a/clang/test/CodeGenObjC/property-getter-dot-syntax.m
+++ b/clang/test/CodeGenObjC/property-getter-dot-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 @protocol NSObject
 - (void *)description;
diff --git a/clang/test/CodeGenObjC/property-incr-decr-1.m b/clang/test/CodeGenObjC/property-incr-decr-1.m
index ef55342514c..772e872a214 100644
--- a/clang/test/CodeGenObjC/property-incr-decr-1.m
+++ b/clang/test/CodeGenObjC/property-incr-decr-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 @interface Object
 - (id) new;
diff --git a/clang/test/CodeGenObjC/property-setter-attr.m b/clang/test/CodeGenObjC/property-setter-attr.m
index edc80554cdc..390392415d7 100644
--- a/clang/test/CodeGenObjC/property-setter-attr.m
+++ b/clang/test/CodeGenObjC/property-setter-attr.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -triple=i686-apple-darwin8 -o %t %s
+// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s
 // RUN: grep -e "SiSetOtherThings:" %t
 
 @interface A 
diff --git a/clang/test/CodeGenObjC/property.m b/clang/test/CodeGenObjC/property.m
index 91d3659dcde..264adf1106e 100644
--- a/clang/test/CodeGenObjC/property.m
+++ b/clang/test/CodeGenObjC/property.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
 
 #include <stdio.h>
 
diff --git a/clang/test/CodeGenObjC/protocols-lazy.m b/clang/test/CodeGenObjC/protocols-lazy.m
index f92d9c4667c..e91cc0aea83 100644
--- a/clang/test/CodeGenObjC/protocols-lazy.m
+++ b/clang/test/CodeGenObjC/protocols-lazy.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -triple=i686-apple-darwin8 -o %t %s &&
+// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s &&
 // RUNX: llvm-gcc -S -emit-llvm -o %t %s &&
 
 // No object generated
diff --git a/clang/test/CodeGenObjC/runtime-fns.m b/clang/test/CodeGenObjC/runtime-fns.m
index f132b5420f5..c53b0a32133 100644
--- a/clang/test/CodeGenObjC/runtime-fns.m
+++ b/clang/test/CodeGenObjC/runtime-fns.m
@@ -1,6 +1,6 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep -e "^de.*objc_msgSend[0-9]*(" %t | count 1 &&
-// RUN: clang -DWITHDEF -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -DWITHDEF -fnext-runtime -emit-llvm -o %t %s &&
 // RUN: grep -e "^de.*objc_msgSend[0-9]*(" %t | count 1
 
 id objc_msgSend(int x);
diff --git a/clang/test/CodeGenObjC/super-classmethod-category.m b/clang/test/CodeGenObjC/super-classmethod-category.m
index 2e9efde4382..27cdbf6aed4 100644
--- a/clang/test/CodeGenObjC/super-classmethod-category.m
+++ b/clang/test/CodeGenObjC/super-classmethod-category.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 
 @interface SUPER
 + (void)Meth;
diff --git a/clang/test/CodeGenObjC/super-dotsyntax-property.m b/clang/test/CodeGenObjC/super-dotsyntax-property.m
index cd0d5652d43..6e4f176724c 100644
--- a/clang/test/CodeGenObjC/super-dotsyntax-property.m
+++ b/clang/test/CodeGenObjC/super-dotsyntax-property.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @interface B
 {
diff --git a/clang/test/CodeGenObjC/synchronized.m b/clang/test/CodeGenObjC/synchronized.m
index 3e59449e0bb..5c1d3979d39 100644
--- a/clang/test/CodeGenObjC/synchronized.m
+++ b/clang/test/CodeGenObjC/synchronized.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -triple=i686-apple-darwin8 -o %t %s -O2 &&
+// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s -O2 &&
 // RUN: grep 'ret i32' %t | count 1 &&
 // RUN: grep 'ret i32 1' %t | count 1
 
diff --git a/clang/test/CodeGenObjC/unname-bf-metadata.m b/clang/test/CodeGenObjC/unname-bf-metadata.m
index bac530eaf94..a7636e4ebc8 100644
--- a/clang/test/CodeGenObjC/unname-bf-metadata.m
+++ b/clang/test/CodeGenObjC/unname-bf-metadata.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
 // Test that meta-data for ivar lists with unnamed bitfield are generated.
 //
 @interface Foo {