diff --git a/Driver/Makefile b/Driver/Makefile
index 962e3fd..188df25 100644
--- a/Driver/Makefile
+++ b/Driver/Makefile
@@ -1,5 +1,5 @@
 LEVEL = ../../..
-TOOLNAME = clang
+TOOLNAME = clang-cc
 CPPFLAGS += -I$(PROJ_SRC_DIR)/../include -I$(PROJ_OBJ_DIR)/../include
 CXXFLAGS = -fno-rtti
 
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index b49813a..a550347 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -332,7 +332,7 @@
   }
       
   const char *Exec = 
-    Args.MakeArgString(getToolChain().GetProgramPath(C, "clang").c_str());
+    Args.MakeArgString(getToolChain().GetProgramPath(C, "clang-cc").c_str());
   Dest.addCommand(new Command(Exec, CmdArgs));
 
   // Claim some arguments which clang doesn't support, but we don't
diff --git a/test/Analysis/CFDateGC.m b/test/Analysis/CFDateGC.m
index 43ec99d..dfc7366 100644
--- a/test/Analysis/CFDateGC.m
+++ b/test/Analysis/CFDateGC.m
@@ -1,8 +1,8 @@
-// RUN: clang -analyze -checker-cfref -verify -fobjc-gc -analyzer-constraints=basic %s &&
-// RUN: clang -analyze -checker-cfref -verify -fobjc-gc -analyzer-constraints=range %s &&
-// RUN: clang -analyze -checker-cfref -verify -fobjc-gc -disable-free %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -fobjc-gc %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -fobjc-gc %s
+// RUN: clang-cc -analyze -checker-cfref -verify -fobjc-gc -analyzer-constraints=basic %s &&
+// RUN: clang-cc -analyze -checker-cfref -verify -fobjc-gc -analyzer-constraints=range %s &&
+// RUN: clang-cc -analyze -checker-cfref -verify -fobjc-gc -disable-free %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -fobjc-gc %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -fobjc-gc %s
 
 //===----------------------------------------------------------------------===//
 // The following code is reduced using delta-debugging from
diff --git a/test/Analysis/CFNumber.c b/test/Analysis/CFNumber.c
index 40b6a91..f62d2ab 100644
--- a/test/Analysis/CFNumber.c
+++ b/test/Analysis/CFNumber.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s
 
 typedef signed long CFIndex;
 typedef const struct __CFAllocator * CFAllocatorRef;
diff --git a/test/Analysis/CFRetainRelease_NSAssertionHandler.m b/test/Analysis/CFRetainRelease_NSAssertionHandler.m
index 119a05e..1ff9507 100644
--- a/test/Analysis/CFRetainRelease_NSAssertionHandler.m
+++ b/test/Analysis/CFRetainRelease_NSAssertionHandler.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=basic -analyzer-store=basic &&
-// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=range -analyzer-store=basic &&
-// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=basic -analyzer-store=region &&
-// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=range -analyzer-store=region
+// RUN: clang-cc -analyze -checker-cfref -verify %s -analyzer-constraints=basic -analyzer-store=basic &&
+// RUN: clang-cc -analyze -checker-cfref -verify %s -analyzer-constraints=range -analyzer-store=basic &&
+// RUN: clang-cc -analyze -checker-cfref -verify %s -analyzer-constraints=basic -analyzer-store=region &&
+// RUN: clang-cc -analyze -checker-cfref -verify %s -analyzer-constraints=range -analyzer-store=region
 
 typedef struct objc_selector *SEL;
 typedef signed char BOOL;
diff --git a/test/Analysis/CGColorSpace.c b/test/Analysis/CGColorSpace.c
index c405a10..2887d47 100644
--- a/test/Analysis/CGColorSpace.c
+++ b/test/Analysis/CGColorSpace.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
 
 typedef struct CGColorSpace *CGColorSpaceRef;
 extern CGColorSpaceRef CGColorSpaceCreateDeviceRGB(void);
diff --git a/test/Analysis/CheckNSError.m b/test/Analysis/CheckNSError.m
index 10f79e8..2843572 100644
--- a/test/Analysis/CheckNSError.m
+++ b/test/Analysis/CheckNSError.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
 
 
 typedef signed char BOOL;
diff --git a/test/Analysis/MissingDealloc.m b/test/Analysis/MissingDealloc.m
index b06c63d..41498e5 100644
--- a/test/Analysis/MissingDealloc.m
+++ b/test/Analysis/MissingDealloc.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-objc-missing-dealloc '-DIBOutlet=__attribute__((iboutlet))' %s --verify
+// RUN: clang-cc -analyze -warn-objc-missing-dealloc '-DIBOutlet=__attribute__((iboutlet))' %s --verify
 typedef signed char BOOL;
 @protocol NSObject
 - (BOOL)isEqual:(id)object;
diff --git a/test/Analysis/NSPanel.m b/test/Analysis/NSPanel.m
index b7ecfef..8f8f562 100644
--- a/test/Analysis/NSPanel.m
+++ b/test/Analysis/NSPanel.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
 
 // BEGIN delta-debugging reduced header stuff
 
diff --git a/test/Analysis/NSString.m b/test/Analysis/NSString.m
index 29e3324..3e2155b 100644
--- a/test/Analysis/NSString.m
+++ b/test/Analysis/NSString.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
 
 //===----------------------------------------------------------------------===//
 // The following code is reduced using delta-debugging from
diff --git a/test/Analysis/NSWindow.m b/test/Analysis/NSWindow.m
index 6bddaeb..9609c52 100644
--- a/test/Analysis/NSWindow.m
+++ b/test/Analysis/NSWindow.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=range -verify %s
 
 // These declarations were reduced using Delta-Debugging from Foundation.h
 // on Mac OS X.  The test cases are below.
diff --git a/test/Analysis/NoReturn.m b/test/Analysis/NoReturn.m
index 9a0e484..a43f99b 100644
--- a/test/Analysis/NoReturn.m
+++ b/test/Analysis/NoReturn.m
@@ -1,9 +1,9 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
 
 #include <stdarg.h>
 
diff --git a/test/Analysis/ObjCProperties.m b/test/Analysis/ObjCProperties.m
index adee5e2..7787a1d 100644
--- a/test/Analysis/ObjCProperties.m
+++ b/test/Analysis/ObjCProperties.m
@@ -1,9 +1,9 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic %s -verify &&
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range %s -verify &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic %s -verify &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range %s -verify &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic %s -verify &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range %s -verify
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic %s -verify &&
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range %s -verify &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic %s -verify &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range %s -verify &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic %s -verify &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range %s -verify
 
 // The point of this test cases is to exercise properties in the static
 // analyzer
diff --git a/test/Analysis/ObjCRetSigs.m b/test/Analysis/ObjCRetSigs.m
index 2d1aa80..0d69916 100644
--- a/test/Analysis/ObjCRetSigs.m
+++ b/test/Analysis/ObjCRetSigs.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-objc-methodsigs -verify %s
+// RUN: clang-cc -analyze -warn-objc-methodsigs -verify %s
 
 #include <stdio.h>
 
diff --git a/test/Analysis/PR2599.m b/test/Analysis/PR2599.m
index 6f107df..098bfe8 100644
--- a/test/Analysis/PR2599.m
+++ b/test/Analysis/PR2599.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -analyzer-constraints=basic -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
-// RUN: clang -analyze -analyzer-constraints=range -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
-// RUN: clang -analyze -analyzer-constraints=basic -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
-// RUN: clang -analyze -analyzer-constraints=range -analyzer-store=region -checker-cfref -fobjc-gc -verify %s
+// RUN: clang-cc -analyze -analyzer-constraints=basic -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
+// RUN: clang-cc -analyze -analyzer-constraints=range -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
+// RUN: clang-cc -analyze -analyzer-constraints=basic -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
+// RUN: clang-cc -analyze -analyzer-constraints=range -analyzer-store=region -checker-cfref -fobjc-gc -verify %s
 
 typedef const void * CFTypeRef;
 typedef const struct __CFString * CFStringRef;
diff --git a/test/Analysis/PR2978.m b/test/Analysis/PR2978.m
index e2a031d..2b4c917 100644
--- a/test/Analysis/PR2978.m
+++ b/test/Analysis/PR2978.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-objc-missing-dealloc %s -verify
+// RUN: clang-cc -analyze -warn-objc-missing-dealloc %s -verify
 
 // Tests for the checker which checks missing/extra ivar 'release' calls 
 // in dealloc.
diff --git a/test/Analysis/array-struct.c b/test/Analysis/array-struct.c
index 60a3d31..7e5e624 100644
--- a/test/Analysis/array-struct.c
+++ b/test/Analysis/array-struct.c
@@ -1,8 +1,8 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
 
 struct s {
   int data;
diff --git a/test/Analysis/casts.m b/test/Analysis/casts.m
index 68de2c8..82c29fa 100644
--- a/test/Analysis/casts.m
+++ b/test/Analysis/casts.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic --verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region --verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic --verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region --verify %s
 
 // Test function pointer casts.  Currently we track function addresses using
 // loc::FunctionVal.  Because casts can be arbitrary, do we need to model
diff --git a/test/Analysis/cfref_PR2519.c b/test/Analysis/cfref_PR2519.c
index a37af6d..695123b 100644
--- a/test/Analysis/cfref_PR2519.c
+++ b/test/Analysis/cfref_PR2519.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range -verify %s
 
 typedef unsigned char Boolean;
 typedef signed long CFIndex;
diff --git a/test/Analysis/cfref_rdar6080742.c b/test/Analysis/cfref_rdar6080742.c
index c088ec4..5d95761 100644
--- a/test/Analysis/cfref_rdar6080742.c
+++ b/test/Analysis/cfref_rdar6080742.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
 
 // This test case was reported in <rdar:problem/6080742>.
 // It tests path-sensitivity with respect to '!(cfstring != 0)' (negation of inequality).
diff --git a/test/Analysis/complex.c b/test/Analysis/complex.c
index eed3ed4..f29fc70 100644
--- a/test/Analysis/complex.c
+++ b/test/Analysis/complex.c
@@ -1,8 +1,8 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
 
 #include <stdint.h>
 
diff --git a/test/Analysis/conditional-op-missing-lhs.c b/test/Analysis/conditional-op-missing-lhs.c
index 4854c28..bebf155 100644
--- a/test/Analysis/conditional-op-missing-lhs.c
+++ b/test/Analysis/conditional-op-missing-lhs.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-dead-stores -warn-uninit-values -verify %s
+// RUN: clang-cc -analyze -warn-dead-stores -warn-uninit-values -verify %s
 
 void f1()
 {
diff --git a/test/Analysis/dead-stores.c b/test/Analysis/dead-stores.c
index c151057..d632c69 100644
--- a/test/Analysis/dead-stores.c
+++ b/test/Analysis/dead-stores.c
@@ -1,10 +1,10 @@
-// RUN: clang -analyze -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -warn-dead-stores -verify %s
+// RUN: clang-cc -analyze -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -warn-dead-stores -verify %s
 
 void f1() {
   int k, y;
diff --git a/test/Analysis/dead-stores.m b/test/Analysis/dead-stores.m
index ee94853..218cb44 100644
--- a/test/Analysis/dead-stores.m
+++ b/test/Analysis/dead-stores.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-dead-stores -verify %s
+// RUN: clang-cc -analyze -warn-dead-stores -verify %s
 
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
diff --git a/test/Analysis/exercise-ps.c b/test/Analysis/exercise-ps.c
index 1b001ec..08842b1 100644
--- a/test/Analysis/exercise-ps.c
+++ b/test/Analysis/exercise-ps.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 //
 // Just exercise the analyzer on code that has at one point caused issues
 // (i.e., no assertions or crashes).
diff --git a/test/Analysis/fields.c b/test/Analysis/fields.c
index aa7acf2..d6bf73f 100644
--- a/test/Analysis/fields.c
+++ b/test/Analysis/fields.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-cfref %s --analyzer-store=basic -verify &&
-// RUN: clang -analyze -checker-cfref %s --analyzer-store=region -verify &&
-// RUN: clang -analyze -checker-simple %s -verify
+// RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=basic -verify &&
+// RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=region -verify &&
+// RUN: clang-cc -analyze -checker-simple %s -verify
 
 unsigned foo();
 typedef struct bf { unsigned x:2; } bf;
diff --git a/test/Analysis/func.c b/test/Analysis/func.c
index 94ca269..ac067a9 100644
--- a/test/Analysis/func.c
+++ b/test/Analysis/func.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 void f(void) {
   void (*p)(void);
diff --git a/test/Analysis/misc-ps-basic-store.m b/test/Analysis/misc-ps-basic-store.m
index 00183e7..1207f86 100644
--- a/test/Analysis/misc-ps-basic-store.m
+++ b/test/Analysis/misc-ps-basic-store.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic --verify -fblocks %s
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic --verify -fblocks %s
 
 //---------------------------------------------------------------------------
 // Test case 'checkaccess_union' differs for region store and basic store.
diff --git a/test/Analysis/misc-ps-eager-assume.m b/test/Analysis/misc-ps-eager-assume.m
index 4dd8f25..818922e 100644
--- a/test/Analysis/misc-ps-eager-assume.m
+++ b/test/Analysis/misc-ps-eager-assume.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range --verify -fblocks %s -analyzer-eagerly-assume
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range --verify -fblocks %s -analyzer-eagerly-assume
 
 // Delta-reduced header stuff (needed for test cases).
 typedef signed char BOOL;
diff --git a/test/Analysis/misc-ps-region-store.m b/test/Analysis/misc-ps-region-store.m
index 486d7ac..8c8815e 100644
--- a/test/Analysis/misc-ps-region-store.m
+++ b/test/Analysis/misc-ps-region-store.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=region --verify -fblocks %s
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region --verify -fblocks %s
 
 typedef struct objc_selector *SEL;
 typedef signed char BOOL;
diff --git a/test/Analysis/misc-ps.m b/test/Analysis/misc-ps.m
index 1f4b763..0ee47ce 100644
--- a/test/Analysis/misc-ps.m
+++ b/test/Analysis/misc-ps.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic --verify -fblocks %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range --verify -fblocks %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic --verify -fblocks %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range --verify -fblocks %s
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic --verify -fblocks %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range --verify -fblocks %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic --verify -fblocks %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range --verify -fblocks %s
 
 typedef struct objc_selector *SEL;
 typedef signed char BOOL;
diff --git a/test/Analysis/no-exit-cfg.c b/test/Analysis/no-exit-cfg.c
index 6752008..cad2127 100644
--- a/test/Analysis/no-exit-cfg.c
+++ b/test/Analysis/no-exit-cfg.c
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s 
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s 
 
 // This is a test case for the issue reported in PR 2819:
 //  http://llvm.org/bugs/show_bug.cgi?id=2819
diff --git a/test/Analysis/null-deref-ps.c b/test/Analysis/null-deref-ps.c
index fe94d6f..bd63c7e 100644
--- a/test/Analysis/null-deref-ps.c
+++ b/test/Analysis/null-deref-ps.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -std=gnu99 -checker-simple -verify %s &&
-// RUN: clang -analyze -std=gnu99 -checker-simple -verify %s   -analyzer-constraints=range &&
-// RUN: clang -analyze -std=gnu99 -checker-simple -analyzer-store=region -analyzer-purge-dead=false -verify %s &&
-// RUN: clang -analyze -std=gnu99 -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -std=gnu99 -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -std=gnu99 -checker-simple -verify %s   -analyzer-constraints=range &&
+// RUN: clang-cc -analyze -std=gnu99 -checker-simple -analyzer-store=region -analyzer-purge-dead=false -verify %s &&
+// RUN: clang-cc -analyze -std=gnu99 -checker-cfref -analyzer-store=region -verify %s
 
 #include<stdint.h>
 #include <assert.h>
diff --git a/test/Analysis/outofbound.c b/test/Analysis/outofbound.c
index 4ab2326..953075f 100644
--- a/test/Analysis/outofbound.c
+++ b/test/Analysis/outofbound.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=region -verify %s
 
 char f1() {
   char* s = "abcd";
diff --git a/test/Analysis/ptr-arith.c b/test/Analysis/ptr-arith.c
index 87c3eb8..ea8b7f5 100644
--- a/test/Analysis/ptr-arith.c
+++ b/test/Analysis/ptr-arith.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=region -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify -triple x86_64-apple-darwin9 %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify -triple i686-apple-darwin9 %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=region -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify -triple x86_64-apple-darwin9 %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify -triple i686-apple-darwin9 %s
 
 void f1() {
   int a[10];
diff --git a/test/Analysis/rdar-6442306-1.m b/test/Analysis/rdar-6442306-1.m
index e53b094..15d3498 100644
--- a/test/Analysis/rdar-6442306-1.m
+++ b/test/Analysis/rdar-6442306-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref %s --analyzer-store=basic -verify &&
-// RUN: clang -analyze -checker-cfref %s --analyzer-store=region -verify
+// RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=basic -verify &&
+// RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=region -verify
 
 typedef int bar_return_t;
 typedef struct {
diff --git a/test/Analysis/rdar-6539791.c b/test/Analysis/rdar-6539791.c
index 5fe2d29..c1c9891 100644
--- a/test/Analysis/rdar-6539791.c
+++ b/test/Analysis/rdar-6539791.c
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 typedef const struct __CFAllocator * CFAllocatorRef;
 typedef struct __CFDictionary * CFMutableDictionaryRef;
diff --git a/test/Analysis/rdar-6540084.m b/test/Analysis/rdar-6540084.m
index e1347d9..c788543 100644
--- a/test/Analysis/rdar-6540084.m
+++ b/test/Analysis/rdar-6540084.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-dead-stores -verify %s
+// RUN: clang-cc -analyze -warn-dead-stores -verify %s
 //
 // This test exercises the live variables analysis (LiveVariables.cpp).
 // The case originally identified a non-termination bug.
diff --git a/test/Analysis/rdar-6541136-region.c b/test/Analysis/rdar-6541136-region.c
index 270fa33..90960dd 100644
--- a/test/Analysis/rdar-6541136-region.c
+++ b/test/Analysis/rdar-6541136-region.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -analyze -checker-cfref -analyzer-store=region %s
+// RUN: clang-cc -verify -analyze -checker-cfref -analyzer-store=region %s
 
 struct tea_cheese { unsigned magic; };
 typedef struct tea_cheese kernel_tea_cheese_t;
diff --git a/test/Analysis/rdar-6541136.c b/test/Analysis/rdar-6541136.c
index f90837c..6e6a479 100644
--- a/test/Analysis/rdar-6541136.c
+++ b/test/Analysis/rdar-6541136.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -analyze -checker-cfref -analyzer-store=basic %s
+// RUN: clang-cc -verify -analyze -checker-cfref -analyzer-store=basic %s
 
 struct tea_cheese { unsigned magic; };
 typedef struct tea_cheese kernel_tea_cheese_t;
diff --git a/test/Analysis/rdar-6562655.m b/test/Analysis/rdar-6562655.m
index bb9afab..581d6ea 100644
--- a/test/Analysis/rdar-6562655.m
+++ b/test/Analysis/rdar-6562655.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-constraints=basic -analyzer-store=basic -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-constraints=basic -analyzer-store=basic -verify %s
 //
 // This test case mainly checks that the retain/release checker doesn't crash
 // on this file.
diff --git a/test/Analysis/rdar-6582778-basic-store.c b/test/Analysis/rdar-6582778-basic-store.c
index 0e1c905..9ec38ef 100644
--- a/test/Analysis/rdar-6582778-basic-store.c
+++ b/test/Analysis/rdar-6582778-basic-store.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s
 
 typedef const void * CFTypeRef;
 typedef double CFTimeInterval;
diff --git a/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m b/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
index 881addf..d1f0802 100644
--- a/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
+++ b/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-constraints=basic -analyzer-store=basic %s -verify
+// RUN: clang-cc -analyze -checker-cfref -analyzer-constraints=basic -analyzer-store=basic %s -verify
 
 typedef struct Foo { int x; } Bar;
 
diff --git a/test/Analysis/refcnt_naming.m b/test/Analysis/refcnt_naming.m
index 5af3711..bea4047 100644
--- a/test/Analysis/refcnt_naming.m
+++ b/test/Analysis/refcnt_naming.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 typedef const struct __CFString * CFStringRef;
 typedef const struct __CFAllocator * CFAllocatorRef;
diff --git a/test/Analysis/region-1.m b/test/Analysis/region-1.m
index 2d44091..f990507 100644
--- a/test/Analysis/region-1.m
+++ b/test/Analysis/region-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 //
 // This test case simply should not crash.  It evaluates the logic of not
 // using MemRegion::getRValueType in incorrect places.
diff --git a/test/Analysis/region-only-test.c b/test/Analysis/region-only-test.c
index 701da72..fdc7404 100644
--- a/test/Analysis/region-only-test.c
+++ b/test/Analysis/region-only-test.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=region -verify %s
 
 // Region store must be enabled for tests in this file.
 
diff --git a/test/Analysis/retain-release-basic-store.m b/test/Analysis/retain-release-basic-store.m
index 651135a..b16c231 100644
--- a/test/Analysis/retain-release-basic-store.m
+++ b/test/Analysis/retain-release-basic-store.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s
 
 //===----------------------------------------------------------------------===//
 // The following code is reduced using delta-debugging from
diff --git a/test/Analysis/retain-release-gc-only.m b/test/Analysis/retain-release-gc-only.m
index 231eec9..b378b04 100644
--- a/test/Analysis/retain-release-gc-only.m
+++ b/test/Analysis/retain-release-gc-only.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -verify -fobjc-gc-only %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -fobjc-gc-only -verify %s
+// RUN: clang-cc -analyze -checker-cfref -verify -fobjc-gc-only %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -fobjc-gc-only -verify %s
 
 //===----------------------------------------------------------------------===//
 // Header stuff.
diff --git a/test/Analysis/retain-release-region-store.m b/test/Analysis/retain-release-region-store.m
index 651ffa7..66950e2 100644
--- a/test/Analysis/retain-release-region-store.m
+++ b/test/Analysis/retain-release-region-store.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 //===----------------------------------------------------------------------===//
 // The following code is reduced using delta-debugging from
diff --git a/test/Analysis/retain-release.m b/test/Analysis/retain-release.m
index 9fd15d3..6e75b0d 100644
--- a/test/Analysis/retain-release.m
+++ b/test/Analysis/retain-release.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 
 //===----------------------------------------------------------------------===//
diff --git a/test/Analysis/stack-addr-ps.c b/test/Analysis/stack-addr-ps.c
index 3ee2063..aa3c135 100644
--- a/test/Analysis/stack-addr-ps.c
+++ b/test/Analysis/stack-addr-ps.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 #include <stdlib.h>
 
diff --git a/test/Analysis/uninit-msg-expr.m b/test/Analysis/uninit-msg-expr.m
index aad1a72..161ab80 100644
--- a/test/Analysis/uninit-msg-expr.m
+++ b/test/Analysis/uninit-msg-expr.m
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 //===----------------------------------------------------------------------===//
 // The following code is reduced using delta-debugging from
diff --git a/test/Analysis/uninit-ps-rdar6145427.m b/test/Analysis/uninit-ps-rdar6145427.m
index 126a594..49eb269 100644
--- a/test/Analysis/uninit-ps-rdar6145427.m
+++ b/test/Analysis/uninit-ps-rdar6145427.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -verify -analyzer-store=basic -checker-cfref %s &&
-// RUN: clang -analyze -verify -analyzer-store=region -checker-cfref %s
+// RUN: clang-cc -analyze -verify -analyzer-store=basic -checker-cfref %s &&
+// RUN: clang-cc -analyze -verify -analyzer-store=region -checker-cfref %s
 
 // Delta-Debugging reduced preamble.
 typedef signed char BOOL;
diff --git a/test/Analysis/uninit-vals-ps-region.c b/test/Analysis/uninit-vals-ps-region.c
index 7e3d711..6f3762e 100644
--- a/test/Analysis/uninit-vals-ps-region.c
+++ b/test/Analysis/uninit-vals-ps-region.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=region -verify %s
 
 struct s {
   int data;
diff --git a/test/Analysis/uninit-vals-ps.c b/test/Analysis/uninit-vals-ps.c
index 659bee7..37075a2 100644
--- a/test/Analysis/uninit-vals-ps.c
+++ b/test/Analysis/uninit-vals-ps.c
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 struct FPRec {
   void (*my_func)(int * x);  
diff --git a/test/Analysis/uninit-vals.c b/test/Analysis/uninit-vals.c
index 2f2c33d..bb0b8a4 100644
--- a/test/Analysis/uninit-vals.c
+++ b/test/Analysis/uninit-vals.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-uninit-values -verify %s
+// RUN: clang-cc -analyze -warn-uninit-values -verify %s
 
 int f1() {
   int x;
diff --git a/test/Analysis/uninit-vals.m b/test/Analysis/uninit-vals.m
index 85efe57..7be247e 100644
--- a/test/Analysis/uninit-vals.m
+++ b/test/Analysis/uninit-vals.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
 
 typedef unsigned int NSUInteger;
 
diff --git a/test/Analysis/unused-ivars.m b/test/Analysis/unused-ivars.m
index f1568da..632b395 100644
--- a/test/Analysis/unused-ivars.m
+++ b/test/Analysis/unused-ivars.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-objc-unused-ivars %s -verify
+// RUN: clang-cc -analyze -warn-objc-unused-ivars %s -verify
 
 @interface A
 {
diff --git a/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c b/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
index 74203c5..3b15824 100644
--- a/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
+++ b/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 int array[] = {1, 2, 3, 4, 5};
 
diff --git a/test/CodeGen/2008-02-07-bitfield-bug.c b/test/CodeGen/2008-02-07-bitfield-bug.c
index 65f5411..dc2ebb7 100644
--- a/test/CodeGen/2008-02-07-bitfield-bug.c
+++ b/test/CodeGen/2008-02-07-bitfield-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 // PR1990
 
 struct test {
diff --git a/test/CodeGen/2008-02-08-bitfield-bug.c b/test/CodeGen/2008-02-08-bitfield-bug.c
index 3818e96..fc69e58 100644
--- a/test/CodeGen/2008-02-08-bitfield-bug.c
+++ b/test/CodeGen/2008-02-08-bitfield-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 struct test {
   unsigned a:1;
diff --git a/test/CodeGen/2008-02-26-inline-asm-bug.c b/test/CodeGen/2008-02-26-inline-asm-bug.c
index 668b06c..a6816f5 100644
--- a/test/CodeGen/2008-02-26-inline-asm-bug.c
+++ b/test/CodeGen/2008-02-26-inline-asm-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep "\$0,\$1"
+// RUN: clang-cc -emit-llvm < %s | grep "\$0,\$1"
 
 void f() {
   int d1, d2;
diff --git a/test/CodeGen/2008-07-17-no-emit-on-error.c b/test/CodeGen/2008-07-17-no-emit-on-error.c
index 1d3c87b..89aeb18 100644
--- a/test/CodeGen/2008-07-17-no-emit-on-error.c
+++ b/test/CodeGen/2008-07-17-no-emit-on-error.c
@@ -1,5 +1,5 @@
 // RUN: rm -f %t1.bc 
-// RUN: not clang %s -emit-llvm-bc -o %t1.bc
+// RUN: not clang-cc %s -emit-llvm-bc -o %t1.bc
 // RUN: not test -f %t1.bc
 
 void f() {
diff --git a/test/CodeGen/2008-07-21-mixed-var-fn-decl.c b/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
index a7d0976..c55c86b 100644
--- a/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
+++ b/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | grep -e "@g[0-9] " | count 2
+// RUN: clang-cc -emit-llvm -o - %s | grep -e "@g[0-9] " | count 2
 
 int g0, f0();
 int f1(), g1;
diff --git a/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c b/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
index a970851..19bf9a2 100644
--- a/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
+++ b/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o %t %s &&
+// RUN: clang-cc --emit-llvm -o %t %s &&
 // RUN: grep "i8 52" %t | count 1
 
 struct et7 {
diff --git a/test/CodeGen/2008-07-22-packed-bitfield-access.c b/test/CodeGen/2008-07-22-packed-bitfield-access.c
index b41b5e0..437a4be 100644
--- a/test/CodeGen/2008-07-22-packed-bitfield-access.c
+++ b/test/CodeGen/2008-07-22-packed-bitfield-access.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 
 int main () {
   struct foo {
diff --git a/test/CodeGen/2008-07-29-override-alias-decl.c b/test/CodeGen/2008-07-29-override-alias-decl.c
index 115cc33..43f4e3e 100644
--- a/test/CodeGen/2008-07-29-override-alias-decl.c
+++ b/test/CodeGen/2008-07-29-override-alias-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | grep -e "^@f" | count 1
+// RUN: clang-cc -emit-llvm -o - %s | grep -e "^@f" | count 1
 
 int x() {}
 
diff --git a/test/CodeGen/2008-07-30-implicit-initialization.c b/test/CodeGen/2008-07-30-implicit-initialization.c
index 9dd05bf..2f4c14e 100644
--- a/test/CodeGen/2008-07-30-implicit-initialization.c
+++ b/test/CodeGen/2008-07-30-implicit-initialization.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 2 &&
 // RUN: grep "ret i32 0" %t | count 2
 // <rdar://problem/6113085>
diff --git a/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c b/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
index f7c2908..c374f8d 100644
--- a/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
+++ b/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o - %s
+// RUN: clang-cc --emit-llvm -o - %s
 // <rdar://problem/6108358>
 
 /* For posterity, the issue here begins initial "char []" decl for
diff --git a/test/CodeGen/2008-07-31-asm-labels.c b/test/CodeGen/2008-07-31-asm-labels.c
index 8aba2d3..f114f65 100644
--- a/test/CodeGen/2008-07-31-asm-labels.c
+++ b/test/CodeGen/2008-07-31-asm-labels.c
@@ -1,9 +1,9 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
 // RUN: grep "@pipe()" %t | count 0 &&
 // RUN: grep '_thisIsNotAPipe' %t | count 3 &&
 // RUN: grep 'g0' %t | count 0 &&
 // RUN: grep '_renamed' %t | count 2 &&
-// RUN: clang -DUSE_DEF -emit-llvm -o %t %s &&
+// RUN: clang-cc -DUSE_DEF -emit-llvm -o %t %s &&
 // RUN: grep "@pipe()" %t | count 0 &&
 // RUN: grep '_thisIsNotAPipe' %t | count 3
 // <rdr://6116729>
diff --git a/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c b/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
index f1243dc..0ce4ba6 100644
--- a/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
+++ b/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis | grep "ret i32 1" | count 3
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis | grep "ret i32 1" | count 3
 // <rdr://6115726>
 
 int f0() {
diff --git a/test/CodeGen/2008-08-04-void-pointer-arithmetic.c b/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
index fc54dca..22815f3 100644
--- a/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
+++ b/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o - %s
+// RUN: clang-cc --emit-llvm -o - %s
 // <rdar://problem/6122967>
 
 int f0(void *a, void *b) {
diff --git a/test/CodeGen/2008-08-19-cast-of-typedef.c b/test/CodeGen/2008-08-19-cast-of-typedef.c
index 581c793..3db5e90 100644
--- a/test/CodeGen/2008-08-19-cast-of-typedef.c
+++ b/test/CodeGen/2008-08-19-cast-of-typedef.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 typedef short T[4];
 struct s {
diff --git a/test/CodeGen/2008-08-25-incompatible-cond-expr.m b/test/CodeGen/2008-08-25-incompatible-cond-expr.m
index c589355..3cc42d8 100644
--- a/test/CodeGen/2008-08-25-incompatible-cond-expr.m
+++ b/test/CodeGen/2008-08-25-incompatible-cond-expr.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @protocol P0
 @end
diff --git a/test/CodeGen/2008-09-22-bad-switch-type.c b/test/CodeGen/2008-09-22-bad-switch-type.c
index 62a420e..2526dd9 100644
--- a/test/CodeGen/2008-09-22-bad-switch-type.c
+++ b/test/CodeGen/2008-09-22-bad-switch-type.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 // PR2817
 
 void f0(void) {
diff --git a/test/CodeGen/2008-12-02-logical-or-fold.c b/test/CodeGen/2008-12-02-logical-or-fold.c
index ba8f86c..d54bf28 100644
--- a/test/CodeGen/2008-12-02-logical-or-fold.c
+++ b/test/CodeGen/2008-12-02-logical-or-fold.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | grep "store i32 1"
+// RUN: clang-cc -emit-llvm -o - %s | grep "store i32 1"
 // PR3150
 
 int a() {return 1||1;}
diff --git a/test/CodeGen/2009-01-21-invalid-debug-info.m b/test/CodeGen/2009-01-21-invalid-debug-info.m
index 509a6fb..9a955a1 100644
--- a/test/CodeGen/2009-01-21-invalid-debug-info.m
+++ b/test/CodeGen/2009-01-21-invalid-debug-info.m
@@ -1,4 +1,4 @@
-// RUN: clang -S -g -o %t.s %s
+// RUN: clang-cc -S -g -o %t.s %s
 
 // FIXME: This test case can be removed at some point (since it will
 // no longer effectively test anything). The reason it was causing
diff --git a/test/CodeGen/2009-03-22-increment-bitfield.c b/test/CodeGen/2009-03-22-increment-bitfield.c
index 7a18cea..f0aaafd 100644
--- a/test/CodeGen/2009-03-22-increment-bitfield.c
+++ b/test/CodeGen/2009-03-22-increment-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -O1 < %s | grep "ret i32 0"
+// RUN: clang-cc -emit-llvm -O1 < %s | grep "ret i32 0"
 
 int a(void) {
   return ++(struct x {unsigned x : 2;}){3}.x;
diff --git a/test/CodeGen/OpaqueStruct.c b/test/CodeGen/OpaqueStruct.c
index f005f2a..b994c30 100644
--- a/test/CodeGen/OpaqueStruct.c
+++ b/test/CodeGen/OpaqueStruct.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 typedef struct a b;
 
 b* x;
diff --git a/test/CodeGen/PR2001-bitfield-reload.c b/test/CodeGen/PR2001-bitfield-reload.c
index 7474f3e..797b494 100644
--- a/test/CodeGen/PR2001-bitfield-reload.c
+++ b/test/CodeGen/PR2001-bitfield-reload.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 1 &&
 // RUN: grep "ret i32 1" %t | count 1
 // PR2001
diff --git a/test/CodeGen/PR2413-void-address-cast-error.c b/test/CodeGen/PR2413-void-address-cast-error.c
index 9a66471..95a4c6d 100644
--- a/test/CodeGen/PR2413-void-address-cast-error.c
+++ b/test/CodeGen/PR2413-void-address-cast-error.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
 void f()
 {
         void *addr;
diff --git a/test/CodeGen/PR2643-null-store-to-bitfield.c b/test/CodeGen/PR2643-null-store-to-bitfield.c
index 4fef842..6a5b0e9 100644
--- a/test/CodeGen/PR2643-null-store-to-bitfield.c
+++ b/test/CodeGen/PR2643-null-store-to-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s
+// RUN: clang-cc -emit-llvm -o - %s
 // PR2643
 
 void foo() {
diff --git a/test/CodeGen/PR2743-reference-missing-static.c b/test/CodeGen/PR2743-reference-missing-static.c
index 007a22f..e152c52 100644
--- a/test/CodeGen/PR2743-reference-missing-static.c
+++ b/test/CodeGen/PR2743-reference-missing-static.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 // PR2743
 // <rdr://6094512>
 
diff --git a/test/CodeGen/PR3130-cond-constant.c b/test/CodeGen/PR3130-cond-constant.c
index 7aa2ce1..e488eeb 100644
--- a/test/CodeGen/PR3130-cond-constant.c
+++ b/test/CodeGen/PR3130-cond-constant.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
 
 int a = 2.0 ? 1 : 2;
diff --git a/test/CodeGen/PR3589-freestanding-libcalls.c b/test/CodeGen/PR3589-freestanding-libcalls.c
index 61852e3..90b5fff 100644
--- a/test/CodeGen/PR3589-freestanding-libcalls.c
+++ b/test/CodeGen/PR3589-freestanding-libcalls.c
@@ -1,6 +1,6 @@
-// RUN: clang -emit-llvm %s -o - | grep 'declare i32 @printf' | count 1 &&
-// RUN: clang -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 1 &&
-// RUN: clang -ffreestanding -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 0
+// RUN: clang-cc -emit-llvm %s -o - | grep 'declare i32 @printf' | count 1 &&
+// RUN: clang-cc -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 1 &&
+// RUN: clang-cc -ffreestanding -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 0
 
 #include <stdio.h>
 
diff --git a/test/CodeGen/PR3613-static-decl.c b/test/CodeGen/PR3613-static-decl.c
index 6dcaa18..365b9b2 100644
--- a/test/CodeGen/PR3613-static-decl.c
+++ b/test/CodeGen/PR3613-static-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o %t %s &&
 // RUN: grep '@g0 = internal global .struct.s0 <{ i32 3 }>' %t | count 1
 
 struct s0 {
diff --git a/test/CodeGen/PR3709-int-to-pointer-sign.c b/test/CodeGen/PR3709-int-to-pointer-sign.c
index 85944a3..24c42f6 100644
--- a/test/CodeGen/PR3709-int-to-pointer-sign.c
+++ b/test/CodeGen/PR3709-int-to-pointer-sign.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - -O1 -triple=x86_64-gnu-linux | grep "i64 -1"
+// RUN: clang-cc -emit-llvm %s -o - -O1 -triple=x86_64-gnu-linux | grep "i64 -1"
 
 // PR3709
 long long a() { return (long long)(int*)-1;}
diff --git a/test/CodeGen/address-space-cast.c b/test/CodeGen/address-space-cast.c
index 473c8e0..2fba5ec 100644
--- a/test/CodeGen/address-space-cast.c
+++ b/test/CodeGen/address-space-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s
+// RUN: clang-cc -emit-llvm < %s
 
 volatile unsigned char* const __attribute__((address_space(1))) serial_ctrl = 0x02;
 
diff --git a/test/CodeGen/address-space.c b/test/CodeGen/address-space.c
index 46b194e..3b6a8e6 100644
--- a/test/CodeGen/address-space.c
+++ b/test/CodeGen/address-space.c
@@ -1,8 +1,8 @@
-// RUN: clang -emit-llvm < %s | grep '@foo.*global.*addrspace(1)' &&
-// RUN: clang -emit-llvm < %s | grep '@ban.*global.*addrspace(1)' &&
-// RUN: clang -emit-llvm < %s | grep 'load.*addrspace(1)' | count 2 &&
-// RUN: clang -emit-llvm < %s | grep 'load.*addrspace(2).. @A' &&
-// RUN: clang -emit-llvm < %s | grep 'load.*addrspace(2).. @B'
+// RUN: clang-cc -emit-llvm < %s | grep '@foo.*global.*addrspace(1)' &&
+// RUN: clang-cc -emit-llvm < %s | grep '@ban.*global.*addrspace(1)' &&
+// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(1)' | count 2 &&
+// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(2).. @A' &&
+// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(2).. @B'
 
 int foo __attribute__((address_space(1)));
 int ban[10] __attribute__((address_space(1)));
diff --git a/test/CodeGen/alias.c b/test/CodeGen/alias.c
index 8fa788a..c1a3baa 100644
--- a/test/CodeGen/alias.c
+++ b/test/CodeGen/alias.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-pc-linux-gnu -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s &&
 // RUN: grep '@g0 = common global i32 0' %t &&
 // RUN: grep '@f1 = alias void ()\* @f0' %t &&
 // RUN: grep '@g1 = alias i32\* @g0' %t &&
diff --git a/test/CodeGen/align-local.c b/test/CodeGen/align-local.c
index 46f83fa..afbe1d5 100644
--- a/test/CodeGen/align-local.c
+++ b/test/CodeGen/align-local.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep "align 16" | count 2
+// RUN: clang-cc -emit-llvm < %s | grep "align 16" | count 2
 
 typedef struct __attribute((aligned(16))) {int x[4];} ff;
 
diff --git a/test/CodeGen/alignof.c b/test/CodeGen/alignof.c
index edeb0db..d39f4e4 100644
--- a/test/CodeGen/alignof.c
+++ b/test/CodeGen/alignof.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -O1 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -O1 -emit-llvm -o %t %s &&
 // RUN: grep 'ret i32 4' %t
 
 enum e0 { E0 };
diff --git a/test/CodeGen/array.c b/test/CodeGen/array.c
index ed56b5b..5bcc26e 100644
--- a/test/CodeGen/array.c
+++ b/test/CodeGen/array.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 int f() {
  int a[2];
diff --git a/test/CodeGen/asm.c b/test/CodeGen/asm.c
index d6030a6..91d6320 100644
--- a/test/CodeGen/asm.c
+++ b/test/CodeGen/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t -arch=i386 &&
+// RUN: clang-cc -emit-llvm %s -o %t -arch=i386 &&
 void t1(int len) {
   __asm__ volatile("" : "=&r"(len), "+&r"(len));
 }
diff --git a/test/CodeGen/atomic.c b/test/CodeGen/atomic.c
index bfebd34..0e2d850 100644
--- a/test/CodeGen/atomic.c
+++ b/test/CodeGen/atomic.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - > %t1 &&
+// RUN: clang-cc %s -emit-llvm -o - > %t1 &&
 // RUN: grep @llvm.atomic.load.add.i32 %t1 &&
 // RUN: grep @llvm.atomic.load.sub.i32 %t1 &&
 // RUN: grep @llvm.atomic.load.min.i32 %t1 &&
diff --git a/test/CodeGen/attr-nodebug.c b/test/CodeGen/attr-nodebug.c
index c9778c4..b96ad26 100644
--- a/test/CodeGen/attr-nodebug.c
+++ b/test/CodeGen/attr-nodebug.c
@@ -1,4 +1,4 @@
-// RUN: clang -g -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -emit-llvm -o %t %s &&
 // RUN: not grep 'call void @llvm.dbg.func.start' %t
 
 void t1() __attribute__((nodebug));
diff --git a/test/CodeGen/attr-noinline.c b/test/CodeGen/attr-noinline.c
index 5aacf64..199c291 100644
--- a/test/CodeGen/attr-noinline.c
+++ b/test/CodeGen/attr-noinline.c
@@ -1,4 +1,4 @@
-// RUN: clang -g -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -emit-llvm -o %t %s &&
 // RUN: grep 'noinline' %t
 
 void t1() __attribute__((noinline));
diff --git a/test/CodeGen/attr-used.c b/test/CodeGen/attr-used.c
index c7f6760..8521ffd 100644
--- a/test/CodeGen/attr-used.c
+++ b/test/CodeGen/attr-used.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
 // RUN: grep '@llvm.used = .*@g0' %t &&
 // RUN: grep '@llvm.used = .*@f0' %t &&
 // RUN: grep '@llvm.used = .*@f1.l0' %t
diff --git a/test/CodeGen/attributes.c b/test/CodeGen/attributes.c
index 25b9fd0..d45d512 100644
--- a/test/CodeGen/attributes.c
+++ b/test/CodeGen/attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
 // RUN: grep 't1.*noreturn' %t &&
 // RUN: grep 't2.*nounwind' %t &&
 // RUN: grep 'weak.*t3' %t &&
diff --git a/test/CodeGen/bitfield-assign.c b/test/CodeGen/bitfield-assign.c
index 0453d77..05d4dda 100644
--- a/test/CodeGen/bitfield-assign.c
+++ b/test/CodeGen/bitfield-assign.c
@@ -4,12 +4,12 @@
 /* Check that we get one load for each simple assign and two for the
    compound assign (load the old value before the add then load again
    to store back). Also check that our g0 pattern is good. */
-// RUN: clang -triple i386-unknown-unknown -O0 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -O0 -emit-llvm -o %t %s &&
 // RUN: grep 'load ' %t | count 5 &&
 // RUN: grep "@g0" %t | count 4 &&
 
 // Check that we got the right value.
-// RUN: clang -triple i386-unknown-unknown -O3 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -O3 -emit-llvm -o %t %s &&
 // RUN: grep 'load ' %t | count 0 &&
 // RUN: grep "@g0" %t | count 0
 
diff --git a/test/CodeGen/bitfield-init.c b/test/CodeGen/bitfield-init.c
index 1749bd3..f0cc0b1 100644
--- a/test/CodeGen/bitfield-init.c
+++ b/test/CodeGen/bitfield-init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 typedef struct { unsigned int i: 1; } c;
 const c d = { 1 };
 
diff --git a/test/CodeGen/bitfield.c b/test/CodeGen/bitfield.c
index 6473d07..da9a148 100644
--- a/test/CodeGen/bitfield.c
+++ b/test/CodeGen/bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 4 &&
 // RUN: grep "ret i32 1" %t | count 4
 
diff --git a/test/CodeGen/blocks-1.c b/test/CodeGen/blocks-1.c
index 54a8351..5fbe76c 100644
--- a/test/CodeGen/blocks-1.c
+++ b/test/CodeGen/blocks-1.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t -fblocks -f__block &&
+// RUN: clang-cc %s -emit-llvm -o %t -fblocks -f__block &&
 // RUN: grep "_Block_object_dispose" %t | count 15 &&
 // RUN: grep "__copy_helper_block_" %t | count 12 &&
 // RUN: grep "__destroy_helper_block_" %t | count 12 &&
diff --git a/test/CodeGen/blocks.c b/test/CodeGen/blocks.c
index d3d4cef..4dfe553 100644
--- a/test/CodeGen/blocks.c
+++ b/test/CodeGen/blocks.c
@@ -1,2 +1,2 @@
-// RUN: clang %s -emit-llvm -o %t -fblocks
+// RUN: clang-cc %s -emit-llvm -o %t -fblocks
 void (^f)(void) = ^{};
diff --git a/test/CodeGen/bool-bitfield.c b/test/CodeGen/bool-bitfield.c
index d50927f..50990a4 100644
--- a/test/CodeGen/bool-bitfield.c
+++ b/test/CodeGen/bool-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 // From GCC PR19331
 struct SysParams
diff --git a/test/CodeGen/bool-convert.c b/test/CodeGen/bool-convert.c
index 5e8bae1..4df81bb 100644
--- a/test/CodeGen/bool-convert.c
+++ b/test/CodeGen/bool-convert.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep i1 | count 1
+// RUN: clang-cc -emit-llvm < %s | grep i1 | count 1
 // All of these should uses the memory representation of _Bool
 struct teststruct1 {_Bool a, b;} test1;
 _Bool* test2;
diff --git a/test/CodeGen/bool-init.c b/test/CodeGen/bool-init.c
index 2e5d56a..7d331ed 100644
--- a/test/CodeGen/bool-init.c
+++ b/test/CodeGen/bool-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep i1 | count 1
+// RUN: clang-cc -emit-llvm < %s | grep i1 | count 1
 
 // Check that the type of this global isn't i1
 _Bool test = &test;
diff --git a/test/CodeGen/boolassign.c b/test/CodeGen/boolassign.c
index 0d4bf49..2d14f8c 100644
--- a/test/CodeGen/boolassign.c
+++ b/test/CodeGen/boolassign.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 int testBoolAssign(void) {
 int ss;
diff --git a/test/CodeGen/builtin-count-zeros.c b/test/CodeGen/builtin-count-zeros.c
index 5453cb1..374acc4 100644
--- a/test/CodeGen/builtin-count-zeros.c
+++ b/test/CodeGen/builtin-count-zeros.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep 'cttz' | count 2 &&
-// RUN: clang -emit-llvm %s -o - | grep 'ctlz' | count 2
+// RUN: clang-cc -emit-llvm %s -o - | grep 'cttz' | count 2 &&
+// RUN: clang-cc -emit-llvm %s -o - | grep 'ctlz' | count 2
 
 int a(int a) {return __builtin_ctz(a) + __builtin_clz(a);}
diff --git a/test/CodeGen/builtin-memfns.c b/test/CodeGen/builtin-memfns.c
index 52b3a1d..e9e2396 100644
--- a/test/CodeGen/builtin-memfns.c
+++ b/test/CodeGen/builtin-memfns.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -emit-llvm -o %t %s &&
 // RUN: grep '@llvm.memset.i32' %t &&
 // RUN: grep '@llvm.memcpy.i32' %t &&
 // RUN: grep '@llvm.memmove.i32' %t &&
diff --git a/test/CodeGen/builtin-rename.c b/test/CodeGen/builtin-rename.c
index b5e4fef..d0b5c24 100644
--- a/test/CodeGen/builtin-rename.c
+++ b/test/CodeGen/builtin-rename.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - | grep 'declare.*printf' | count 1
+// RUN: clang-cc %s -emit-llvm -o - | grep 'declare.*printf' | count 1
 // PR3612
 
 int printf(const char *, ...);
diff --git a/test/CodeGen/builtin-stackaddress.c b/test/CodeGen/builtin-stackaddress.c
index ddfb9dc..5c6d540 100644
--- a/test/CodeGen/builtin-stackaddress.c
+++ b/test/CodeGen/builtin-stackaddress.c
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm < %s | grep "llvm.returnaddress" &&
-// RUN: clang -emit-llvm < %s | grep "llvm.frameaddress"
+// RUN: clang-cc -emit-llvm < %s | grep "llvm.returnaddress" &&
+// RUN: clang-cc -emit-llvm < %s | grep "llvm.frameaddress"
 void* a(unsigned x) {
 return __builtin_return_address(0);
 }
diff --git a/test/CodeGen/builtinmemcpy.c b/test/CodeGen/builtinmemcpy.c
index 8600d98..d1fdebb 100644
--- a/test/CodeGen/builtinmemcpy.c
+++ b/test/CodeGen/builtinmemcpy.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-llvm < %s -o - | grep "llvm.memcpy"
+// RUN: clang-cc -emit-llvm < %s -o - | grep "llvm.memcpy"
 
 char* x(char* a, char* b) {return __builtin_memcpy(a, b, 4);}
diff --git a/test/CodeGen/builtins-ffs_parity_popcount.c b/test/CodeGen/builtins-ffs_parity_popcount.c
index 19a5cf9..4746998 100644
--- a/test/CodeGen/builtins-ffs_parity_popcount.c
+++ b/test/CodeGen/builtins-ffs_parity_popcount.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s > %t
+// RUN: clang-cc -emit-llvm -o - %s > %t
 // RUN: ! grep "__builtin" %t
 
 #include <stdio.h>
diff --git a/test/CodeGen/builtins-powi.c b/test/CodeGen/builtins-powi.c
index 6d82f8a..73f752f 100644
--- a/test/CodeGen/builtins-powi.c
+++ b/test/CodeGen/builtins-powi.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s > %t
+// RUN: clang-cc -emit-llvm -o - %s > %t
 // RUN: ! grep "__builtin" %t
 
 #include <stdio.h>
diff --git a/test/CodeGen/builtins-x86.c b/test/CodeGen/builtins-x86.c
index 5e1aea4..17c2840 100644
--- a/test/CodeGen/builtins-x86.c
+++ b/test/CodeGen/builtins-x86.c
@@ -1,5 +1,5 @@
-// RUN: clang -DUSE_64 -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -DUSE_ALL -triple x86_64-unknown-unknown -fsyntax-only -o %t %s
+// RUN: clang-cc -DUSE_64 -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -DUSE_ALL -triple x86_64-unknown-unknown -fsyntax-only -o %t %s
 
 #ifdef USE_ALL
 #define USE_3DNOW
diff --git a/test/CodeGen/builtins.c b/test/CodeGen/builtins.c
index 7a5e5d9..d14a29e 100644
--- a/test/CodeGen/builtins.c
+++ b/test/CodeGen/builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
 // RUN: not grep __builtin %t
 
 #include <stdio.h>
diff --git a/test/CodeGen/builtinshufflevector.c b/test/CodeGen/builtinshufflevector.c
index de499f8..9a3ae61 100644
--- a/test/CodeGen/builtinshufflevector.c
+++ b/test/CodeGen/builtinshufflevector.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep 'shufflevector' | count 1
+// RUN: clang-cc -emit-llvm < %s | grep 'shufflevector' | count 1
 typedef int v4si __attribute__ ((vector_size (16)));
 
 v4si a(v4si x, v4si y) {return __builtin_shufflevector(x, y, 3, 2, 5, 7);}
diff --git a/test/CodeGen/c-strings.c b/test/CodeGen/c-strings.c
index a5a7ccd..ee85f60 100644
--- a/test/CodeGen/c-strings.c
+++ b/test/CodeGen/c-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
 // RUN: grep "hello" %t | count 3 &&
 // RUN: grep 'c"hello\\00"' %t | count 2 &&
 // RUN: grep 'c"hello\\00\\00\\00"' %t | count 1 &&
diff --git a/test/CodeGen/cast-to-union.c b/test/CodeGen/cast-to-union.c
index 9f0b080..03aee3e 100644
--- a/test/CodeGen/cast-to-union.c
+++ b/test/CodeGen/cast-to-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -o %t &&
+// RUN: clang-cc -emit-llvm < %s -o %t &&
 // RUN: grep "store i32 351, i32*" %t &&
 // RUN: grep "w = global %0 <{ i32 2, i8 0, i8 0, i8 0, i8 0 }>" %t &&
 // RUN: grep "y = global %1 <{ double 7.300000e+01 }>" %t
diff --git a/test/CodeGen/cast.c b/test/CodeGen/cast.c
index 00dd4c8..6fb2b11 100644
--- a/test/CodeGen/cast.c
+++ b/test/CodeGen/cast.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 extern void go(const void *p);
 float v[2] = { 0.0, 1.0 };
diff --git a/test/CodeGen/cfstring.c b/test/CodeGen/cfstring.c
index 3bd1a2d..a78dfda 100644
--- a/test/CodeGen/cfstring.c
+++ b/test/CodeGen/cfstring.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 #define CFSTR __builtin___CFStringMakeConstantString
 
 void f() {
diff --git a/test/CodeGen/cfstring2.c b/test/CodeGen/cfstring2.c
index f92dc8c..7b808b4 100644
--- a/test/CodeGen/cfstring2.c
+++ b/test/CodeGen/cfstring2.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 #ifdef __APPLE__
 #include <Carbon/Carbon.h>
diff --git a/test/CodeGen/cleanup-stack.c b/test/CodeGen/cleanup-stack.c
index cc734e6..3a13432 100644
--- a/test/CodeGen/cleanup-stack.c
+++ b/test/CodeGen/cleanup-stack.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t &&
+// RUN: clang-cc -emit-llvm %s -o %t &&
 // RUN: grep "store i32 0, i32\* %cleanup" %t | count 2
 void f(int n) {
   int a[n];
diff --git a/test/CodeGen/complex.c b/test/CodeGen/complex.c
index 9c0e3d5..75fae79 100644
--- a/test/CodeGen/complex.c
+++ b/test/CodeGen/complex.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s
+// RUN: clang-cc -emit-llvm < %s
 
 int main(void)
 {
diff --git a/test/CodeGen/compound-literal.c b/test/CodeGen/compound-literal.c
index a99ffe8..ef04367 100644
--- a/test/CodeGen/compound-literal.c
+++ b/test/CodeGen/compound-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm
+// RUN: clang-cc < %s -emit-llvm
 
 int* a = &(int){1};
 struct s {int a, b, c;} * b = &(struct s) {1, 2, 3};
diff --git a/test/CodeGen/compound.c b/test/CodeGen/compound.c
index c8afcee..c546007 100644
--- a/test/CodeGen/compound.c
+++ b/test/CodeGen/compound.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm
+// RUN: clang-cc < %s -emit-llvm
 int A;
 long long B;
 int C;
diff --git a/test/CodeGen/conditional-gnu-ext.c b/test/CodeGen/conditional-gnu-ext.c
index c3ff2bd..1483d8a 100644
--- a/test/CodeGen/conditional-gnu-ext.c
+++ b/test/CodeGen/conditional-gnu-ext.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 // PR1824
 
 int foo(int x, short y) {
diff --git a/test/CodeGen/conditional.c b/test/CodeGen/conditional.c
index 81e5ff5..22286705 100644
--- a/test/CodeGen/conditional.c
+++ b/test/CodeGen/conditional.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 float test1(int cond, float a, float b)
 {
diff --git a/test/CodeGen/const-init.c b/test/CodeGen/const-init.c
index 30fc755..e7b83a3 100644
--- a/test/CodeGen/const-init.c
+++ b/test/CodeGen/const-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -verify -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -verify -emit-llvm -o %t %s &&
 
 #include <stdint.h>
 
diff --git a/test/CodeGen/const-label-addr.c b/test/CodeGen/const-label-addr.c
index 1ae74e5..f8c35c6 100644
--- a/test/CodeGen/const-label-addr.c
+++ b/test/CodeGen/const-label-addr.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 int a() {
 A:;static void* a = &&A;
 }
diff --git a/test/CodeGen/constant-comparison.c b/test/CodeGen/constant-comparison.c
index b7b2a0e..ea3e896 100644
--- a/test/CodeGen/constant-comparison.c
+++ b/test/CodeGen/constant-comparison.c
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm %s -o - 2>&1 | not grep warning &&
-// RUN: clang -emit-llvm %s -o - | grep @b | count 1
+// RUN: clang-cc -emit-llvm %s -o - 2>&1 | not grep warning &&
+// RUN: clang-cc -emit-llvm %s -o - | grep @b | count 1
 
 int a, b;
 int *c1 = 1 < 2 ? &a : &b;
diff --git a/test/CodeGen/constructor-attribute.c b/test/CodeGen/constructor-attribute.c
index f75fa4f..9a1fa76 100644
--- a/test/CodeGen/constructor-attribute.c
+++ b/test/CodeGen/constructor-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
 // RUN: grep -e "global_ctors.*@A" %t &&
 // RUN: grep -e "global_dtors.*@B" %t &&
 // RUN: grep -e "global_ctors.*@C" %t &&
diff --git a/test/CodeGen/cxx-condition.cpp b/test/CodeGen/cxx-condition.cpp
index 746aadd..330a17a 100644
--- a/test/CodeGen/cxx-condition.cpp
+++ b/test/CodeGen/cxx-condition.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 void f() {
   int a;
diff --git a/test/CodeGen/cxx-default-arg.cpp b/test/CodeGen/cxx-default-arg.cpp
index 017b17d..8391b9c 100644
--- a/test/CodeGen/cxx-default-arg.cpp
+++ b/test/CodeGen/cxx-default-arg.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 // Note: define CLANG_GENERATE_KNOWN_GOOD and compile to generate code
 // that makes all of the defaulted arguments explicit. The resulting
diff --git a/test/CodeGen/cxx-value-init.cpp b/test/CodeGen/cxx-value-init.cpp
index 50e08db..e238698 100644
--- a/test/CodeGen/cxx-value-init.cpp
+++ b/test/CodeGen/cxx-value-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 enum E {};
 int v1 = E();
diff --git a/test/CodeGen/debug-info.c b/test/CodeGen/debug-info.c
index 2ecae9f..0cb01a3 100644
--- a/test/CodeGen/debug-info.c
+++ b/test/CodeGen/debug-info.c
@@ -1,4 +1,4 @@
-// RUN: clang -o %t --emit-llvm -g %s
+// RUN: clang-cc -o %t --emit-llvm -g %s
 
 // PR3023
 void convert(void) {
diff --git a/test/CodeGen/designated-initializers.c b/test/CodeGen/designated-initializers.c
index 617c428..94d446c 100644
--- a/test/CodeGen/designated-initializers.c
+++ b/test/CodeGen/designated-initializers.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o - | grep "<{ i8\* null, i32 1024 }>"
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep "<{ i8\* null, i32 1024 }>"
 
 struct foo {
     void *a;
diff --git a/test/CodeGen/dllimport-dllexport.c b/test/CodeGen/dllimport-dllexport.c
index 306f4ee..fe49ae7 100644
--- a/test/CodeGen/dllimport-dllexport.c
+++ b/test/CodeGen/dllimport-dllexport.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -o %t &&
+// RUN: clang-cc -emit-llvm < %s -o %t &&
 // RUN: grep 'dllexport' %t | count 1 &&
 // RUN: not grep 'dllimport' %t
 
diff --git a/test/CodeGen/dostmt.c b/test/CodeGen/dostmt.c
index 63547da..4fb3dcd 100644
--- a/test/CodeGen/dostmt.c
+++ b/test/CodeGen/dostmt.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 
 int bar();
 int test0() {
diff --git a/test/CodeGen/emit-all-decls.c b/test/CodeGen/emit-all-decls.c
index 68b6aec..775cb6f 100644
--- a/test/CodeGen/emit-all-decls.c
+++ b/test/CodeGen/emit-all-decls.c
@@ -1,6 +1,6 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
 // RUN: not grep "@foo" %t &&
-// RUN: clang -femit-all-decls -emit-llvm -o %t %s &&
+// RUN: clang-cc -femit-all-decls -emit-llvm -o %t %s &&
 // RUN: grep "@foo" %t
 
 static void foo() {
diff --git a/test/CodeGen/empty-union-init.c b/test/CodeGen/empty-union-init.c
index 82ff84d..8448b3d 100644
--- a/test/CodeGen/empty-union-init.c
+++ b/test/CodeGen/empty-union-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -o -
+// RUN: clang-cc -emit-llvm < %s -o -
 // PR2419
 
 struct Mem {
diff --git a/test/CodeGen/enum.c b/test/CodeGen/enum.c
index 50b558d..172d308 100644
--- a/test/CodeGen/enum.c
+++ b/test/CodeGen/enum.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis | grep 'ret i32 6'
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis | grep 'ret i32 6'
 
 static enum { foo, bar = 1U } z;
 
diff --git a/test/CodeGen/exprs.c b/test/CodeGen/exprs.c
index dbc1499..808db17 100644
--- a/test/CodeGen/exprs.c
+++ b/test/CodeGen/exprs.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 
 // PR1895
 // sizeof function
diff --git a/test/CodeGen/ext-vector-shuffle.c b/test/CodeGen/ext-vector-shuffle.c
index dfeffac..37d3ed4 100644
--- a/test/CodeGen/ext-vector-shuffle.c
+++ b/test/CodeGen/ext-vector-shuffle.c
@@ -1,6 +1,6 @@
-// RUN: clang %s -emit-llvm -o - | not grep 'extractelement'
-// RUN: clang %s -emit-llvm -o - | not grep 'insertelement'
-// RUN: clang %s -emit-llvm -o - | grep 'shufflevector'
+// RUN: clang-cc %s -emit-llvm -o - | not grep 'extractelement'
+// RUN: clang-cc %s -emit-llvm -o - | not grep 'insertelement'
+// RUN: clang-cc %s -emit-llvm -o - | grep 'shufflevector'
 
 typedef __attribute__(( ext_vector_type(2) )) float float2;
 typedef __attribute__(( ext_vector_type(4) )) float float4;
diff --git a/test/CodeGen/ext-vector.c b/test/CodeGen/ext-vector.c
index 0a57397..249142a 100644
--- a/test/CodeGen/ext-vector.c
+++ b/test/CodeGen/ext-vector.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 typedef __attribute__(( ext_vector_type(4) )) float float4;
 typedef __attribute__(( ext_vector_type(2) )) float float2;
diff --git a/test/CodeGen/extern-block-var.c b/test/CodeGen/extern-block-var.c
index 3513638..e8de3e7 100644
--- a/test/CodeGen/extern-block-var.c
+++ b/test/CodeGen/extern-block-var.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 int f() {
   extern int a;
diff --git a/test/CodeGen/flexible-array-init.c b/test/CodeGen/flexible-array-init.c
index 0e2fcc6..fb98a8e 100644
--- a/test/CodeGen/flexible-array-init.c
+++ b/test/CodeGen/flexible-array-init.c
@@ -1,7 +1,7 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o - %s | grep 7 | count 1 &&
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o - %s | grep 11 | count 1 &&
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o - %s | grep 13 | count 1 &&
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o - %s | grep 15 | count 1
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | grep 7 | count 1 &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | grep 11 | count 1 &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | grep 13 | count 1 &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | grep 15 | count 1
 
 struct { int x; int y[]; } a = { 1, 7, 11 };
 
diff --git a/test/CodeGen/func-decl-cleanup.c b/test/CodeGen/func-decl-cleanup.c
index fa1e3d6..4808e12 100644
--- a/test/CodeGen/func-decl-cleanup.c
+++ b/test/CodeGen/func-decl-cleanup.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 
 
 // PR2360
diff --git a/test/CodeGen/func-return-member.c b/test/CodeGen/func-return-member.c
index f31a53a..e6fc562 100644
--- a/test/CodeGen/func-return-member.c
+++ b/test/CodeGen/func-return-member.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s 2>&1 | not grep 'cannot codegen this l-value expression yet'
+// RUN: clang-cc -emit-llvm < %s 2>&1 | not grep 'cannot codegen this l-value expression yet'
 
 struct frk { float _Complex c; int x; };
 struct faz { struct frk f; };
diff --git a/test/CodeGen/function-attributes.c b/test/CodeGen/function-attributes.c
index eb8b1e3..373eb63 100644
--- a/test/CodeGen/function-attributes.c
+++ b/test/CodeGen/function-attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o %t %s &&
 // RUN: grep 'define signext i8 @f0(i32 %x) nounwind' %t &&
 // RUN: grep 'define zeroext i8 @f1(i32 %x) nounwind' %t &&
 // RUN: grep 'define void @f2(i8 signext %x) nounwind' %t &&
diff --git a/test/CodeGen/functions.c b/test/CodeGen/functions.c
index 3b50df7..55f580b 100644
--- a/test/CodeGen/functions.c
+++ b/test/CodeGen/functions.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t &&
+// RUN: clang-cc %s -emit-llvm -o %t &&
 
 int g();
 
diff --git a/test/CodeGen/global-decls.c b/test/CodeGen/global-decls.c
index b0e35bd..f08a7dc 100644
--- a/test/CodeGen/global-decls.c
+++ b/test/CodeGen/global-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -emit-llvm -o %t %s &&
 
 // RUN: grep '@g0_ext = extern_weak global i32' %t &&
 extern int g0_ext __attribute__((weak));
diff --git a/test/CodeGen/global-init.c b/test/CodeGen/global-init.c
index 133a3b5..4b769f8 100644
--- a/test/CodeGen/global-init.c
+++ b/test/CodeGen/global-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | not grep "common"
+// RUN: clang-cc -emit-llvm -o - %s | not grep "common"
 
 // This checks that the global won't be marked as common. 
 // (It shouldn't because it's being initialized).
diff --git a/test/CodeGen/global-with-initialiser.c b/test/CodeGen/global-with-initialiser.c
index be12c24..29b4e21 100644
--- a/test/CodeGen/global-with-initialiser.c
+++ b/test/CodeGen/global-with-initialiser.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 const int globalInt = 1;
 int globalIntWithFloat = 1.5f;
diff --git a/test/CodeGen/globalinit.c b/test/CodeGen/globalinit.c
index 1bcb3e4..2798cae 100644
--- a/test/CodeGen/globalinit.c
+++ b/test/CodeGen/globalinit.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 int A[10] = { 1,2,3,4,5 };
 
diff --git a/test/CodeGen/incomplete-function-type.c b/test/CodeGen/incomplete-function-type.c
index 09e08d7..a641268 100644
--- a/test/CodeGen/incomplete-function-type.c
+++ b/test/CodeGen/incomplete-function-type.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | not grep opaque
+// RUN: clang-cc -emit-llvm %s -o - | not grep opaque
 
 enum teste1 test1f(void), (*test1)(void) = test1f;
 struct tests2 test2f(), (*test2)() = test2f;
diff --git a/test/CodeGen/indirect-goto.c b/test/CodeGen/indirect-goto.c
index 62c2726..b9a6019 100644
--- a/test/CodeGen/indirect-goto.c
+++ b/test/CodeGen/indirect-goto.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 1 &&
 // RUN: grep "ret i32 210" %t | count 1
 
diff --git a/test/CodeGen/init-with-member-expr.c b/test/CodeGen/init-with-member-expr.c
index 606f9dc..7750dbf 100644
--- a/test/CodeGen/init-with-member-expr.c
+++ b/test/CodeGen/init-with-member-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm
+// RUN: clang-cc < %s -emit-llvm
 struct test {
   int a;
 };
diff --git a/test/CodeGen/init.c b/test/CodeGen/init.c
index b53b81e..2e239cf 100644
--- a/test/CodeGen/init.c
+++ b/test/CodeGen/init.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm %s -o %t &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm %s -o %t &&
 
 void f1() {
   // Scalars in braces.
diff --git a/test/CodeGen/int-to-pointer.c b/test/CodeGen/int-to-pointer.c
index e427e73..7cefc39 100644
--- a/test/CodeGen/int-to-pointer.c
+++ b/test/CodeGen/int-to-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 void *test(int i)
 {
diff --git a/test/CodeGen/kr-func-promote.c b/test/CodeGen/kr-func-promote.c
index 2b55a39..d4c3851 100644
--- a/test/CodeGen/kr-func-promote.c
+++ b/test/CodeGen/kr-func-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 @a(i32)"
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 @a(i32)"
 
 int a();
 int a(x) short x; {return x;}
diff --git a/test/CodeGen/libcalls.c b/test/CodeGen/libcalls.c
index 9224fe1..6953216 100644
--- a/test/CodeGen/libcalls.c
+++ b/test/CodeGen/libcalls.c
@@ -1,7 +1,7 @@
-// RUN: clang -fmath-errno=1 -emit-llvm -o %t %s &&
+// RUN: clang-cc -fmath-errno=1 -emit-llvm -o %t %s &&
 // RUN: grep "declare " %t | count 6 &&
 // RUN: grep "declare " %t | grep "@llvm." | count 1 &&
-// RUN: clang -fmath-errno=0 -emit-llvm -o %t %s &&
+// RUN: clang-cc -fmath-errno=0 -emit-llvm -o %t %s &&
 // RUN: grep "declare " %t | count 6 &&
 // RUN: grep "declare " %t | grep -v "@llvm." | count 0
 
diff --git a/test/CodeGen/linkage-redecl.c b/test/CodeGen/linkage-redecl.c
index df8a993..b015ca8 100644
--- a/test/CodeGen/linkage-redecl.c
+++ b/test/CodeGen/linkage-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - |grep internal
+// RUN: clang-cc -emit-llvm %s -o - |grep internal
 
 // C99 6.2.2p3
 // PR3425
diff --git a/test/CodeGen/long-double-x86.c b/test/CodeGen/long-double-x86.c
index 8954042..b01ce0b 100644
--- a/test/CodeGen/long-double-x86.c
+++ b/test/CodeGen/long-double-x86.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep x86_fp80
+// RUN: clang-cc %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep x86_fp80
 
 long double x = 0;
 int checksize[sizeof(x) == 16 ? 1 : -1];
diff --git a/test/CodeGen/mandel.c b/test/CodeGen/mandel.c
index 388e922..6f46ee4 100644
--- a/test/CodeGen/mandel.c
+++ b/test/CodeGen/mandel.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 /* Sparc is not C99-compliant */
 #if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
diff --git a/test/CodeGen/mangle.c b/test/CodeGen/mangle.c
index 89e0e8a..6571a4b 100644
--- a/test/CodeGen/mangle.c
+++ b/test/CodeGen/mangle.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -emit-llvm -o %t %s &&
 // RUN: grep '@_Z2f0i' %t &&
 // RUN: grep '@_Z2f0l' %t &&
 
diff --git a/test/CodeGen/merge-attrs.c b/test/CodeGen/merge-attrs.c
index 3c1d62a..1aab47a 100644
--- a/test/CodeGen/merge-attrs.c
+++ b/test/CodeGen/merge-attrs.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 void *malloc(__SIZE_TYPE__ size) __attribute__ ((__nothrow__));
 
diff --git a/test/CodeGen/merge-statics.c b/test/CodeGen/merge-statics.c
index 1e0d689..c442669 100644
--- a/test/CodeGen/merge-statics.c
+++ b/test/CodeGen/merge-statics.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm | grep internal | count 1
+// RUN: clang-cc < %s -emit-llvm | grep internal | count 1
 
 // The two decls for 'a' should merge into one llvm GlobalVariable.
 
diff --git a/test/CodeGen/mmintrin-test.c b/test/CodeGen/mmintrin-test.c
index 6d68a75..97f3b3b 100644
--- a/test/CodeGen/mmintrin-test.c
+++ b/test/CodeGen/mmintrin-test.c
@@ -1,6 +1,6 @@
-// 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 define %t | count 1 &&
-// RUN: clang -triple i386-apple-darwin9 -g -emit-llvm -o %t %s && 
+// RUN: clang-cc -triple i386-apple-darwin9 -g -emit-llvm -o %t %s && 
 // RUN: grep define %t | count 1
 
 #include <mmintrin.h>
diff --git a/test/CodeGen/offsetof.c b/test/CodeGen/offsetof.c
index 7b6f503..b0f5727 100644
--- a/test/CodeGen/offsetof.c
+++ b/test/CodeGen/offsetof.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 // PR2910
 struct sockaddr_un {
diff --git a/test/CodeGen/opaque-pointer.c b/test/CodeGen/opaque-pointer.c
index ba307f4..7f78b91 100644
--- a/test/CodeGen/opaque-pointer.c
+++ b/test/CodeGen/opaque-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 struct test;
 
 typedef void (*my_func) (struct test *);
diff --git a/test/CodeGen/overloadable.c b/test/CodeGen/overloadable.c
index 4e24c91..4b58c82 100644
--- a/test/CodeGen/overloadable.c
+++ b/test/CodeGen/overloadable.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep _Z1fPA10_1X
+// RUN: clang-cc -emit-llvm %s -o - | grep _Z1fPA10_1X
 int __attribute__((overloadable)) f(int x) { return x; }
 float __attribute__((overloadable)) f(float x) { return x; }
 double __attribute__((overloadable)) f(double x) { return x; }
diff --git a/test/CodeGen/parameter-passing.c b/test/CodeGen/parameter-passing.c
index f9ff8a8..2ace299 100644
--- a/test/CodeGen/parameter-passing.c
+++ b/test/CodeGen/parameter-passing.c
@@ -5,13 +5,13 @@
 // We also check _Bool and empty structures, as these can have annoying
 // corner cases.
 
-// RUN: clang %s -triple i386-unknown-unknown -O3 -emit-llvm -o %t &&
+// RUN: clang-cc %s -triple i386-unknown-unknown -O3 -emit-llvm -o %t &&
 // RUN: not grep '@g0' %t &&
 
-// RUN: clang %s -triple x86_64-unknown-unknown -O3 -emit-llvm -o %t &&
+// RUN: clang-cc %s -triple x86_64-unknown-unknown -O3 -emit-llvm -o %t &&
 // RUN: not grep '@g0' %t &&
 
-// RUN: clang %s -triple ppc-unknown-unknown -O3 -emit-llvm -o %t &&
+// RUN: clang-cc %s -triple ppc-unknown-unknown -O3 -emit-llvm -o %t &&
 // RUN: not grep '@g0' %t &&
 // RUN: true
 
diff --git a/test/CodeGen/pointer-arithmetic.c b/test/CodeGen/pointer-arithmetic.c
index b1436b9..5049875 100644
--- a/test/CodeGen/pointer-arithmetic.c
+++ b/test/CodeGen/pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang -S %s -o -
+// RUN: clang-cc -S %s -o -
 
 typedef int Int;
 
diff --git a/test/CodeGen/pointer-cmp-type.c b/test/CodeGen/pointer-cmp-type.c
index 02fc4c7..d88c091 100644
--- a/test/CodeGen/pointer-cmp-type.c
+++ b/test/CodeGen/pointer-cmp-type.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-llvm %s -o - | grep "icmp ult"
+// RUN: clang-cc -emit-llvm %s -o - | grep "icmp ult"
 
 int a(char* a, char* b) {return a<b;}
diff --git a/test/CodeGen/pointer-to-int.c b/test/CodeGen/pointer-to-int.c
index a3eaf91..e40bd91 100644
--- a/test/CodeGen/pointer-to-int.c
+++ b/test/CodeGen/pointer-to-int.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
 
 int test(void* i)
 {
diff --git a/test/CodeGen/private-extern.c b/test/CodeGen/private-extern.c
index 8cf963d..f3ffe54 100644
--- a/test/CodeGen/private-extern.c
+++ b/test/CodeGen/private-extern.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
 // RUN: grep '@g0 = external hidden constant i32' %t &&
 // RUN: grep '@g1 = hidden constant i32 1' %t
 
diff --git a/test/CodeGen/rdr-6098585-default-after-caserange.c b/test/CodeGen/rdr-6098585-default-after-caserange.c
index c6dbb1c..3a11ad6 100644
--- a/test/CodeGen/rdr-6098585-default-after-caserange.c
+++ b/test/CodeGen/rdr-6098585-default-after-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 1 && 
 // RUN: grep "ret i32 10" %t | count 1
 
diff --git a/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c b/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
index bad9889..f1d15dc 100644
--- a/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
+++ b/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32 10" %t
 
 // Ensure that this doesn't compile to infinite loop in g() due to
diff --git a/test/CodeGen/rdr-6098585-empty-case-range.c b/test/CodeGen/rdr-6098585-empty-case-range.c
index 6da76bd..ca5ff1b 100644
--- a/test/CodeGen/rdr-6098585-empty-case-range.c
+++ b/test/CodeGen/rdr-6098585-empty-case-range.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 2 &&
 // RUN: grep "ret i32 3" %t | count 2
 
diff --git a/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c b/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
index e0fcc80..b347449 100644
--- a/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
+++ b/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32 %" %t
 
 // Make sure return is not constant (if empty range is skipped or miscompiled)
diff --git a/test/CodeGen/rdr-6098585-unsigned-caserange.c b/test/CodeGen/rdr-6098585-unsigned-caserange.c
index 1fa44c0..8003598 100644
--- a/test/CodeGen/rdr-6098585-unsigned-caserange.c
+++ b/test/CodeGen/rdr-6098585-unsigned-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
 // RUN: grep "ret i32" %t | count 1 &&
 // RUN: grep "ret i32 3" %t | count 1
 
diff --git a/test/CodeGen/shared-string-literals.c b/test/CodeGen/shared-string-literals.c
index 2e8269b..a05975b 100644
--- a/test/CodeGen/shared-string-literals.c
+++ b/test/CodeGen/shared-string-literals.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 char *globalString = "abc";
 char *globalStringArray[5] = { "123", "abc" };
diff --git a/test/CodeGen/sizeof-vla.c b/test/CodeGen/sizeof-vla.c
index d49bf12..af50885 100644
--- a/test/CodeGen/sizeof-vla.c
+++ b/test/CodeGen/sizeof-vla.c
@@ -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
 
 // PR3442
 
diff --git a/test/CodeGen/statements.c b/test/CodeGen/statements.c
index 4092121..1ff7601 100644
--- a/test/CodeGen/statements.c
+++ b/test/CodeGen/statements.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm
+// RUN: clang-cc < %s -emit-llvm
 
 void test1(int x) {
 switch (x) {
diff --git a/test/CodeGen/static-forward-decl-fun.c b/test/CodeGen/static-forward-decl-fun.c
index 69080e3..a945df3 100644
--- a/test/CodeGen/static-forward-decl-fun.c
+++ b/test/CodeGen/static-forward-decl-fun.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 static int staticfun(void);
 int (*staticuse1)(void) = staticfun;
diff --git a/test/CodeGen/static-forward-decl.c b/test/CodeGen/static-forward-decl.c
index 8e0825c..f12c22f 100644
--- a/test/CodeGen/static-forward-decl.c
+++ b/test/CodeGen/static-forward-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep "global i32 10"
+// RUN: clang-cc %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep "global i32 10"
 
 static int i;
 int*j=&i;
diff --git a/test/CodeGen/static-local-union.c b/test/CodeGen/static-local-union.c
index 9515a31..f276b20 100644
--- a/test/CodeGen/static-local-union.c
+++ b/test/CodeGen/static-local-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s
+// RUN: clang-cc -emit-llvm < %s
 
 int a() {static union{int a;} r[2] = {1,2};return r[1].a;}
 
diff --git a/test/CodeGen/static-order.c b/test/CodeGen/static-order.c
index c63f4ed..243e96b 100644
--- a/test/CodeGen/static-order.c
+++ b/test/CodeGen/static-order.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | not grep "zeroinitializer"
+// RUN: clang-cc -emit-llvm -o - %s | not grep "zeroinitializer"
 
 struct s {
     int a;
diff --git a/test/CodeGen/staticinit.c b/test/CodeGen/staticinit.c
index 384ddbf..fa3e736 100644
--- a/test/CodeGen/staticinit.c
+++ b/test/CodeGen/staticinit.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -emit-llvm -o %t %s &&
 // RUN: grep "g.b = internal global i8. getelementptr" %t &&
 
 struct AStruct { 
diff --git a/test/CodeGen/stdcall-fastcall.c b/test/CodeGen/stdcall-fastcall.c
index a599405..11b6521 100644
--- a/test/CodeGen/stdcall-fastcall.c
+++ b/test/CodeGen/stdcall-fastcall.c
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm < %s | grep 'fastcallcc' | count 4
-// RUN: clang -emit-llvm < %s | grep 'stdcallcc' | count 4
+// RUN: clang-cc -emit-llvm < %s | grep 'fastcallcc' | count 4
+// RUN: clang-cc -emit-llvm < %s | grep 'stdcallcc' | count 4
 
 void __attribute__((fastcall)) f1(void);
 void __attribute__((stdcall)) f2(void);
diff --git a/test/CodeGen/string-init.c b/test/CodeGen/string-init.c
index b2b10dc..38c7ec0 100644
--- a/test/CodeGen/string-init.c
+++ b/test/CodeGen/string-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t &&
+// RUN: clang-cc -emit-llvm %s -o %t &&
 // RUN: grep 'internal constant \[10 x i8\]' %t &&
 // RUN: not grep -F "[5 x i8]" %t &&
 // RUN: not grep "store " %t
diff --git a/test/CodeGen/string-literal.c b/test/CodeGen/string-literal.c
index ea28f1a..a401193 100644
--- a/test/CodeGen/string-literal.c
+++ b/test/CodeGen/string-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
 
 int main() {
   char a[10] = "abc";
diff --git a/test/CodeGen/struct-comma.c b/test/CodeGen/struct-comma.c
index 2930529..d7f50da 100644
--- a/test/CodeGen/struct-comma.c
+++ b/test/CodeGen/struct-comma.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 
 struct S {int a, b;} x;
 void a(struct S* b) {*b = (r(), x);}
diff --git a/test/CodeGen/struct-copy.c b/test/CodeGen/struct-copy.c
index a45e37a..62c29ab 100644
--- a/test/CodeGen/struct-copy.c
+++ b/test/CodeGen/struct-copy.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep 'call.*llvm.memcpy'
+// RUN: clang-cc -emit-llvm %s -o - | grep 'call.*llvm.memcpy'
 struct x { int a[100]; };
 
 
diff --git a/test/CodeGen/struct-init.c b/test/CodeGen/struct-init.c
index 7d9d708..a38442b 100644
--- a/test/CodeGen/struct-init.c
+++ b/test/CodeGen/struct-init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 
 typedef struct _zend_ini_entry zend_ini_entry;
 struct _zend_ini_entry {
diff --git a/test/CodeGen/struct-passing.c b/test/CodeGen/struct-passing.c
index 305101d..9a4f476 100644
--- a/test/CodeGen/struct-passing.c
+++ b/test/CodeGen/struct-passing.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-pc-linux-gnu -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s &&
 // RUN: grep 'declare i32 @f0() readnone$' %t &&
 // RUN: grep 'declare i32 @f1() readonly$' %t &&
 // RUN: grep 'declare void @f2(.* noalias sret)$' %t &&
diff --git a/test/CodeGen/struct-x86-darwin.c b/test/CodeGen/struct-x86-darwin.c
index 7a2e7de..050e26d 100644
--- a/test/CodeGen/struct-x86-darwin.c
+++ b/test/CodeGen/struct-x86-darwin.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm > %t1 -triple=i686-apple-darwin9
+// RUN: clang-cc < %s -emit-llvm > %t1 -triple=i686-apple-darwin9
 // Run  grep "STest1 = type <{ i32, \[4 x i16\], double }>" %t1 &&
 // RUN: grep "STest2 = type <{ i16, i16, i32, i32 }>" %t1 &&
 // RUN: grep "STest3 = type <{ i8, i8, i16, i32 }>" %t1 &&
diff --git a/test/CodeGen/struct.c b/test/CodeGen/struct.c
index 4b0cc3e..ed36842 100644
--- a/test/CodeGen/struct.c
+++ b/test/CodeGen/struct.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o -
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o -
 
 struct  {
   int x;
diff --git a/test/CodeGen/switch.c b/test/CodeGen/switch.c
index 0563374..3254fbf 100644
--- a/test/CodeGen/switch.c
+++ b/test/CodeGen/switch.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm-bc -o - | opt -std-compile-opts -disable-output
+// RUN: clang-cc %s -emit-llvm-bc -o - | opt -std-compile-opts -disable-output
 
 int foo(int i) {
   int j = 0;
diff --git a/test/CodeGen/tentative-array.c b/test/CodeGen/tentative-array.c
index 7123123..6879d0f 100644
--- a/test/CodeGen/tentative-array.c
+++ b/test/CodeGen/tentative-array.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -triple=i686-apple-darwin9 | grep "global \[1 x i32\]"
+// RUN: clang-cc -emit-llvm < %s -triple=i686-apple-darwin9 | grep "global \[1 x i32\]"
 
 int r[];
 int (*a)[] = &r;
diff --git a/test/CodeGen/typedef-func.c b/test/CodeGen/typedef-func.c
index c14a42c..a64426d 100644
--- a/test/CodeGen/typedef-func.c
+++ b/test/CodeGen/typedef-func.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s
+// RUN: clang-cc -emit-llvm < %s
 
 // PR2414
 struct mad_frame{};
diff --git a/test/CodeGen/typedef.c b/test/CodeGen/typedef.c
index a615285..3bdd52f 100644
--- a/test/CodeGen/typedef.c
+++ b/test/CodeGen/typedef.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
 
 typedef struct { int i; } Value;
 typedef Value *PValue;
diff --git a/test/CodeGen/types.c b/test/CodeGen/types.c
index c542a75..75cb851 100644
--- a/test/CodeGen/types.c
+++ b/test/CodeGen/types.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm <%s
+// RUN: clang-cc -emit-llvm <%s
 
 struct FileName {
     struct FileName *next;
diff --git a/test/CodeGen/union-init.c b/test/CodeGen/union-init.c
index 9a515a7..c882d31 100644
--- a/test/CodeGen/union-init.c
+++ b/test/CodeGen/union-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -o -
+// RUN: clang-cc -emit-llvm < %s -o -
 
 // A nice and complicated initialization example with unions from Python
 typedef int Py_ssize_t;
diff --git a/test/CodeGen/union.c b/test/CodeGen/union.c
index 4b09a84..4884690 100644
--- a/test/CodeGen/union.c
+++ b/test/CodeGen/union.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 
 union u_tag {
   int a;
diff --git a/test/CodeGen/unwind-attr.c b/test/CodeGen/unwind-attr.c
index 92f43ec..b2890c4 100644
--- a/test/CodeGen/unwind-attr.c
+++ b/test/CodeGen/unwind-attr.c
@@ -1,5 +1,5 @@
-// RUN: clang -fexceptions -emit-llvm -o - %s | grep "@foo() {" | count 1 &&
-// RUN: clang -emit-llvm -o - %s | grep "@foo() nounwind {" | count 1
+// RUN: clang-cc -fexceptions -emit-llvm -o - %s | grep "@foo() {" | count 1 &&
+// RUN: clang-cc -emit-llvm -o - %s | grep "@foo() nounwind {" | count 1
 
 int foo(void) {
 }
diff --git a/test/CodeGen/var-align.c b/test/CodeGen/var-align.c
index be585c0..b0b62ae 100644
--- a/test/CodeGen/var-align.c
+++ b/test/CodeGen/var-align.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep "align 16" | count 2
+// RUN: clang-cc -emit-llvm %s -o - | grep "align 16" | count 2
 
 __attribute((aligned(16))) float a[128];
 union {int a[4]; __attribute((aligned(16))) float b[4];} u;
diff --git a/test/CodeGen/vector.c b/test/CodeGen/vector.c
index 528afdf..c92d2ca 100644
--- a/test/CodeGen/vector.c
+++ b/test/CodeGen/vector.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
 typedef short __v4hi __attribute__ ((__vector_size__ (8)));
 
 void f()
diff --git a/test/CodeGen/vla.c b/test/CodeGen/vla.c
index beb928b..3666d5e 100644
--- a/test/CodeGen/vla.c
+++ b/test/CodeGen/vla.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 int b(char* x);
 
diff --git a/test/CodeGen/volatile.c b/test/CodeGen/volatile.c
index ed0a33e..9ee4de6 100644
--- a/test/CodeGen/volatile.c
+++ b/test/CodeGen/volatile.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep volatile | count 25
+// RUN: clang-cc -emit-llvm < %s | grep volatile | count 25
 
 // The number 26 comes from the current codegen for volatile loads;
 // if this number changes, it's not necessarily something wrong, but
diff --git a/test/CodeGen/weak-global.c b/test/CodeGen/weak-global.c
index d19dd61..d4ee52f 100644
--- a/test/CodeGen/weak-global.c
+++ b/test/CodeGen/weak-global.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-llvm < %s | grep common
+// RUN: clang-cc -emit-llvm < %s | grep common
 
 int i;
diff --git a/test/CodeGen/whilestmt.c b/test/CodeGen/whilestmt.c
index fe17e1b..95e18f4 100644
--- a/test/CodeGen/whilestmt.c
+++ b/test/CodeGen/whilestmt.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
 
 int bar();
 int foo() {
diff --git a/test/CodeGen/writable-strings.c b/test/CodeGen/writable-strings.c
index a2a8f3c..c8b70d5 100644
--- a/test/CodeGen/writable-strings.c
+++ b/test/CodeGen/writable-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - -fwritable-strings %s
+// RUN: clang-cc -emit-llvm -o - -fwritable-strings %s
 
 int main() {
     char *str = "abc";
diff --git a/test/CodeGen/x86-inline-asm.c b/test/CodeGen/x86-inline-asm.c
index 7bdea97..d12f26c 100644
--- a/test/CodeGen/x86-inline-asm.c
+++ b/test/CodeGen/x86-inline-asm.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1
+// RUN: clang-cc %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1
 // RUN: grep "ax" %t1 &&
 // RUN: grep "bx" %t1 &&
 // RUN: grep "cx" %t1 &&
diff --git a/test/CodeGen/x86_32-arguments.c b/test/CodeGen/x86_32-arguments.c
index d766307..632949e 100644
--- a/test/CodeGen/x86_32-arguments.c
+++ b/test/CodeGen/x86_32-arguments.c
@@ -1,4 +1,4 @@
-// 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 'define signext i8 @f0()' %t &&
 // RUN: grep 'define signext i16 @f1()' %t &&
 // RUN: grep 'define i32 @f2()' %t &&
diff --git a/test/CodeGen/x86_64-arguments.c b/test/CodeGen/x86_64-arguments.c
index eed4eb6..860caff 100644
--- a/test/CodeGen/x86_64-arguments.c
+++ b/test/CodeGen/x86_64-arguments.c
@@ -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 &&
 // RUN: grep 'define signext i8 @f0()' %t &&
 // RUN: grep 'define signext i16 @f1()' %t &&
 // RUN: grep 'define i32 @f2()' %t &&
diff --git a/test/CodeGenCXX/__null.cpp b/test/CodeGenCXX/__null.cpp
index 29416ce..476b0ad 100644
--- a/test/CodeGenCXX/__null.cpp
+++ b/test/CodeGenCXX/__null.cpp
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
 
 int* a = __null;
 int b = __null;
diff --git a/test/CodeGenCXX/expr.cpp b/test/CodeGenCXX/expr.cpp
index 5b8efac..ae5b0e6 100644
--- a/test/CodeGenCXX/expr.cpp
+++ b/test/CodeGenCXX/expr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -x c++ < %s
+// RUN: clang-cc -emit-llvm -x c++ < %s
 
 void f(int x) {
           if (x != 0) return;
diff --git a/test/CodeGenCXX/mangle.cpp b/test/CodeGenCXX/mangle.cpp
index 5c38d17..855a2ae 100644
--- a/test/CodeGenCXX/mangle.cpp
+++ b/test/CodeGenCXX/mangle.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t &&
+// RUN: clang-cc -emit-llvm %s -o %t &&
 
 // FIXME: This test is intentionally trivial, because we can't yet
 // CodeGen anything real in C++.
diff --git a/test/CodeGenObjC/2008-10-23-invalid-icmp.m b/test/CodeGenObjC/2008-10-23-invalid-icmp.m
index abfe6af..2c58b92 100644
--- a/test/CodeGenObjC/2008-10-23-invalid-icmp.m
+++ b/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/test/CodeGenObjC/bitfield-1.m b/test/CodeGenObjC/bitfield-1.m
index d4a63d3..d7396b1 100644
--- a/test/CodeGenObjC/bitfield-1.m
+++ b/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/test/CodeGenObjC/bitfield-ivar-metadata.m b/test/CodeGenObjC/bitfield-ivar-metadata.m
index c73fa67..542a242 100644
--- a/test/CodeGenObjC/bitfield-ivar-metadata.m
+++ b/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/test/CodeGenObjC/blocks-unsupported.m b/test/CodeGenObjC/blocks-unsupported.m
index bd224e5..e3faea9 100644
--- a/test/CodeGenObjC/blocks-unsupported.m
+++ b/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/test/CodeGenObjC/blocks.m b/test/CodeGenObjC/blocks.m
index e9ca223..da11561 100644
--- a/test/CodeGenObjC/blocks.m
+++ b/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/test/CodeGenObjC/category-super-class-meth.m b/test/CodeGenObjC/category-super-class-meth.m
index 82ced63..95d8b31 100644
--- a/test/CodeGenObjC/category-super-class-meth.m
+++ b/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/test/CodeGenObjC/class-getter-dotsyntax.m b/test/CodeGenObjC/class-getter-dotsyntax.m
index 54ed890..3c82f78 100644
--- a/test/CodeGenObjC/class-getter-dotsyntax.m
+++ b/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/test/CodeGenObjC/class-type.m b/test/CodeGenObjC/class-type.m
index 12a8a31..c8a1c18 100644
--- a/test/CodeGenObjC/class-type.m
+++ b/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/test/CodeGenObjC/compatibility-alias.m b/test/CodeGenObjC/compatibility-alias.m
index 0982a90..11e5a27 100644
--- a/test/CodeGenObjC/compatibility-alias.m
+++ b/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/test/CodeGenObjC/constant-strings.m b/test/CodeGenObjC/constant-strings.m
index 879f91a..d4fefd9 100644
--- a/test/CodeGenObjC/constant-strings.m
+++ b/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/test/CodeGenObjC/continuation-class.m b/test/CodeGenObjC/continuation-class.m
index 9ac51c7..925f3cd 100644
--- a/test/CodeGenObjC/continuation-class.m
+++ b/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/test/CodeGenObjC/dot-syntax-1.m b/test/CodeGenObjC/dot-syntax-1.m
index cd12d85..6c4dcbb 100644
--- a/test/CodeGenObjC/dot-syntax-1.m
+++ b/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/test/CodeGenObjC/dot-syntax.m b/test/CodeGenObjC/dot-syntax.m
index 39e9c49..68c8ad0 100644
--- a/test/CodeGenObjC/dot-syntax.m
+++ b/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/test/CodeGenObjC/encode-test-1.m b/test/CodeGenObjC/encode-test-1.m
index 3646fef..b4f3b0f 100644
--- a/test/CodeGenObjC/encode-test-1.m
+++ b/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/test/CodeGenObjC/encode-test-2.m b/test/CodeGenObjC/encode-test-2.m
index 0df54ca..6901168 100644
--- a/test/CodeGenObjC/encode-test-2.m
+++ b/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/test/CodeGenObjC/encode-test-3.m b/test/CodeGenObjC/encode-test-3.m
index 698be50..116e825 100644
--- a/test/CodeGenObjC/encode-test-3.m
+++ b/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/test/CodeGenObjC/encode-test-4.m b/test/CodeGenObjC/encode-test-4.m
index 4d39a53..90b3002 100644
--- a/test/CodeGenObjC/encode-test-4.m
+++ b/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/test/CodeGenObjC/encode-test.m b/test/CodeGenObjC/encode-test.m
index 8d307e8..6d2f64e 100644
--- a/test/CodeGenObjC/encode-test.m
+++ b/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/test/CodeGenObjC/forward-class-impl-metadata.m b/test/CodeGenObjC/forward-class-impl-metadata.m
index c502aa4..b3976d6 100644
--- a/test/CodeGenObjC/forward-class-impl-metadata.m
+++ b/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/test/CodeGenObjC/hidden.m b/test/CodeGenObjC/hidden.m
index 2cc3aef..6b86ca0 100644
--- a/test/CodeGenObjC/hidden.m
+++ b/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/test/CodeGenObjC/implicit-property.m b/test/CodeGenObjC/implicit-property.m
index 11d2a56..206d496 100644
--- a/test/CodeGenObjC/implicit-property.m
+++ b/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/test/CodeGenObjC/link-errors.m b/test/CodeGenObjC/link-errors.m
index c25fe67..b50d939 100644
--- a/test/CodeGenObjC/link-errors.m
+++ b/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/test/CodeGenObjC/message-arrays.m b/test/CodeGenObjC/message-arrays.m
index aed841e..c618672 100644
--- a/test/CodeGenObjC/message-arrays.m
+++ b/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/test/CodeGenObjC/messages-2.m b/test/CodeGenObjC/messages-2.m
index dcea93b..ca0eb94 100644
--- a/test/CodeGenObjC/messages-2.m
+++ b/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/test/CodeGenObjC/messages.m b/test/CodeGenObjC/messages.m
index fab3c5d..b2bda67 100644
--- a/test/CodeGenObjC/messages.m
+++ b/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/test/CodeGenObjC/newproperty-nested-synthesis-1.m b/test/CodeGenObjC/newproperty-nested-synthesis-1.m
index 208b162..5196b82 100644
--- a/test/CodeGenObjC/newproperty-nested-synthesis-1.m
+++ b/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/test/CodeGenObjC/no-category-class.m b/test/CodeGenObjC/no-category-class.m
index c0f0efa..34bf603 100644
--- a/test/CodeGenObjC/no-category-class.m
+++ b/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/test/CodeGenObjC/objc-align.m b/test/CodeGenObjC/objc-align.m
index 33d7f30..eca5959 100644
--- a/test/CodeGenObjC/objc-align.m
+++ b/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/test/CodeGenObjC/objc2-property-encode.m b/test/CodeGenObjC/objc2-property-encode.m
index deae4b7..2bff2fc 100644
--- a/test/CodeGenObjC/objc2-property-encode.m
+++ b/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/test/CodeGenObjC/objc2-protocol-enc.m b/test/CodeGenObjC/objc2-protocol-enc.m
index b0c1e7a..559b0b8 100644
--- a/test/CodeGenObjC/objc2-protocol-enc.m
+++ b/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/test/CodeGenObjC/objc2-retain-codegen.m b/test/CodeGenObjC/objc2-retain-codegen.m
index b287249..d78bc36 100644
--- a/test/CodeGenObjC/objc2-retain-codegen.m
+++ b/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/test/CodeGenObjC/objc2-strong-cast-1.m b/test/CodeGenObjC/objc2-strong-cast-1.m
index 7e62146..8cad08c 100644
--- a/test/CodeGenObjC/objc2-strong-cast-1.m
+++ b/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/test/CodeGenObjC/objc2-strong-cast.m b/test/CodeGenObjC/objc2-strong-cast.m
index 60fd373..d0fcb6c 100644
--- a/test/CodeGenObjC/objc2-strong-cast.m
+++ b/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/test/CodeGenObjC/objc2-weak-compare.m b/test/CodeGenObjC/objc2-weak-compare.m
index 5889b1f..7a9381d 100644
--- a/test/CodeGenObjC/objc2-weak-compare.m
+++ b/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/test/CodeGenObjC/objc2-weak-ivar.m b/test/CodeGenObjC/objc2-weak-ivar.m
index 611bffd..134e3a9 100644
--- a/test/CodeGenObjC/objc2-weak-ivar.m
+++ b/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/test/CodeGenObjC/overloadable.m b/test/CodeGenObjC/overloadable.m
index fe00fad..5a5868e 100644
--- a/test/CodeGenObjC/overloadable.m
+++ b/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/test/CodeGenObjC/predefined-expr-in-method.m b/test/CodeGenObjC/predefined-expr-in-method.m
index d835ed8..812ef97 100644
--- a/test/CodeGenObjC/predefined-expr-in-method.m
+++ b/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/test/CodeGenObjC/property-aggr-type.m b/test/CodeGenObjC/property-aggr-type.m
index 486cfa0..0cb7a5e 100644
--- a/test/CodeGenObjC/property-aggr-type.m
+++ b/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/test/CodeGenObjC/property-agrr-getter.m b/test/CodeGenObjC/property-agrr-getter.m
index 518250e..0a1df12 100644
--- a/test/CodeGenObjC/property-agrr-getter.m
+++ b/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/test/CodeGenObjC/property-getter-dot-syntax.m b/test/CodeGenObjC/property-getter-dot-syntax.m
index 962862b..d98e9ba 100644
--- a/test/CodeGenObjC/property-getter-dot-syntax.m
+++ b/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/test/CodeGenObjC/property-incr-decr-1.m b/test/CodeGenObjC/property-incr-decr-1.m
index ef55342..772e872 100644
--- a/test/CodeGenObjC/property-incr-decr-1.m
+++ b/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/test/CodeGenObjC/property-setter-attr.m b/test/CodeGenObjC/property-setter-attr.m
index edc8055..3903924 100644
--- a/test/CodeGenObjC/property-setter-attr.m
+++ b/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/test/CodeGenObjC/property.m b/test/CodeGenObjC/property.m
index 91d3659..264adf1 100644
--- a/test/CodeGenObjC/property.m
+++ b/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/test/CodeGenObjC/protocols-lazy.m b/test/CodeGenObjC/protocols-lazy.m
index f92d9c4..e91cc0a 100644
--- a/test/CodeGenObjC/protocols-lazy.m
+++ b/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/test/CodeGenObjC/runtime-fns.m b/test/CodeGenObjC/runtime-fns.m
index f132b54..c53b0a3 100644
--- a/test/CodeGenObjC/runtime-fns.m
+++ b/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/test/CodeGenObjC/super-classmethod-category.m b/test/CodeGenObjC/super-classmethod-category.m
index 2e9efde..27cdbf6 100644
--- a/test/CodeGenObjC/super-classmethod-category.m
+++ b/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/test/CodeGenObjC/super-dotsyntax-property.m b/test/CodeGenObjC/super-dotsyntax-property.m
index cd0d565..6e4f176 100644
--- a/test/CodeGenObjC/super-dotsyntax-property.m
+++ b/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/test/CodeGenObjC/synchronized.m b/test/CodeGenObjC/synchronized.m
index 3e59449..5c1d397 100644
--- a/test/CodeGenObjC/synchronized.m
+++ b/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/test/CodeGenObjC/unname-bf-metadata.m b/test/CodeGenObjC/unname-bf-metadata.m
index bac530e..a7636e4 100644
--- a/test/CodeGenObjC/unname-bf-metadata.m
+++ b/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 {
diff --git a/test/Coverage/ast-printing.c b/test/Coverage/ast-printing.c
index 0fc8b9f..401a3d3 100644
--- a/test/Coverage/ast-printing.c
+++ b/test/Coverage/ast-printing.c
@@ -1,5 +1,5 @@
-// RUN: clang --fsyntax-only %s &&
-// RUN: clang --ast-print %s &&
-// RUN: clang --ast-dump %s
+// RUN: clang-cc --fsyntax-only %s &&
+// RUN: clang-cc --ast-print %s &&
+// RUN: clang-cc --ast-dump %s
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/ast-printing.m b/test/Coverage/ast-printing.m
index c53efac..85bbd43 100644
--- a/test/Coverage/ast-printing.m
+++ b/test/Coverage/ast-printing.m
@@ -1,5 +1,5 @@
-// RUN: clang --fsyntax-only %s &&
-// RUN: clang --ast-print %s &&
-// RUN: clang --ast-dump %s
+// RUN: clang-cc --fsyntax-only %s &&
+// RUN: clang-cc --ast-print %s &&
+// RUN: clang-cc --ast-dump %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/codegen-gnu.m b/test/Coverage/codegen-gnu.m
index adaf53c..417f5ef 100644
--- a/test/Coverage/codegen-gnu.m
+++ b/test/Coverage/codegen-gnu.m
@@ -1,7 +1,7 @@
-// RUN: clang -triple i386-unknown-unknown -DIRGENABLE_GNU -DIRGENABLE -fgnu-runtime -emit-llvm -o %t %s && 
-// RUN: clang -triple i386-unknown-unknown -DIRGENABLE_GNU -DIRGENABLE -g -fgnu-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -DIRGENABLE_GNU -DIRGENABLE -fgnu-runtime -emit-llvm -o %t %s && 
+// RUN: clang-cc -triple i386-unknown-unknown -DIRGENABLE_GNU -DIRGENABLE -g -fgnu-runtime -emit-llvm -o %t %s &&
 
 // FIXME: Remove once GNU can IRgen everything.
-// RUN: not clang -triple i386-unknown-unknown -fgnu-runtime -emit-llvm -o %t %s
+// RUN: not clang-cc -triple i386-unknown-unknown -fgnu-runtime -emit-llvm -o %t %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/codegen-next.m b/test/Coverage/codegen-next.m
index 0916e53..bca83cb 100644
--- a/test/Coverage/codegen-next.m
+++ b/test/Coverage/codegen-next.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s &&
-// RUN: clang -g -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -fnext-runtime -emit-llvm -o %t %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/codegen.c b/test/Coverage/codegen.c
index 5d6724e..543c361 100644
--- a/test/Coverage/codegen.c
+++ b/test/Coverage/codegen.c
@@ -1,7 +1,7 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -triple i386-unknown-unknown -emit-llvm-bc -o %t %s &&
-// RUN: clang -triple i386-unknown-unknown -g -emit-llvm-bc -o %t %s &&
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm-bc -o %t %s &&
-// RUN: clang -triple x86_64-unknown-unknown -g -emit-llvm-bc -o %t %s
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -g -emit-llvm-bc -o %t %s &&
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm-bc -o %t %s &&
+// RUN: clang-cc -triple x86_64-unknown-unknown -g -emit-llvm-bc -o %t %s
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/html-diagnostics.c b/test/Coverage/html-diagnostics.c
index 75d4e06..6144f2f 100644
--- a/test/Coverage/html-diagnostics.c
+++ b/test/Coverage/html-diagnostics.c
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t &&
-// RUN: clang --html-diags=%t -checker-simple %s
+// RUN: clang-cc --html-diags=%t -checker-simple %s
 
 void f0(int x) {
   int *p = &x;
diff --git a/test/Coverage/html-print.c b/test/Coverage/html-print.c
index 7ade9c6..dab156b 100644
--- a/test/Coverage/html-print.c
+++ b/test/Coverage/html-print.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-html -o %t %s
+// RUN: clang-cc -emit-html -o %t %s
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/parse-callbacks.c b/test/Coverage/parse-callbacks.c
index f65d951..309074d 100644
--- a/test/Coverage/parse-callbacks.c
+++ b/test/Coverage/parse-callbacks.c
@@ -1,4 +1,4 @@
-// RUN: clang --parse-noop %s &&
-// RUN: clang --parse-print-callbacks %s
+// RUN: clang-cc --parse-noop %s &&
+// RUN: clang-cc --parse-print-callbacks %s
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/parse-callbacks.m b/test/Coverage/parse-callbacks.m
index efce13e..dc1dcfc 100644
--- a/test/Coverage/parse-callbacks.m
+++ b/test/Coverage/parse-callbacks.m
@@ -1,4 +1,4 @@
-// RUN: clang --parse-noop %s &&
-// RUN: clang --parse-print-callbacks %s
+// RUN: clang-cc --parse-noop %s &&
+// RUN: clang-cc --parse-print-callbacks %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/serialize.c b/test/Coverage/serialize.c
index 1150906..a963aac 100644
--- a/test/Coverage/serialize.c
+++ b/test/Coverage/serialize.c
@@ -1,5 +1,5 @@
 // DISABLED:
-// R U N: clang -fsyntax-only --serialize %s
+// R U N: clang-cc -fsyntax-only --serialize %s
 // RUN: 
 
 #include "c-language-features.inc"
diff --git a/test/Coverage/serialize.m b/test/Coverage/serialize.m
index fbab286..e575b2d 100644
--- a/test/Coverage/serialize.m
+++ b/test/Coverage/serialize.m
@@ -1,5 +1,5 @@
 // DISABLED:
+// R U N: clang-cc -fsyntax-only --serialize %s
 // RUN:
-// R U N: clang -fsyntax-only --serialize %s
 
 #include "objc-language-features.inc"
diff --git a/test/Coverage/targets.c b/test/Coverage/targets.c
index 669fe84..5a547a5 100644
--- a/test/Coverage/targets.c
+++ b/test/Coverage/targets.c
@@ -1,18 +1,18 @@
-// RUN: clang -g -triple i686-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple i686-pc-linux-gnu -emit-llvm -o %t %s &&
-// RUN: clang -g -triple i686-unknown-dragonfly -emit-llvm -o %t %s &&
-// RUN: clang -g -triple i686-unknown-win32 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple i686-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple x86_64-pc-linux-gnu -emit-llvm -o %t %s &&
-// RUN: clang -g -triple x86_64-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple ppc-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple ppc-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple ppc64-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple ppc64-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple armv6-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple armv6-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple sparc-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple sparc-unknown-solaris -emit-llvm -o %t %s &&
-// RUN: clang -g -triple pic16-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-pc-linux-gnu -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-unknown-dragonfly -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-unknown-win32 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple x86_64-pc-linux-gnu -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple x86_64-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple ppc-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple ppc-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple ppc64-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple ppc64-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple armv6-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple armv6-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple sparc-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple sparc-unknown-solaris -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple pic16-unknown-unknown -emit-llvm -o %t %s &&
 // RUN: true
diff --git a/test/Coverage/verbose.c b/test/Coverage/verbose.c
index 6157bad..a75557b 100644
--- a/test/Coverage/verbose.c
+++ b/test/Coverage/verbose.c
@@ -1 +1 @@
-// RUN: clang -fsyntax-only -v %s
+// RUN: clang-cc -fsyntax-only -v %s
diff --git a/test/Driver/hello.c b/test/Driver/hello.c
index 49c5276..503c274 100644
--- a/test/Driver/hello.c
+++ b/test/Driver/hello.c
@@ -1,7 +1,7 @@
 // RUN: clang-driver -ccc-echo -o %t %s 2> %t.log &&
 
 // Make sure we used clang.
-// RUN: grep 'clang" .*hello.c' %t.log &&
+// RUN: grep 'clang-cc" .*hello.c' %t.log &&
 
 // RUN: %t > %t.out &&
 // RUN: grep "I'm a little driver, short and stout." %t.out
diff --git a/test/Driver/pth.c b/test/Driver/pth.c
index d01326e..3fdcb80 100644
--- a/test/Driver/pth.c
+++ b/test/Driver/pth.c
@@ -1,8 +1,8 @@
 // Test transparent PTH support.
 
 // RUN: clang-driver -x c-header %s -o %t.h.pch -### 2> %t.log &&
-// RUN: grep '".*/clang" .* "-o" ".*\.h\.pch" "-x" "c-header" ".*pth\.c"' %t.log &&
+// RUN: grep '".*/clang-cc" .* "-o" ".*\.h\.pch" "-x" "c-header" ".*pth\.c"' %t.log &&
 
 // RUN: touch %t.h.pth &&
 // RUN: clang-driver -E -include %t.h %s -### 2> %t.log &&
-// RUN: grep '".*/clang" .*"-include-pth" ".*\.h\.pth" .*"-x" "c" ".*pth\.c"' %t.log
+// RUN: grep '".*/clang-cc" .*"-include-pth" ".*\.h\.pth" .*"-x" "c" ".*pth\.c"' %t.log
diff --git a/test/Frontend/dependency-gen.c b/test/Frontend/dependency-gen.c
index cd668f1..ea95e06 100644
--- a/test/Frontend/dependency-gen.c
+++ b/test/Frontend/dependency-gen.c
@@ -1,5 +1,5 @@
 
 // rdar://6533411
-// RUN: clang -MD -MF %t.d -x c /dev/null
+// RUN: clang-cc -MD -MF %t.d -x c /dev/null
 
 
diff --git a/test/Frontend/rewrite-macros.c b/test/Frontend/rewrite-macros.c
index deb54f4..32e02ec 100644
--- a/test/Frontend/rewrite-macros.c
+++ b/test/Frontend/rewrite-macros.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify --rewrite-macros -o %t %s &&
+// RUN: clang-cc -verify --rewrite-macros -o %t %s &&
 
 #define A(a,b) a ## b
 
diff --git a/test/Frontend/stdin.c b/test/Frontend/stdin.c
index a3899de..35fe45d 100644
--- a/test/Frontend/stdin.c
+++ b/test/Frontend/stdin.c
@@ -1,3 +1,3 @@
-// RUN: clang -E - < /dev/null > %t
+// RUN: clang-cc -E - < /dev/null > %t
 // RUN: grep '<built-in>' %t
  
diff --git a/test/Lexer/11-27-2007-FloatLiterals.c b/test/Lexer/11-27-2007-FloatLiterals.c
index c0e2154..f3ea7cb 100644
--- a/test/Lexer/11-27-2007-FloatLiterals.c
+++ b/test/Lexer/11-27-2007-FloatLiterals.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -emit-llvm -o - | grep 0x3BFD83C940000000 | count 2 &&
-// RUN: clang %s -emit-llvm -o - | grep 2.000000e+32 | count 2
+// RUN: clang-cc %s -emit-llvm -o - | grep 0x3BFD83C940000000 | count 2 &&
+// RUN: clang-cc %s -emit-llvm -o - | grep 2.000000e+32 | count 2
 
 float  F  = 1e-19f;
 double D  = 2e32;
diff --git a/test/Lexer/badstring_in_if0.c b/test/Lexer/badstring_in_if0.c
index 714f89b..5fa5a2b 100644
--- a/test/Lexer/badstring_in_if0.c
+++ b/test/Lexer/badstring_in_if0.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s 2>&1 | not grep error
+// RUN: clang-cc -E %s 2>&1 | not grep error
 #if 0
 
   "
diff --git a/test/Lexer/block_cmt_end.c b/test/Lexer/block_cmt_end.c
index d049c02..65d948f 100644
--- a/test/Lexer/block_cmt_end.c
+++ b/test/Lexer/block_cmt_end.c
@@ -1,9 +1,9 @@
 /*
-  RUN: clang -E -trigraphs %s | grep bar &&
-  RUN: clang -E -trigraphs %s | grep foo &&
-  RUN: clang -E -trigraphs %s | not grep abc &&
-  RUN: clang -E -trigraphs %s | not grep xyz &&
-  RUN: clang -fsyntax-only -trigraphs -verify %s  
+  RUN: clang-cc -E -trigraphs %s | grep bar &&
+  RUN: clang-cc -E -trigraphs %s | grep foo &&
+  RUN: clang-cc -E -trigraphs %s | not grep abc &&
+  RUN: clang-cc -E -trigraphs %s | not grep xyz &&
+  RUN: clang-cc -fsyntax-only -trigraphs -verify %s  
 */
 
 // This is a simple comment, /*/ does not end a comment, the trailing */ does.
diff --git a/test/Lexer/c90.c b/test/Lexer/c90.c
index d76c73d..d743d68 100644
--- a/test/Lexer/c90.c
+++ b/test/Lexer/c90.c
@@ -1,4 +1,4 @@
-/* RUN: clang -std=c90 -fsyntax-only %s -verify -pedantic-errors
+/* RUN: clang-cc -std=c90 -fsyntax-only %s -verify -pedantic-errors
  */
 
 enum { cast_hex = (long) (
diff --git a/test/Lexer/constants.c b/test/Lexer/constants.c
index 6d7ca19..014a8f1 100644
--- a/test/Lexer/constants.c
+++ b/test/Lexer/constants.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
  */
 
 int x = 000000080;  /* expected-error {{invalid digit}} */
diff --git a/test/Lexer/cxx0x_keyword.cpp b/test/Lexer/cxx0x_keyword.cpp
index a54d263..412c25e 100644
--- a/test/Lexer/cxx0x_keyword.cpp
+++ b/test/Lexer/cxx0x_keyword.cpp
@@ -1,2 +1,2 @@
-// RUN: clang -fsyntax-only -verify -std=c++0x %s 2>&1
+// RUN: clang-cc -fsyntax-only -verify -std=c++0x %s 2>&1
 int static_assert; /* expected-error {{expected unqualified-id}} */
diff --git a/test/Lexer/cxx0x_keyword_as_cxx98.cpp b/test/Lexer/cxx0x_keyword_as_cxx98.cpp
index 6700dcb..9f8aea1 100644
--- a/test/Lexer/cxx0x_keyword_as_cxx98.cpp
+++ b/test/Lexer/cxx0x_keyword_as_cxx98.cpp
@@ -1,2 +1,2 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 int static_assert;
diff --git a/test/Lexer/digraph.c b/test/Lexer/digraph.c
index 9683ee4..4d494ca 100644
--- a/test/Lexer/digraph.c
+++ b/test/Lexer/digraph.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify < %s
+// RUN: clang-cc -fsyntax-only -verify < %s
 
 %:include <stdio.h>
 
diff --git a/test/Lexer/dollar-idents.c b/test/Lexer/dollar-idents.c
index ed20f05..7635ea1 100644
--- a/test/Lexer/dollar-idents.c
+++ b/test/Lexer/dollar-idents.c
@@ -1,6 +1,6 @@
-// RUN: clang -dump-tokens %s 2> %t &&
+// RUN: clang-cc -dump-tokens %s 2> %t &&
 // RUN: grep "identifier '\$A'" %t
-// RUN: clang -dump-tokens -x assembler-with-cpp %s 2> %t &&
+// RUN: clang-cc -dump-tokens -x assembler-with-cpp %s 2> %t &&
 // RUN: grep "identifier 'A'" %t
 // PR3808
 
diff --git a/test/Lexer/escape_newline.c b/test/Lexer/escape_newline.c
index 2e4b7cd..ce120ed 100644
--- a/test/Lexer/escape_newline.c
+++ b/test/Lexer/escape_newline.c
@@ -1,6 +1,6 @@
-// RUN: clang -E -trigraphs %s | grep -- ' ->' &&
-// RUN: clang -E -trigraphs %s 2>&1 | grep 'backslash and newline separated by space' &&
-// RUN: clang -E -trigraphs %s 2>&1 | grep 'trigraph converted'
+// RUN: clang-cc -E -trigraphs %s | grep -- ' ->' &&
+// RUN: clang-cc -E -trigraphs %s 2>&1 | grep 'backslash and newline separated by space' &&
+// RUN: clang-cc -E -trigraphs %s 2>&1 | grep 'trigraph converted'
 
 // This is an ugly way to spell a -> token.
  -??/      
diff --git a/test/Lexer/multiple-include.c b/test/Lexer/multiple-include.c
index ccea3ff..e5fd529 100644
--- a/test/Lexer/multiple-include.c
+++ b/test/Lexer/multiple-include.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 
 #ifndef XVID_AUTO_INCLUDE
 
diff --git a/test/Lexer/number.c b/test/Lexer/number.c
index bafbc02..253453c 100644
--- a/test/Lexer/number.c
+++ b/test/Lexer/number.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 
 float X = 1.17549435e-38F;
 float Y = 08.123456;
diff --git a/test/Lexer/numeric-literal-trash.c b/test/Lexer/numeric-literal-trash.c
index 243825a..047e0b8 100644
--- a/test/Lexer/numeric-literal-trash.c
+++ b/test/Lexer/numeric-literal-trash.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
  */
 # define XRECORD(x, c_name) e##c (x, __LINE__)
 
diff --git a/test/Lexer/pragma-mark.c b/test/Lexer/pragma-mark.c
index 388fef5..f4204aa 100644
--- a/test/Lexer/pragma-mark.c
+++ b/test/Lexer/pragma-mark.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 // Lexer diagnostics shouldn't be included in #pragma mark.
 #pragma mark Mike's world
diff --git a/test/Lexer/rdr-6096838-2.c b/test/Lexer/rdr-6096838-2.c
index 152617e..b135dc1 100644
--- a/test/Lexer/rdr-6096838-2.c
+++ b/test/Lexer/rdr-6096838-2.c
@@ -1,4 +1,4 @@
-/* RUN: clang -pedantic -std=gnu89 -fsyntax-only -verify %s
+/* RUN: clang-cc -pedantic -std=gnu89 -fsyntax-only -verify %s
  rdar://6096838
  */
 
diff --git a/test/Lexer/rdr-6096838.c b/test/Lexer/rdr-6096838.c
index 3a7a0d5..60e5244 100644
--- a/test/Lexer/rdr-6096838.c
+++ b/test/Lexer/rdr-6096838.c
@@ -1,5 +1,5 @@
-/* RUN: clang -fsyntax-only -verify %s &&
- * RUN: clang -std=gnu89 -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s &&
+ * RUN: clang-cc -std=gnu89 -fsyntax-only -verify %s
  rdar://6096838
  */
 
diff --git a/test/Lexer/token-concat.c b/test/Lexer/token-concat.c
index 003344f..4e27d5d 100644
--- a/test/Lexer/token-concat.c
+++ b/test/Lexer/token-concat.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -x c -o %t %s &&
+// RUN: clang-cc -E -x c -o %t %s &&
 // RUN: grep 'IDENT.2' %t
 
 IDENT.2
diff --git a/test/Lexer/unknown-char.c b/test/Lexer/unknown-char.c
index 8bdfe60..acbf4f0 100644
--- a/test/Lexer/unknown-char.c
+++ b/test/Lexer/unknown-char.c
@@ -1,2 +1,2 @@
-// RUN: clang -E %s 2>&1 | not grep error
+// RUN: clang-cc -E %s 2>&1 | not grep error
  ` ` ` `
diff --git a/test/Misc/caret-diags.c b/test/Misc/caret-diags.c
index e6ec03a..e339d56 100644
--- a/test/Misc/caret-diags.c
+++ b/test/Misc/caret-diags.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s 2>&1 | not grep keyXXXX
+// RUN: clang-cc -fsyntax-only %s 2>&1 | not grep keyXXXX
 // This should not show keyXXXX in the caret diag output.  This once
 // happened because the two tokens ended up in the scratch buffer and
 // the caret diag from the scratch buffer included the previous token.
diff --git a/test/Misc/diag-checker.c b/test/Misc/diag-checker.c
index e586446..4733ee1 100644
--- a/test/Misc/diag-checker.c
+++ b/test/Misc/diag-checker.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #include <stdio.h>
 
diff --git a/test/Misc/emit-html.c b/test/Misc/emit-html.c
index 8c6556e..22d0d28 100644
--- a/test/Misc/emit-html.c
+++ b/test/Misc/emit-html.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-html -o -
+// RUN: clang-cc %s -emit-html -o -
 
 // rdar://6562329
 #line 42 "foo.c"
diff --git a/test/Parser/2008-10-31-parse-noop-failure.c b/test/Parser/2008-10-31-parse-noop-failure.c
index c939475..0598ea7 100755
--- a/test/Parser/2008-10-31-parse-noop-failure.c
+++ b/test/Parser/2008-10-31-parse-noop-failure.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -parse-noop %t
+// RUN: clang-cc -verify -parse-noop %t
 
 void add_attribute(id) int id; {}
 
diff --git a/test/Parser/CompoundStmtScope.c b/test/Parser/CompoundStmtScope.c
index 9aadbce..6a404aa 100644
--- a/test/Parser/CompoundStmtScope.c
+++ b/test/Parser/CompoundStmtScope.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int foo() {
   {
diff --git a/test/Parser/MicrosoftExtensions.c b/test/Parser/MicrosoftExtensions.c
index 039bafe..6f5622e 100644
--- a/test/Parser/MicrosoftExtensions.c
+++ b/test/Parser/MicrosoftExtensions.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fms-extensions -x=objective-c++ %s
+// RUN: clang-cc -fsyntax-only -verify -fms-extensions -x=objective-c++ %s
 __stdcall int func0();
 int __stdcall func();
 typedef int (__cdecl *tptr)();
diff --git a/test/Parser/argument_qualified.c b/test/Parser/argument_qualified.c
index cd92c32..c9494e7 100644
--- a/test/Parser/argument_qualified.c
+++ b/test/Parser/argument_qualified.c
@@ -1,4 +1,4 @@
-// RUN: clang %s
+// RUN: clang-cc %s
 int abc (const float x) {
   return 1;
 }
diff --git a/test/Parser/argument_redef.c b/test/Parser/argument_redef.c
index 16263f4..1a43178 100644
--- a/test/Parser/argument_redef.c
+++ b/test/Parser/argument_redef.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
 */
 
 int foo(int A) { /* expected-note {{previous definition is here}} */
diff --git a/test/Parser/argument_scope.c b/test/Parser/argument_scope.c
index 8b9f065..5e6f439 100644
--- a/test/Parser/argument_scope.c
+++ b/test/Parser/argument_scope.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 typedef struct foo foo;
 
 void blah(int foo) {
diff --git a/test/Parser/asm.c b/test/Parser/asm.c
index c23d31a..9cf9046 100644
--- a/test/Parser/asm.c
+++ b/test/Parser/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f1() {
   asm ("ret" : : :); // expected-error {{expected string literal}}
diff --git a/test/Parser/attributes.c b/test/Parser/attributes.c
index d7fc35d..37fa0ca 100644
--- a/test/Parser/attributes.c
+++ b/test/Parser/attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -pedantic -std=c99
+// RUN: clang-cc -fsyntax-only -verify %s -pedantic -std=c99
 
 int __attribute__(()) x;  // expected-warning {{extension used}}
 
diff --git a/test/Parser/bad-control.c b/test/Parser/bad-control.c
index fab9fa3..6e59667 100644
--- a/test/Parser/bad-control.c
+++ b/test/Parser/bad-control.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
 */
 int foo() { 
   break; /* expected-error {{'break' statement not in loop or switch statement}} */
diff --git a/test/Parser/block-block-storageclass.c b/test/Parser/block-block-storageclass.c
index c9be12f..d24ec5f 100644
--- a/test/Parser/block-block-storageclass.c
+++ b/test/Parser/block-block-storageclass.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -parse-noop %s
+// RUN: clang-cc -fsyntax-only -verify -parse-noop %s
 #if 0
 #include <stdio.h>
 void _Block_byref_release(void*src){}
diff --git a/test/Parser/block-pointer-decl.c b/test/Parser/block-pointer-decl.c
index 9920f5f..7a21651 100644
--- a/test/Parser/block-pointer-decl.c
+++ b/test/Parser/block-pointer-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -parse-noop -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -parse-noop -fblocks %s
 
 struct blockStruct {
   int (^a)(float, int);
diff --git a/test/Parser/builtin_classify_type.c b/test/Parser/builtin_classify_type.c
index 0a46f33..7046310 100644
--- a/test/Parser/builtin_classify_type.c
+++ b/test/Parser/builtin_classify_type.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct foo { int a; };
 
diff --git a/test/Parser/builtin_types_compatible.c b/test/Parser/builtin_types_compatible.c
index 925c7ea..0664a9f 100644
--- a/test/Parser/builtin_types_compatible.c
+++ b/test/Parser/builtin_types_compatible.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 extern int funcInt(int);
 extern float funcFloat(float);
diff --git a/test/Parser/c-namespace.c b/test/Parser/c-namespace.c
index 2b38050..ffca15e 100644
--- a/test/Parser/c-namespace.c
+++ b/test/Parser/c-namespace.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s 
+// RUN: clang-cc -fsyntax-only %s 
 void bla1() {
   struct XXX;
   int XXX;
diff --git a/test/Parser/char-literal-printing.c b/test/Parser/char-literal-printing.c
index 990b8f7..f6ad0ff 100644
--- a/test/Parser/char-literal-printing.c
+++ b/test/Parser/char-literal-printing.c
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
 
 #include <stddef.h>
 
diff --git a/test/Parser/check-objc2-syntax-1.m b/test/Parser/check-objc2-syntax-1.m
index 967fa75..f596e9b 100644
--- a/test/Parser/check-objc2-syntax-1.m
+++ b/test/Parser/check-objc2-syntax-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Subclass 
 + (int)magicNumber;
diff --git a/test/Parser/check-syntax-1.m b/test/Parser/check-syntax-1.m
index 9036c65..f4aa430 100644
--- a/test/Parser/check-syntax-1.m
+++ b/test/Parser/check-syntax-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int @interface bla  ; // expected-error {{cannot combine with previous 'int' declaration specifier}}
 @end
diff --git a/test/Parser/check_cast.c b/test/Parser/check_cast.c
index c69f0f0..4df851c 100644
--- a/test/Parser/check_cast.c
+++ b/test/Parser/check_cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 struct foo {
   int a;
 };
diff --git a/test/Parser/compound_literal.c b/test/Parser/compound_literal.c
index c6d665c..c263763 100644
--- a/test/Parser/compound_literal.c
+++ b/test/Parser/compound_literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 int main() {
   char *s;
   s = (char []){"whatever"}; 
diff --git a/test/Parser/control-scope.c b/test/Parser/control-scope.c
index 4beed7e..7ffc6ac 100644
--- a/test/Parser/control-scope.c
+++ b/test/Parser/control-scope.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -std=c90 -verify &&
-// RUN: clang %s -std=c99
+// RUN: clang-cc %s -std=c90 -verify &&
+// RUN: clang-cc %s -std=c99
 
 int f (int z) { 
   if (z + sizeof (enum {a}))        // expected-note {{previous definition is here}}
diff --git a/test/Parser/cxx-bool.cpp b/test/Parser/cxx-bool.cpp
index 623dcb2..f0b3a9f 100644
--- a/test/Parser/cxx-bool.cpp
+++ b/test/Parser/cxx-bool.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 bool a = true;
 bool b = false;
diff --git a/test/Parser/cxx-casting.cpp b/test/Parser/cxx-casting.cpp
index 4b11dc8..1fdc28d 100644
--- a/test/Parser/cxx-casting.cpp
+++ b/test/Parser/cxx-casting.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 char *const_cast_test(const char *var)
 {
@@ -33,4 +33,4 @@
 char postfix_expr_test()
 {
   return reinterpret_cast<char*>(0xdeadbeef)[0];
-}
\ No newline at end of file
+}
diff --git a/test/Parser/cxx-class.cpp b/test/Parser/cxx-class.cpp
index 9cdd1d7..ff452b9 100644
--- a/test/Parser/cxx-class.cpp
+++ b/test/Parser/cxx-class.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 class C;
 class C {
 public:
diff --git a/test/Parser/cxx-condition.cpp b/test/Parser/cxx-condition.cpp
index 2a77193..8fbca2a 100644
--- a/test/Parser/cxx-condition.cpp
+++ b/test/Parser/cxx-condition.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -parse-noop -verify %s
+// RUN: clang-cc -parse-noop -verify %s
 
 void f() {
   int a;
diff --git a/test/Parser/cxx-exception-spec.cpp b/test/Parser/cxx-exception-spec.cpp
index 47e9ffb..b2203c9 100644
--- a/test/Parser/cxx-exception-spec.cpp
+++ b/test/Parser/cxx-exception-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only  %s
+// RUN: clang-cc -fsyntax-only  %s
 
 struct X { };
 
diff --git a/test/Parser/cxx-reference.cpp b/test/Parser/cxx-reference.cpp
index a1cbc5e..0d2b9d2 100644
--- a/test/Parser/cxx-reference.cpp
+++ b/test/Parser/cxx-reference.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 extern char *bork;
 char *& bar = bork;
diff --git a/test/Parser/cxx-template-decl.cpp b/test/Parser/cxx-template-decl.cpp
index ce617fb..ec333de 100644
--- a/test/Parser/cxx-template-decl.cpp
+++ b/test/Parser/cxx-template-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // Errors
 export class foo { };   // expected-error {{expected template}}
diff --git a/test/Parser/cxx-try.cpp b/test/Parser/cxx-try.cpp
index 642c8f6..76b85e8 100644
--- a/test/Parser/cxx-try.cpp
+++ b/test/Parser/cxx-try.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f()
 {
diff --git a/test/Parser/cxx-typeid.cpp b/test/Parser/cxx-typeid.cpp
index 1a6ffdb..5a92e73 100644
--- a/test/Parser/cxx-typeid.cpp
+++ b/test/Parser/cxx-typeid.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // FIXME: This should really include <typeinfo>, but we don't have that yet.
 namespace std {
diff --git a/test/Parser/cxx-typeof.cpp b/test/Parser/cxx-typeof.cpp
index 7e09905..0bf4463 100644
--- a/test/Parser/cxx-typeof.cpp
+++ b/test/Parser/cxx-typeof.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 static void test() {
   int *pi;
diff --git a/test/Parser/cxx-using-directive.cpp b/test/Parser/cxx-using-directive.cpp
index bf89bb1..676f4e6 100644
--- a/test/Parser/cxx-using-directive.cpp
+++ b/test/Parser/cxx-using-directive.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 class A {};
 
diff --git a/test/Parser/cxx-variadic-func.cpp b/test/Parser/cxx-variadic-func.cpp
index 0e9c5ca..86d6b6b 100644
--- a/test/Parser/cxx-variadic-func.cpp
+++ b/test/Parser/cxx-variadic-func.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only  %s
+// RUN: clang-cc -fsyntax-only  %s
 
 void f(...) {
   int g(int(...));
diff --git a/test/Parser/cxx0x-rvalue-reference.cpp b/test/Parser/cxx0x-rvalue-reference.cpp
index 5736b79..389f2b9 100644
--- a/test/Parser/cxx0x-rvalue-reference.cpp
+++ b/test/Parser/cxx0x-rvalue-reference.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++0x %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++0x %s
 
 int && r1(int &&a);
 
diff --git a/test/Parser/declarators.c b/test/Parser/declarators.c
index fb7704f..8a533ee 100644
--- a/test/Parser/declarators.c
+++ b/test/Parser/declarators.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
 
 extern int a1[];
 
diff --git a/test/Parser/designator.c b/test/Parser/designator.c
index d17f1b5..76c2d43 100644
--- a/test/Parser/designator.c
+++ b/test/Parser/designator.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -pedantic
+// RUN: clang-cc -fsyntax-only %s -verify -pedantic
 
 int X[] = {
   [4]4,       // expected-warning {{use of GNU 'missing =' extension in designator}}
diff --git a/test/Parser/encode.m b/test/Parser/encode.m
index ce12882..1e088a0 100644
--- a/test/Parser/encode.m
+++ b/test/Parser/encode.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int main(void) {
   const char ch = @encode(char *)[2];
diff --git a/test/Parser/enhanced-proto-1.m b/test/Parser/enhanced-proto-1.m
index 354502e..1f42ec2 100644
--- a/test/Parser/enhanced-proto-1.m
+++ b/test/Parser/enhanced-proto-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol MyProto1 
 @optional
diff --git a/test/Parser/expressions.c b/test/Parser/expressions.c
index 29621f1..3f58ef3 100644
--- a/test/Parser/expressions.c
+++ b/test/Parser/expressions.c
@@ -1,4 +1,4 @@
-// RUN: clang -parse-noop %s
+// RUN: clang-cc -parse-noop %s
 
 void test1() {
   if (sizeof (int){ 1});   // sizeof compound literal
diff --git a/test/Parser/expressions.m b/test/Parser/expressions.m
index 8e314ac..e9e4121 100644
--- a/test/Parser/expressions.m
+++ b/test/Parser/expressions.m
@@ -1,4 +1,4 @@
-// RUN: clang -parse-noop %s
+// RUN: clang-cc -parse-noop %s
 
 void test1() {
   @"s";            // expected-warning {{expression result unused}}
diff --git a/test/Parser/extension.c b/test/Parser/extension.c
index 9bd18de..24f1ac5 100644
--- a/test/Parser/extension.c
+++ b/test/Parser/extension.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 
 // Top level extension marker.
 
diff --git a/test/Parser/function-decls.c b/test/Parser/function-decls.c
index 3493baa..28bb5c2 100644
--- a/test/Parser/function-decls.c
+++ b/test/Parser/function-decls.c
@@ -1,4 +1,4 @@
-/* RUN: clang %s -ast-print
+/* RUN: clang-cc %s -ast-print
  */
 
 void foo() {
diff --git a/test/Parser/goto-ident.c b/test/Parser/goto-ident.c
index 87d6ea5..e8d1963 100644
--- a/test/Parser/goto-ident.c
+++ b/test/Parser/goto-ident.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
 */
 
 void foo() { 
diff --git a/test/Parser/if-scope-c90.c b/test/Parser/if-scope-c90.c
index 43a3676..fdc75e9 100644
--- a/test/Parser/if-scope-c90.c
+++ b/test/Parser/if-scope-c90.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify --std=c90 %s
+// RUN: clang-cc -fsyntax-only -verify --std=c90 %s
 
 int f (int z)
 { 
diff --git a/test/Parser/if-scope-c99.c b/test/Parser/if-scope-c99.c
index 41d7ae2..37cd0e1 100644
--- a/test/Parser/if-scope-c99.c
+++ b/test/Parser/if-scope-c99.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify --std=c99 %s
+// RUN: clang-cc -fsyntax-only -verify --std=c99 %s
 
 int f (int z)
 { 
diff --git a/test/Parser/implicit-casts.c b/test/Parser/implicit-casts.c
index 2e8e000..e7d2098 100644
--- a/test/Parser/implicit-casts.c
+++ b/test/Parser/implicit-casts.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 _Complex double X;
 void test1(int c) {
   X = 5;
diff --git a/test/Parser/method-prototype-1.m b/test/Parser/method-prototype-1.m
index 6399f04..1d535de 100644
--- a/test/Parser/method-prototype-1.m
+++ b/test/Parser/method-prototype-1.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -parse-noop
+// RUN: clang-cc %s -parse-noop
 @interface MyObject 
 - (void) bycopy  : (int) woodo, ... ;
 - (void) break  : (int) woodo, ... ;
diff --git a/test/Parser/namelookup-bug-1.c b/test/Parser/namelookup-bug-1.c
index 298798c..3c8b85a 100644
--- a/test/Parser/namelookup-bug-1.c
+++ b/test/Parser/namelookup-bug-1.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 typedef int Object;
 
diff --git a/test/Parser/namelookup-bug-2.c b/test/Parser/namelookup-bug-2.c
index 443b50a..42298c3 100644
--- a/test/Parser/namelookup-bug-2.c
+++ b/test/Parser/namelookup-bug-2.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 typedef int Object;
 
diff --git a/test/Parser/objc-alias-printing.m b/test/Parser/objc-alias-printing.m
index 67e013f..e121bed 100644
--- a/test/Parser/objc-alias-printing.m
+++ b/test/Parser/objc-alias-printing.m
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
 
 @protocol P1 @end
 @protocol P2 @end
diff --git a/test/Parser/objc-category-neg-1.m b/test/Parser/objc-category-neg-1.m
index 3da911b..6c1bd29 100644
--- a/test/Parser/objc-category-neg-1.m
+++ b/test/Parser/objc-category-neg-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void __assert_rtn(const char *, const char *, int, const char *) __attribute__((__noreturn__));
 static __inline__ int __inline_isfinitef (float ) __attribute__ ((always_inline));
diff --git a/test/Parser/objc-forcollection-1.m b/test/Parser/objc-forcollection-1.m
index 6db74dc..21ec308 100644
--- a/test/Parser/objc-forcollection-1.m
+++ b/test/Parser/objc-forcollection-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 typedef struct objc_class *Class;
 typedef struct objc_object {
diff --git a/test/Parser/objc-forcollection-neg-2.m b/test/Parser/objc-forcollection-neg-2.m
index 31c8097..ddb279b 100644
--- a/test/Parser/objc-forcollection-neg-2.m
+++ b/test/Parser/objc-forcollection-neg-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef struct objc_class *Class;
 typedef struct objc_object {
diff --git a/test/Parser/objc-forcollection-neg.m b/test/Parser/objc-forcollection-neg.m
index d67a714..0f2bb90 100644
--- a/test/Parser/objc-forcollection-neg.m
+++ b/test/Parser/objc-forcollection-neg.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef struct objc_class *Class;
 typedef struct objc_object {
diff --git a/test/Parser/objc-foreach-error-1.m b/test/Parser/objc-foreach-error-1.m
index e65c329..16a7ea8 100644
--- a/test/Parser/objc-foreach-error-1.m
+++ b/test/Parser/objc-foreach-error-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 ce MyList // expected-error {{invalid token after top level declarator}}
 @end
diff --git a/test/Parser/objc-foreach-syntax.m b/test/Parser/objc-foreach-syntax.m
index c00f777..950fc2f 100644
--- a/test/Parser/objc-foreach-syntax.m
+++ b/test/Parser/objc-foreach-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 static int test_NSURLGetResourceValueForKey( id keys )
 {
diff --git a/test/Parser/objc-init.m b/test/Parser/objc-init.m
index f45d323..8d74dfe 100644
--- a/test/Parser/objc-init.m
+++ b/test/Parser/objc-init.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -pedantic
+// RUN: clang-cc -fsyntax-only -verify %s -pedantic
 // rdar://5707001
 
 @interface NSNumber;
diff --git a/test/Parser/objc-interfaces.m b/test/Parser/objc-interfaces.m
index b13eea5..7aa6729 100644
--- a/test/Parser/objc-interfaces.m
+++ b/test/Parser/objc-interfaces.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 // Test features and error recovery for objc interfaces.
 
diff --git a/test/Parser/objc-messaging-1.m b/test/Parser/objc-messaging-1.m
index 7340fac..4a36fc9 100644
--- a/test/Parser/objc-messaging-1.m
+++ b/test/Parser/objc-messaging-1.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -parse-noop
+// RUN: clang-cc %s -parse-noop
 int main ()
 {
 	int i,j;
diff --git a/test/Parser/objc-messaging-neg-1.m b/test/Parser/objc-messaging-neg-1.m
index 23db7e2..a1ec116 100644
--- a/test/Parser/objc-messaging-neg-1.m
+++ b/test/Parser/objc-messaging-neg-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int main()
    {
diff --git a/test/Parser/objc-missing-impl.m b/test/Parser/objc-missing-impl.m
index 7d38371..9108451 100644
--- a/test/Parser/objc-missing-impl.m
+++ b/test/Parser/objc-missing-impl.m
@@ -1,2 +1,2 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 @end // expected-warning {{@end must appear in an @implementation context}}
diff --git a/test/Parser/objc-property-syntax.m b/test/Parser/objc-property-syntax.m
index 1a8fd11..cf75aaa 100644
--- a/test/Parser/objc-property-syntax.m
+++ b/test/Parser/objc-property-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface MyClass {
 
diff --git a/test/Parser/objc-quirks.m b/test/Parser/objc-quirks.m
index c5fe8bb..2913b58 100644
--- a/test/Parser/objc-quirks.m
+++ b/test/Parser/objc-quirks.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // FIXME: This is a horrible error message here. Fix.
 int @"s" = 5;  // expected-error {{prefix attribute must be}}
diff --git a/test/Parser/objc-try-catch-1.m b/test/Parser/objc-try-catch-1.m
index 2554531..2c41cac 100644
--- a/test/Parser/objc-try-catch-1.m
+++ b/test/Parser/objc-try-catch-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -fsyntax-only -verify %s &&
-// RUN: clang -fsyntax-only -verify -x objective-c++ %s
+// RUN: clang-cc -fsyntax-only -verify %s &&
+// RUN: clang-cc -fsyntax-only -verify -x objective-c++ %s
 void * proc();
 
 @interface NSConstantString
diff --git a/test/Parser/objc-type-printing.m b/test/Parser/objc-type-printing.m
index 5d3cbd9..d9ad704 100644
--- a/test/Parser/objc-type-printing.m
+++ b/test/Parser/objc-type-printing.m
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
 
 @protocol P1 @end
 @protocol P2 @end
diff --git a/test/Parser/parmvardecl_conversion.c b/test/Parser/parmvardecl_conversion.c
index 81acc07..f35487e 100644
--- a/test/Parser/parmvardecl_conversion.c
+++ b/test/Parser/parmvardecl_conversion.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f (int p[]) { p++; }
 
diff --git a/test/Parser/pointer-arithmetic.c b/test/Parser/pointer-arithmetic.c
index 3556c9a..d252b42 100644
--- a/test/Parser/pointer-arithmetic.c
+++ b/test/Parser/pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int *test1(int *a)         { return a + 1; }
 int *test2(int *a)         { return 1 + a; }
diff --git a/test/Parser/pointer_promotion.c b/test/Parser/pointer_promotion.c
index c648209..0254828 100644
--- a/test/Parser/pointer_promotion.c
+++ b/test/Parser/pointer_promotion.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int test() {
   void *vp;
diff --git a/test/Parser/pragma-pack.c b/test/Parser/pragma-pack.c
index 0b83529..d42bbe5 100644
--- a/test/Parser/pragma-pack.c
+++ b/test/Parser/pragma-pack.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // Note that this puts the expected lines before the directives to work around
 // limitations in the -verify mode.
diff --git a/test/Parser/prefix-attributes.m b/test/Parser/prefix-attributes.m
index 46eb90c..bb6d04d 100644
--- a/test/Parser/prefix-attributes.m
+++ b/test/Parser/prefix-attributes.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
 
 __attribute__((deprecated)) @class B; // expected-error {{prefix attribute must be followed by an interface or protocol}}
 
diff --git a/test/Parser/promote_types_in_proto.c b/test/Parser/promote_types_in_proto.c
index 40617a2..faff3e3 100644
--- a/test/Parser/promote_types_in_proto.c
+++ b/test/Parser/promote_types_in_proto.c
@@ -1,4 +1,4 @@
-// RUN: clang %s
+// RUN: clang-cc %s
 void functionPromotion(void f(char *const []));
 void arrayPromotion(char * const argv[]);
 
diff --git a/test/Parser/recovery.c b/test/Parser/recovery.c
index 5065b94..1d49525 100644
--- a/test/Parser/recovery.c
+++ b/test/Parser/recovery.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic -fblocks %s
 
 // PR2241
 float test2241[] = { 
diff --git a/test/Parser/selector-1.m b/test/Parser/selector-1.m
index abe9424..85ef919 100644
--- a/test/Parser/selector-1.m
+++ b/test/Parser/selector-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -parse-noop %s 
+// RUN: clang-cc -parse-noop %s 
 
 int main() {
  SEL s = @selector(retain);
diff --git a/test/Parser/statements.c b/test/Parser/statements.c
index 26b2662..c5923bc 100644
--- a/test/Parser/statements.c
+++ b/test/Parser/statements.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int test1() {
   { ; {  ;;}} ;;
diff --git a/test/Parser/struct-recursion.c b/test/Parser/struct-recursion.c
index c16f9fc..11e5f7e 100644
--- a/test/Parser/struct-recursion.c
+++ b/test/Parser/struct-recursion.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 
 // C99 6.7.2.3p11
 
diff --git a/test/Parser/traditional_arg_scope.c b/test/Parser/traditional_arg_scope.c
index f89708c..2a21ec3 100644
--- a/test/Parser/traditional_arg_scope.c
+++ b/test/Parser/traditional_arg_scope.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
 
 int x(a) int a; {return a;}
 int y(b) int b; {return a;} // expected-error {{use of undeclared identifier}}
diff --git a/test/Parser/typeof.c b/test/Parser/typeof.c
index ac51f58..8cb16c3 100644
--- a/test/Parser/typeof.c
+++ b/test/Parser/typeof.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef int TInt;
 
diff --git a/test/Parser/types.c b/test/Parser/types.c
index f1ffb94..69d7eb7 100644
--- a/test/Parser/types.c
+++ b/test/Parser/types.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 
 // Test the X can be overloaded inside the struct.
 typedef int X; 
diff --git a/test/Preprocessor/_Pragma-dependency.c b/test/Preprocessor/_Pragma-dependency.c
index 837f31d..da1d87f 100644
--- a/test/Preprocessor/_Pragma-dependency.c
+++ b/test/Preprocessor/_Pragma-dependency.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E 2>&1 | grep 'DO_PRAGMA (STR' &&
-// RUN: clang %s -E 2>&1 | grep '7:3'
+// RUN: clang-cc %s -E 2>&1 | grep 'DO_PRAGMA (STR' &&
+// RUN: clang-cc %s -E 2>&1 | grep '7:3'
 
 #define DO_PRAGMA _Pragma 
 #define STR "GCC dependency \"parse.y\"")
diff --git a/test/Preprocessor/_Pragma-location.c b/test/Preprocessor/_Pragma-location.c
index 152e71a..61cadfb 100644
--- a/test/Preprocessor/_Pragma-location.c
+++ b/test/Preprocessor/_Pragma-location.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | not grep 'scratch space'
+// RUN: clang-cc %s -E | not grep 'scratch space'
 
 #define push _Pragma ("pack(push)")
 push
diff --git a/test/Preprocessor/_Pragma-physloc.c b/test/Preprocessor/_Pragma-physloc.c
index b8f5499..8737949 100644
--- a/test/Preprocessor/_Pragma-physloc.c
+++ b/test/Preprocessor/_Pragma-physloc.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep '#pragma x y z' &&
-// RUN: clang %s -E | grep '#pragma a b c'
+// RUN: clang-cc %s -E | grep '#pragma x y z' &&
+// RUN: clang-cc %s -E | grep '#pragma a b c'
 
 _Pragma("x y z")
 _Pragma("a b c")
diff --git a/test/Preprocessor/_Pragma-poison.c b/test/Preprocessor/_Pragma-poison.c
index 82a7fbe..742f885 100644
--- a/test/Preprocessor/_Pragma-poison.c
+++ b/test/Preprocessor/_Pragma-poison.c
@@ -1,5 +1,5 @@
-// RUN: clang -Eonly %s 2>&1 | grep error | wc -l | grep 1 &&
-// RUN: clang -Eonly %s 2>&1 | grep 7:4 | wc -l | grep 1
+// RUN: clang-cc -Eonly %s 2>&1 | grep error | wc -l | grep 1 &&
+// RUN: clang-cc -Eonly %s 2>&1 | grep 7:4 | wc -l | grep 1
 
 #define BAR _Pragma ("GCC poison XYZW")  XYZW /*NO ERROR*/
 XYZW   // NO ERROR
diff --git a/test/Preprocessor/_Pragma-syshdr.c b/test/Preprocessor/_Pragma-syshdr.c
index 4d2d29e..44eda5f 100644
--- a/test/Preprocessor/_Pragma-syshdr.c
+++ b/test/Preprocessor/_Pragma-syshdr.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep 'system_header ignored in main file'
+// RUN: clang-cc %s -E 2>&1 | grep 'system_header ignored in main file'
 
 _Pragma ("GCC system_header")
 
diff --git a/test/Preprocessor/_Pragma-syshdr2.c b/test/Preprocessor/_Pragma-syshdr2.c
index 190e5a7..de7f2d3 100644
--- a/test/Preprocessor/_Pragma-syshdr2.c
+++ b/test/Preprocessor/_Pragma-syshdr2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s 2>&1 | grep 'file not found'
+// RUN: clang-cc -E %s 2>&1 | grep 'file not found'
 
 #define DO_PRAGMA _Pragma 
 DO_PRAGMA ("GCC dependency \"blahblabh\"")
diff --git a/test/Preprocessor/assembler-with-cpp.c b/test/Preprocessor/assembler-with-cpp.c
index ecb77e5..7a2830b 100644
--- a/test/Preprocessor/assembler-with-cpp.c
+++ b/test/Preprocessor/assembler-with-cpp.c
@@ -1,4 +1,4 @@
-// RUN: clang -x assembler-with-cpp -E %s > %t &&
+// RUN: clang-cc -x assembler-with-cpp -E %s > %t &&
 
 #ifndef __ASSEMBLER__
 #error "__ASSEMBLER__ not defined"
diff --git a/test/Preprocessor/builtin_line.c b/test/Preprocessor/builtin_line.c
index 7698d5f..db01e47 100644
--- a/test/Preprocessor/builtin_line.c
+++ b/test/Preprocessor/builtin_line.c
@@ -1,10 +1,10 @@
-// RUN: clang %s -E | grep "^  4" &&
+// RUN: clang-cc %s -E | grep "^  4" &&
 #define FOO __LINE__
 
   FOO
 
 // PR3579 - This should expand to the __LINE__ of the ')' not of the X.
-// RUN: clang %s -E | grep "^A 13"
+// RUN: clang-cc %s -E | grep "^A 13"
 
 #define X() __LINE__
 
diff --git a/test/Preprocessor/c99-6_10_3_3_p4.c b/test/Preprocessor/c99-6_10_3_3_p4.c
index 13d5661..8966054 100644
--- a/test/Preprocessor/c99-6_10_3_3_p4.c
+++ b/test/Preprocessor/c99-6_10_3_3_p4.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep -F 'char p[] = "x ## y";'
+// RUN: clang-cc -E %s | grep -F 'char p[] = "x ## y";'
 #define hash_hash # ## # 
 #define mkstr(a) # a 
 #define in_between(a) mkstr(a) 
diff --git a/test/Preprocessor/c99-6_10_3_4_p5.c b/test/Preprocessor/c99-6_10_3_4_p5.c
index fa5f735..22bdf82 100644
--- a/test/Preprocessor/c99-6_10_3_4_p5.c
+++ b/test/Preprocessor/c99-6_10_3_4_p5.c
@@ -1,9 +1,9 @@
 // Example from C99 6.10.3.4p5
 
-// RUN: clang -E %s | grep -F 'f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);' &&
-// RUN: clang -E %s | grep -F 'f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);' &&
-// RUN: clang -E %s | grep -F 'int i[] = { 1, 23, 4, 5, };' &&
-// RUN: clang -E %s | grep -F 'char c[2][6] = { "hello", "" };'
+// RUN: clang-cc -E %s | grep -F 'f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);' &&
+// RUN: clang-cc -E %s | grep -F 'f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);' &&
+// RUN: clang-cc -E %s | grep -F 'int i[] = { 1, 23, 4, 5, };' &&
+// RUN: clang-cc -E %s | grep -F 'char c[2][6] = { "hello", "" };'
 
 
 #define x 3 
diff --git a/test/Preprocessor/c99-6_10_3_4_p6.c b/test/Preprocessor/c99-6_10_3_4_p6.c
index ce7990a..c48d2ef 100644
--- a/test/Preprocessor/c99-6_10_3_4_p6.c
+++ b/test/Preprocessor/c99-6_10_3_4_p6.c
@@ -1,10 +1,10 @@
 // Example from C99 6.10.3.4p6
 
-// RUN: clang -E %s | grep -F 'printf("x" "1" "= %d, x" "2" "= s" x1, x2);' &&
-// RUN: clang -E %s | grep 'fputs("strncmp(\\"abc\\\\0d\\" \\"abc\\", .\\\\4.) == 0" ": @\\n", s);' &&
-// RUN: clang -E %s | grep -F 'include "vers2.h"' &&
-// RUN: clang -E %s | grep -F '"hello";' &&
-// RUN: clang -E %s | grep -F '"hello" ", world"'
+// RUN: clang-cc -E %s | grep -F 'printf("x" "1" "= %d, x" "2" "= s" x1, x2);' &&
+// RUN: clang-cc -E %s | grep 'fputs("strncmp(\\"abc\\\\0d\\" \\"abc\\", .\\\\4.) == 0" ": @\\n", s);' &&
+// RUN: clang-cc -E %s | grep -F 'include "vers2.h"' &&
+// RUN: clang-cc -E %s | grep -F '"hello";' &&
+// RUN: clang-cc -E %s | grep -F '"hello" ", world"'
 
 #define str(s) # s 
 #define xstr(s) str(s) 
diff --git a/test/Preprocessor/c99-6_10_3_4_p7.c b/test/Preprocessor/c99-6_10_3_4_p7.c
index 88957df..a53df82 100644
--- a/test/Preprocessor/c99-6_10_3_4_p7.c
+++ b/test/Preprocessor/c99-6_10_3_4_p7.c
@@ -1,7 +1,7 @@
 // Example from C99 6.10.3.4p7
 
-// RUN: clang -E %s | grep -F 'int j[] = { 123, 45, 67, 89,' &&
-// RUN: clang -E %s | grep -F '10, 11, 12, };'
+// RUN: clang-cc -E %s | grep -F 'int j[] = { 123, 45, 67, 89,' &&
+// RUN: clang-cc -E %s | grep -F '10, 11, 12, };'
 
 #define t(x,y,z) x ## y ## z 
 int j[] = { t(1,2,3), t(,4,5), t(6,,7), t(8,9,), 
diff --git a/test/Preprocessor/c99-6_10_3_4_p9.c b/test/Preprocessor/c99-6_10_3_4_p9.c
index 08b4637..39c3454 100644
--- a/test/Preprocessor/c99-6_10_3_4_p9.c
+++ b/test/Preprocessor/c99-6_10_3_4_p9.c
@@ -1,9 +1,9 @@
 // Example from C99 6.10.3.4p9
 
-// RUN: clang -E %s | grep -F 'fprintf(stderr, "Flag");' &&
-// RUN: clang -E %s | grep -F 'fprintf(stderr, "X = %d\n", x);' &&
-// RUN: clang -E %s | grep -F 'puts("The first, second, and third items.");' &&
-// RUN: clang -E %s | grep -F '((x>y)?puts("x>y"): printf("x is %d but y is %d", x, y));'
+// RUN: clang-cc -E %s | grep -F 'fprintf(stderr, "Flag");' &&
+// RUN: clang-cc -E %s | grep -F 'fprintf(stderr, "X = %d\n", x);' &&
+// RUN: clang-cc -E %s | grep -F 'puts("The first, second, and third items.");' &&
+// RUN: clang-cc -E %s | grep -F '((x>y)?puts("x>y"): printf("x is %d but y is %d", x, y));'
 
 #define debug(...) fprintf(stderr, __VA_ARGS__) 
 #define showlist(...) puts(#__VA_ARGS__) 
diff --git a/test/Preprocessor/clang_headers.c b/test/Preprocessor/clang_headers.c
index 4fa6153..1cb3319 100644
--- a/test/Preprocessor/clang_headers.c
+++ b/test/Preprocessor/clang_headers.c
@@ -1,3 +1,3 @@
-// RUN: clang -E %s
+// RUN: clang-cc -E %s
 
 #include <limits.h>
diff --git a/test/Preprocessor/comment_save.c b/test/Preprocessor/comment_save.c
index 1a3bd96..30b0434 100644
--- a/test/Preprocessor/comment_save.c
+++ b/test/Preprocessor/comment_save.c
@@ -1,5 +1,5 @@
-// RUN: clang -E -C %s | grep '^// foo$' &&
-// RUN: clang -E -C %s | grep -F '^/* bar */$'
+// RUN: clang-cc -E -C %s | grep '^// foo$' &&
+// RUN: clang-cc -E -C %s | grep -F '^/* bar */$'
 
 // foo
 /* bar */
diff --git a/test/Preprocessor/comment_save_if.c b/test/Preprocessor/comment_save_if.c
index ce7b4c4..c08b2d7 100644
--- a/test/Preprocessor/comment_save_if.c
+++ b/test/Preprocessor/comment_save_if.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E -CC -pedantic 2>&1 | grep -v '^/' | not grep warning
+// RUN: clang-cc %s -E -CC -pedantic 2>&1 | grep -v '^/' | not grep warning
 
 #if 1 /*bar */
 
diff --git a/test/Preprocessor/comment_save_macro.c b/test/Preprocessor/comment_save_macro.c
index 635a6fd..66b59d1 100644
--- a/test/Preprocessor/comment_save_macro.c
+++ b/test/Preprocessor/comment_save_macro.c
@@ -1,6 +1,6 @@
-// RUN: clang -E -C %s | grep '^boo bork bar // zot$' &&
-// RUN: clang -E -CC %s | grep -F '^boo bork /* blah*/ bar // zot$' &&
-// RUN: clang -E %s | grep '^boo bork bar$'
+// RUN: clang-cc -E -C %s | grep '^boo bork bar // zot$' &&
+// RUN: clang-cc -E -CC %s | grep -F '^boo bork /* blah*/ bar // zot$' &&
+// RUN: clang-cc -E %s | grep '^boo bork bar$'
 
 
 #define FOO bork // blah
diff --git a/test/Preprocessor/cxx_and.cpp b/test/Preprocessor/cxx_and.cpp
index b6bd00e..971b7bc 100644
--- a/test/Preprocessor/cxx_and.cpp
+++ b/test/Preprocessor/cxx_and.cpp
@@ -1,7 +1,7 @@
-// RUN: clang -DA -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DB -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA -DB -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -DB -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
 #if defined(A) and defined(B)
 #define X 37
 #else
diff --git a/test/Preprocessor/cxx_bitand.cpp b/test/Preprocessor/cxx_bitand.cpp
index ecc52e8..8d7fe67 100644
--- a/test/Preprocessor/cxx_bitand.cpp
+++ b/test/Preprocessor/cxx_bitand.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -DB=2 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA=1 -DB=2 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
 #if A bitand B
 #define X 37
 #else
diff --git a/test/Preprocessor/cxx_bitor.cpp b/test/Preprocessor/cxx_bitor.cpp
index 36c4452..7645c7e 100644
--- a/test/Preprocessor/cxx_bitor.cpp
+++ b/test/Preprocessor/cxx_bitor.cpp
@@ -1,8 +1,8 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
 #if A bitor B
 #define X 37
 #else
diff --git a/test/Preprocessor/cxx_compl.cpp b/test/Preprocessor/cxx_compl.cpp
index 12e589f..f1cc6d2 100644
--- a/test/Preprocessor/cxx_compl.cpp
+++ b/test/Preprocessor/cxx_compl.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=0 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
 #if compl 0 bitand A
 #define X 37
 #else
diff --git a/test/Preprocessor/cxx_not.cpp b/test/Preprocessor/cxx_not.cpp
index 2587b0a..dd31901 100644
--- a/test/Preprocessor/cxx_not.cpp
+++ b/test/Preprocessor/cxx_not.cpp
@@ -1,5 +1,5 @@
-// RUN: clang -DA=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 37 == 37'
+// RUN: clang-cc -DA=1 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 37 == 37'
 #if not defined(A)
 #define X 37
 #else
diff --git a/test/Preprocessor/cxx_not_eq.cpp b/test/Preprocessor/cxx_not_eq.cpp
index b0be7b3..4940f3b 100644
--- a/test/Preprocessor/cxx_not_eq.cpp
+++ b/test/Preprocessor/cxx_not_eq.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=1 -DB=2 -E %s | grep 'int a = 37 == 37'
+// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -DA=1 -DB=2 -E %s | grep 'int a = 37 == 37'
 #if A not_eq B
 #define X 37
 #else
diff --git a/test/Preprocessor/cxx_oper_keyword.cpp b/test/Preprocessor/cxx_oper_keyword.cpp
index 66586e7..faae687 100644
--- a/test/Preprocessor/cxx_oper_keyword.cpp
+++ b/test/Preprocessor/cxx_oper_keyword.cpp
@@ -1,5 +1,5 @@
-// RUN: not clang %s -E &&
-// RUN: clang %s -E -fno-operator-names
+// RUN: not clang-cc %s -E &&
+// RUN: clang-cc %s -E -fno-operator-names
 
 // Not valid in C++ unless -fno-operator-names is passed.
 #define and foo
diff --git a/test/Preprocessor/cxx_oper_spelling.cpp b/test/Preprocessor/cxx_oper_spelling.cpp
index fc8bc70..85f0426 100644
--- a/test/Preprocessor/cxx_oper_spelling.cpp
+++ b/test/Preprocessor/cxx_oper_spelling.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'a: "and"'
+// RUN: clang-cc -E %s | grep 'a: "and"'
 
 #define X(A) #A
 
diff --git a/test/Preprocessor/cxx_or.cpp b/test/Preprocessor/cxx_or.cpp
index ce3fed1..133f285 100644
--- a/test/Preprocessor/cxx_or.cpp
+++ b/test/Preprocessor/cxx_or.cpp
@@ -1,7 +1,7 @@
-// RUN: clang -DA -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA -DB -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DB -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
 #if defined(A) or defined(B)
 #define X 37
 #else
diff --git a/test/Preprocessor/cxx_true.cpp b/test/Preprocessor/cxx_true.cpp
index 5ebdaf8..e35c54d 100644
--- a/test/Preprocessor/cxx_true.cpp
+++ b/test/Preprocessor/cxx_true.cpp
@@ -1,6 +1,6 @@
-/* RUN: clang -E %s -x=c++ | grep block_1 &&
-   RUN: clang -E %s -x=c++ | not grep block_2 &&
-   RUN: clang -E %s -x=c | not grep block
+/* RUN: clang-cc -E %s -x=c++ | grep block_1 &&
+   RUN: clang-cc -E %s -x=c++ | not grep block_2 &&
+   RUN: clang-cc -E %s -x=c | not grep block
 */
 
 #if true
diff --git a/test/Preprocessor/cxx_xor.cpp b/test/Preprocessor/cxx_xor.cpp
index 7a4c882..a38c3c5 100644
--- a/test/Preprocessor/cxx_xor.cpp
+++ b/test/Preprocessor/cxx_xor.cpp
@@ -1,8 +1,8 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
 #if A xor B
 #define X 37
 #else
diff --git a/test/Preprocessor/disabled-cond-diags.c b/test/Preprocessor/disabled-cond-diags.c
index df9dc89..eb7632f 100644
--- a/test/Preprocessor/disabled-cond-diags.c
+++ b/test/Preprocessor/disabled-cond-diags.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s 2>&1 | not grep "warning\|error"
+// RUN: clang-cc -E %s 2>&1 | not grep "warning\|error"
 
 #if 0
 
diff --git a/test/Preprocessor/dump_macros.c b/test/Preprocessor/dump_macros.c
index 348257f..d3e06b2 100644
--- a/test/Preprocessor/dump_macros.c
+++ b/test/Preprocessor/dump_macros.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -dM %s -o %t &&
+// RUN: clang-cc -E -dM %s -o %t &&
 
 // Space even without expansion tokens
 // RUN: grep "#define A(x) " %t &&
diff --git a/test/Preprocessor/dumptokens_phyloc.c b/test/Preprocessor/dumptokens_phyloc.c
index ae7ccc7..c0e78c9 100644
--- a/test/Preprocessor/dumptokens_phyloc.c
+++ b/test/Preprocessor/dumptokens_phyloc.c
@@ -1,4 +1,4 @@
-// RUN: clang -dump-tokens %s 2>&1 | grep "Spelling=.*dumptokens_phyloc.c:3:20"
+// RUN: clang-cc -dump-tokens %s 2>&1 | grep "Spelling=.*dumptokens_phyloc.c:3:20"
 
 #define TESTPHYLOC 10
 
diff --git a/test/Preprocessor/expr_comma.c b/test/Preprocessor/expr_comma.c
index e36f040..0a24bac 100644
--- a/test/Preprocessor/expr_comma.c
+++ b/test/Preprocessor/expr_comma.c
@@ -1,8 +1,8 @@
 // Comma is not allowed in C89
-// RUN: not clang -E %s -std=c89 -pedantic-errors &&
+// RUN: not clang-cc -E %s -std=c89 -pedantic-errors &&
 
 // Comma is allowed if unevaluated in C99
-// RUN: clang -E %s -std=c99 -pedantic-errors 
+// RUN: clang-cc -E %s -std=c99 -pedantic-errors 
 
 // PR2279
 
diff --git a/test/Preprocessor/expr_invalid_tok.c b/test/Preprocessor/expr_invalid_tok.c
index 877a845..5e750a4 100644
--- a/test/Preprocessor/expr_invalid_tok.c
+++ b/test/Preprocessor/expr_invalid_tok.c
@@ -1,6 +1,6 @@
-// RUN: not clang -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression' &&
-// RUN: not clang -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression' &&
-// RUN: not clang -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
+// RUN: not clang-cc -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression' &&
+// RUN: not clang-cc -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression' &&
+// RUN: not clang-cc -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
 // PR2220
 
 #if 1 * * 2
diff --git a/test/Preprocessor/expr_liveness.c b/test/Preprocessor/expr_liveness.c
index d9e5d7c..3d1e25e 100644
--- a/test/Preprocessor/expr_liveness.c
+++ b/test/Preprocessor/expr_liveness.c
@@ -1,5 +1,5 @@
-/* RUN: clang -E %s -DNO_ERRORS -Werror -Wundef &&
-   RUN: not clang -E %s
+/* RUN: clang-cc -E %s -DNO_ERRORS -Werror -Wundef &&
+   RUN: not clang-cc -E %s
  */
 
 #ifdef NO_ERRORS
diff --git a/test/Preprocessor/expr_usual_conversions.c b/test/Preprocessor/expr_usual_conversions.c
index 90275c9..47aca7b 100644
--- a/test/Preprocessor/expr_usual_conversions.c
+++ b/test/Preprocessor/expr_usual_conversions.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E  2>&1 | grep warning | wc -l | grep 2
+// RUN: clang-cc %s -E  2>&1 | grep warning | wc -l | grep 2
 
 #define INTMAX_MIN (-9223372036854775807LL -1)
 
diff --git a/test/Preprocessor/extension-warning.c b/test/Preprocessor/extension-warning.c
index c325c2f..00c9b87 100644
--- a/test/Preprocessor/extension-warning.c
+++ b/test/Preprocessor/extension-warning.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 // The preprocessor shouldn't warn about extensions within macro bodies that
 // aren't expanded.
diff --git a/test/Preprocessor/function_macro_file.c b/test/Preprocessor/function_macro_file.c
index eeb9256..6a266dd 100644
--- a/test/Preprocessor/function_macro_file.c
+++ b/test/Preprocessor/function_macro_file.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E -P %s | grep f
+/* RUN: clang-cc -E -P %s | grep f
  */
 
 #include "function_macro_file.h"
diff --git a/test/Preprocessor/hash_line.c b/test/Preprocessor/hash_line.c
index 788440b..7ed65d1 100644
--- a/test/Preprocessor/hash_line.c
+++ b/test/Preprocessor/hash_line.c
@@ -1,7 +1,7 @@
 // The 1 and # should not go on the same line.
-// RUN: clang %s -E | not grep "1 #" &&
-// RUN: clang %s -E | grep '^1$' &&
-// RUN: clang %s -E | grep '^      #$'
+// RUN: clang-cc %s -E | not grep "1 #" &&
+// RUN: clang-cc %s -E | grep '^1$' &&
+// RUN: clang-cc %s -E | grep '^      #$'
 1
 #define EMPTY
 EMPTY #
diff --git a/test/Preprocessor/hash_space.c b/test/Preprocessor/hash_space.c
index 77f5cfc..e7dbd3b 100644
--- a/test/Preprocessor/hash_space.c
+++ b/test/Preprocessor/hash_space.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep " #"
+// RUN: clang-cc %s -E | grep " #"
 
 // Should put a space before the # so that -fpreprocessed mode doesn't
 // macro expand this again.
diff --git a/test/Preprocessor/header_lookup1.c b/test/Preprocessor/header_lookup1.c
index 10049ad..df58a6e 100644
--- a/test/Preprocessor/header_lookup1.c
+++ b/test/Preprocessor/header_lookup1.c
@@ -1,2 +1,2 @@
-// RUN: clang -I /usr/include %s -E | grep 'stdio.h.*3.*4'
+// RUN: clang-cc -I /usr/include %s -E | grep 'stdio.h.*3.*4'
 #include <stdio.h>
diff --git a/test/Preprocessor/if_warning.c b/test/Preprocessor/if_warning.c
index bf30d30..f07c887 100644
--- a/test/Preprocessor/if_warning.c
+++ b/test/Preprocessor/if_warning.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E -Wundef -Werror 2>&1 | grep error | count 1 &&
-// RUN: clang %s -E -Werror 2>&1 | not grep error 
+// RUN: clang-cc %s -E -Wundef -Werror 2>&1 | grep error | count 1 &&
+// RUN: clang-cc %s -E -Werror 2>&1 | not grep error 
 
 #if foo   // Should generate an warning
 #endif
diff --git a/test/Preprocessor/ifdef-recover.c b/test/Preprocessor/ifdef-recover.c
index 7fad8c2..3fffcc0 100644
--- a/test/Preprocessor/ifdef-recover.c
+++ b/test/Preprocessor/ifdef-recover.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E %s 2>&1 >/dev/null | grep error: | count 3
+/* RUN: clang-cc -E %s 2>&1 >/dev/null | grep error: | count 3
  */
 
 #ifdef
diff --git a/test/Preprocessor/import_self.c b/test/Preprocessor/import_self.c
index e8f6fa7..2cabe3d 100644
--- a/test/Preprocessor/import_self.c
+++ b/test/Preprocessor/import_self.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -I. %s | grep BODY_OF_FILE | wc -l | grep 1
+// RUN: clang-cc -E -I. %s | grep BODY_OF_FILE | wc -l | grep 1
 
 // This #import should have no effect, as we're importing the current file.
 #import <import_self.c>
diff --git a/test/Preprocessor/include-directive1.c b/test/Preprocessor/include-directive1.c
index 3e449c5..66f70fb 100644
--- a/test/Preprocessor/include-directive1.c
+++ b/test/Preprocessor/include-directive1.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 3
+// RUN: clang-cc -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 3
 
 // XX expands to nothing.
 #define XX
diff --git a/test/Preprocessor/include-directive2.c b/test/Preprocessor/include-directive2.c
index 8309b45..785b77c 100644
--- a/test/Preprocessor/include-directive2.c
+++ b/test/Preprocessor/include-directive2.c
@@ -1,4 +1,4 @@
-// RUN: clang -Eonly %s 
+// RUN: clang-cc -Eonly %s 
 #  define HEADER <float.h>
 
 #  include HEADER
diff --git a/test/Preprocessor/include-directive3.c b/test/Preprocessor/include-directive3.c
index 9e22d5d..2541301 100644
--- a/test/Preprocessor/include-directive3.c
+++ b/test/Preprocessor/include-directive3.c
@@ -1,3 +1,3 @@
-// RUN: clang -include file_to_include.h -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 1
+// RUN: clang-cc -include file_to_include.h -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 1
 // PR3464
 
diff --git a/test/Preprocessor/include-pth.c b/test/Preprocessor/include-pth.c
index 64b46eb..2bdc7dc 100644
--- a/test/Preprocessor/include-pth.c
+++ b/test/Preprocessor/include-pth.c
@@ -1,2 +1,3 @@
-// RUN: clang -x c-header %s -o %t && clang -include-pth %t %s -E | grep 'file_to_include' | count 2
+// RUN: clang-cc -x c-header %s -o %t && 
+// RUN: clang-cc -include-pth %t %s -E | grep 'file_to_include' | count 2
 #include "file_to_include.h"
diff --git a/test/Preprocessor/indent_macro.c b/test/Preprocessor/indent_macro.c
index 0dcaa7b..f6b411e 100644
--- a/test/Preprocessor/indent_macro.c
+++ b/test/Preprocessor/indent_macro.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^   zzap$'
+// RUN: clang-cc -E %s | grep '^   zzap$'
 
 // zzap is on a new line, should be indented.
 #define BLAH  zzap
diff --git a/test/Preprocessor/line-directive.c b/test/Preprocessor/line-directive.c
index a1590fa..07cfa65 100644
--- a/test/Preprocessor/line-directive.c
+++ b/test/Preprocessor/line-directive.c
@@ -1,6 +1,6 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s &&
-// RUN: clang -E %s 2>&1 | grep 'blonk.c:92:2: error: #error ABC' &&
-// RUN: clang -E %s 2>&1 | grep 'blonk.c:93:2: error: #error DEF'
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s &&
+// RUN: clang-cc -E %s 2>&1 | grep 'blonk.c:92:2: error: #error ABC' &&
+// RUN: clang-cc -E %s 2>&1 | grep 'blonk.c:93:2: error: #error DEF'
 
 #line 'a'            // expected-error {{#line directive requires a positive integer argument}}
 #line 0              // expected-error {{#line directive requires a positive integer argument}}
diff --git a/test/Preprocessor/macro_arg_keyword.c b/test/Preprocessor/macro_arg_keyword.c
index 1f9d7e7..92b1ae5 100644
--- a/test/Preprocessor/macro_arg_keyword.c
+++ b/test/Preprocessor/macro_arg_keyword.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep xxx-xxx
+// RUN: clang-cc -E %s | grep xxx-xxx
 
 #define foo(return) return-return
 
diff --git a/test/Preprocessor/macro_disable.c b/test/Preprocessor/macro_disable.c
index 33b856d..ff861d2 100644
--- a/test/Preprocessor/macro_disable.c
+++ b/test/Preprocessor/macro_disable.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep 'a: 2 + M_0(3)(4)(5);' &&
-// RUN: clang -E %s | grep 'b: 4 + 4 + 3 + 2 + 1 + M_0(3)(2)(1);'
+// RUN: clang-cc -E %s | grep 'a: 2 + M_0(3)(4)(5);' &&
+// RUN: clang-cc -E %s | grep 'b: 4 + 4 + 3 + 2 + 1 + M_0(3)(2)(1);'
 
 #define M_0(x) M_ ## x 
 #define M_1(x) x + M_0(0) 
diff --git a/test/Preprocessor/macro_disable2.c b/test/Preprocessor/macro_disable2.c
index 6e1f804..286539e 100644
--- a/test/Preprocessor/macro_disable2.c
+++ b/test/Preprocessor/macro_disable2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'A B C A B A C A B C A'
+// RUN: clang-cc -E %s | grep 'A B C A B A C A B C A'
 
 #define A A B C 
 #define B B C A 
diff --git a/test/Preprocessor/macro_disable3.c b/test/Preprocessor/macro_disable3.c
index b358a55..011de3b 100644
--- a/test/Preprocessor/macro_disable3.c
+++ b/test/Preprocessor/macro_disable3.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep -F 'f(2 * (f(2 * (z[0]))));'
+// RUN: clang-cc %s -E | grep -F 'f(2 * (f(2 * (z[0]))));'
 // Check for C99 6.10.3.4p2.
 
 #define f(a) f(x * (a)) 
diff --git a/test/Preprocessor/macro_disable4.c b/test/Preprocessor/macro_disable4.c
index 4858813..b652b98 100644
--- a/test/Preprocessor/macro_disable4.c
+++ b/test/Preprocessor/macro_disable4.c
@@ -1,4 +1,4 @@
-// RUN: clang -P -E %s | grep 'int f(void)'
+// RUN: clang-cc -P -E %s | grep 'int f(void)'
 // PR1820
 
 #define f(x) h(x
diff --git a/test/Preprocessor/macro_expand.c b/test/Preprocessor/macro_expand.c
index 69a4835..a7a80af 100644
--- a/test/Preprocessor/macro_expand.c
+++ b/test/Preprocessor/macro_expand.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^Y$'
+// RUN: clang-cc -E %s | grep '^Y$'
 
 #define X() Y
 #define Y() X
diff --git a/test/Preprocessor/macro_expandloc.c b/test/Preprocessor/macro_expandloc.c
index 00bba6f..ce1efd2 100644
--- a/test/Preprocessor/macro_expandloc.c
+++ b/test/Preprocessor/macro_expandloc.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep '#include'
+// RUN: clang-cc %s -E 2>&1 | grep '#include'
 #define FOO 1
 
 // The error message should be on the #include line, not the 1.
diff --git a/test/Preprocessor/macro_expandloc2.c b/test/Preprocessor/macro_expandloc2.c
index 3a83329..9adf3fd 100644
--- a/test/Preprocessor/macro_expandloc2.c
+++ b/test/Preprocessor/macro_expandloc2.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep '#include'
+// RUN: clang-cc %s -E 2>&1 | grep '#include'
 #define FOO BAR
 
 // The error message should be on the #include line, not the 1.
diff --git a/test/Preprocessor/macro_fn_comma_swallow.c b/test/Preprocessor/macro_fn_comma_swallow.c
index d4f3bb9..4e06f89 100644
--- a/test/Preprocessor/macro_fn_comma_swallow.c
+++ b/test/Preprocessor/macro_fn_comma_swallow.c
@@ -1,7 +1,7 @@
 // Test the GNU comma swallowing extension.
-// RUN: clang %s -E | grep 'foo{A, }' && 
-// RUN: clang %s -E | grep 'fo2{A,}' && 
-// RUN: clang %s -E | grep '{foo}'
+// RUN: clang-cc %s -E | grep 'foo{A, }' && 
+// RUN: clang-cc %s -E | grep 'fo2{A,}' && 
+// RUN: clang-cc %s -E | grep '{foo}'
 
 #define X(Y) foo{A, Y}
 X()
diff --git a/test/Preprocessor/macro_fn_disable_expand.c b/test/Preprocessor/macro_fn_disable_expand.c
index a9e1d46..d99c018 100644
--- a/test/Preprocessor/macro_fn_disable_expand.c
+++ b/test/Preprocessor/macro_fn_disable_expand.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'bar foo (2)' &&
-// RUN: clang %s -E | grep 'm(ABCD)'
+// RUN: clang-cc %s -E | grep 'bar foo (2)' &&
+// RUN: clang-cc %s -E | grep 'm(ABCD)'
 
 #define foo(x) bar x
 foo(foo) (2)
diff --git a/test/Preprocessor/macro_fn_lparen_scan.c b/test/Preprocessor/macro_fn_lparen_scan.c
index 497ef23..1056fd8 100644
--- a/test/Preprocessor/macro_fn_lparen_scan.c
+++ b/test/Preprocessor/macro_fn_lparen_scan.c
@@ -1,7 +1,7 @@
-// RUN: clang -E %s | grep 'noexp: foo y' &&
-// RUN: clang -E %s | grep 'expand: abc' &&
-// RUN: clang -E %s | grep 'noexp2: foo nonexp' &&
-// RUN: clang -E %s | grep 'expand2: abc'
+// RUN: clang-cc -E %s | grep 'noexp: foo y' &&
+// RUN: clang-cc -E %s | grep 'expand: abc' &&
+// RUN: clang-cc -E %s | grep 'noexp2: foo nonexp' &&
+// RUN: clang-cc -E %s | grep 'expand2: abc'
 
 #define A foo
 #define foo() abc
diff --git a/test/Preprocessor/macro_fn_lparen_scan2.c b/test/Preprocessor/macro_fn_lparen_scan2.c
index fa4d504..fb64bef 100644
--- a/test/Preprocessor/macro_fn_lparen_scan2.c
+++ b/test/Preprocessor/macro_fn_lparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'FUNC (3 +1);'
+// RUN: clang-cc -E %s | grep 'FUNC (3 +1);'
 
 #define F(a) a 
 #define FUNC(a) (a+1) 
diff --git a/test/Preprocessor/macro_fn_placemarker.c b/test/Preprocessor/macro_fn_placemarker.c
index 30c0bcf..ff688ce 100644
--- a/test/Preprocessor/macro_fn_placemarker.c
+++ b/test/Preprocessor/macro_fn_placemarker.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep 'foo(A, )'
+// RUN: clang-cc %s -E | grep 'foo(A, )'
 
 #define X(Y) foo(A, Y)
 X()
diff --git a/test/Preprocessor/macro_fn_preexpand.c b/test/Preprocessor/macro_fn_preexpand.c
index 81a7c41..a392263 100644
--- a/test/Preprocessor/macro_fn_preexpand.c
+++ b/test/Preprocessor/macro_fn_preexpand.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'pre: 1 1 X' &&
-// RUN: clang %s -E | grep 'nopre: 1A(X)'
+// RUN: clang-cc %s -E | grep 'pre: 1 1 X' &&
+// RUN: clang-cc %s -E | grep 'nopre: 1A(X)'
 
 /* Preexpansion of argument. */
 #define A(X) 1 X
diff --git a/test/Preprocessor/macro_fn_varargs_iso.c b/test/Preprocessor/macro_fn_varargs_iso.c
index 716e920..78ad212 100644
--- a/test/Preprocessor/macro_fn_varargs_iso.c
+++ b/test/Preprocessor/macro_fn_varargs_iso.c
@@ -1,7 +1,7 @@
 
-// RUN: clang -E %s | grep 'foo{a, b, c, d, e}' &&
-// RUN: clang -E %s | grep 'foo2{d, C, B}' &&
-// RUN: clang -E %s | grep 'foo2{d,e, C, B}'
+// RUN: clang-cc -E %s | grep 'foo{a, b, c, d, e}' &&
+// RUN: clang-cc -E %s | grep 'foo2{d, C, B}' &&
+// RUN: clang-cc -E %s | grep 'foo2{d,e, C, B}'
 
 #define va1(...) foo{a, __VA_ARGS__, e}
 va1(b, c, d)
diff --git a/test/Preprocessor/macro_fn_varargs_named.c b/test/Preprocessor/macro_fn_varargs_named.c
index b3bb72c..c2841b1 100644
--- a/test/Preprocessor/macro_fn_varargs_named.c
+++ b/test/Preprocessor/macro_fn_varargs_named.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '^a: x$' &&
-// RUN: clang -E %s | grep '^b: x y, z,h$' &&
-// RUN: clang -E %s | grep '^c: foo(x)$'
+// RUN: clang-cc -E %s | grep '^a: x$' &&
+// RUN: clang-cc -E %s | grep '^b: x y, z,h$' &&
+// RUN: clang-cc -E %s | grep '^c: foo(x)$'
 
 #define A(b, c...) b c
 a: A(x)
diff --git a/test/Preprocessor/macro_misc.c b/test/Preprocessor/macro_misc.c
index 147e827..169c5ec 100644
--- a/test/Preprocessor/macro_misc.c
+++ b/test/Preprocessor/macro_misc.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -Eonly -verify
+// RUN: clang-cc %s -Eonly -verify
 
 // This should not be rejected.
 #ifdef defined
diff --git a/test/Preprocessor/macro_not_define.c b/test/Preprocessor/macro_not_define.c
index 388481a..a42240b 100644
--- a/test/Preprocessor/macro_not_define.c
+++ b/test/Preprocessor/macro_not_define.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^ # define X 3$'
+// RUN: clang-cc -E %s | grep '^ # define X 3$'
 
 #define H # 
  #define D define 
diff --git a/test/Preprocessor/macro_paste_bad.c b/test/Preprocessor/macro_paste_bad.c
index 60caa42..1ccfdec 100644
--- a/test/Preprocessor/macro_paste_bad.c
+++ b/test/Preprocessor/macro_paste_bad.c
@@ -1,4 +1,4 @@
-// RUN: clang -Eonly %s 2>&1 | grep error
+// RUN: clang-cc -Eonly %s 2>&1 | grep error
 // pasting ""x"" and ""+"" does not give a valid preprocessing token
 #define XYZ  x ## +
 XYZ
diff --git a/test/Preprocessor/macro_paste_bcpl_comment.c b/test/Preprocessor/macro_paste_bcpl_comment.c
index 9a864d5..8bbee5d 100644
--- a/test/Preprocessor/macro_paste_bcpl_comment.c
+++ b/test/Preprocessor/macro_paste_bcpl_comment.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -Eonly 2>&1 | grep error
+// RUN: clang-cc %s -Eonly 2>&1 | grep error
 
 #define COMM1 / ## /
 COMM1
diff --git a/test/Preprocessor/macro_paste_c_block_comment.c b/test/Preprocessor/macro_paste_c_block_comment.c
index 9299514..86f8124 100644
--- a/test/Preprocessor/macro_paste_c_block_comment.c
+++ b/test/Preprocessor/macro_paste_c_block_comment.c
@@ -1,6 +1,6 @@
-// RUN: clang %s -Eonly 2>&1 | grep error &&
-// RUN: clang %s -Eonly 2>&1 | not grep unterminated &&
-// RUN: clang %s -Eonly 2>&1 | not grep scratch
+// RUN: clang-cc %s -Eonly 2>&1 | grep error &&
+// RUN: clang-cc %s -Eonly 2>&1 | not grep unterminated &&
+// RUN: clang-cc %s -Eonly 2>&1 | not grep scratch
 
 #define COMM / ## *
 COMM
diff --git a/test/Preprocessor/macro_paste_commaext.c b/test/Preprocessor/macro_paste_commaext.c
index e75ac1f..e98849b 100644
--- a/test/Preprocessor/macro_paste_commaext.c
+++ b/test/Preprocessor/macro_paste_commaext.c
@@ -1,8 +1,8 @@
-// RUN: clang %s -E | grep 'V);' &&
-// RUN: clang %s -E | grep 'W, 1, 2);' &&
-// RUN: clang %s -E | grep 'X, 1, 2);' &&
-// RUN: clang %s -E | grep 'Y, );' &&
-// RUN: clang %s -E | grep 'Z, );'
+// RUN: clang-cc %s -E | grep 'V);' &&
+// RUN: clang-cc %s -E | grep 'W, 1, 2);' &&
+// RUN: clang-cc %s -E | grep 'X, 1, 2);' &&
+// RUN: clang-cc %s -E | grep 'Y, );' &&
+// RUN: clang-cc %s -E | grep 'Z, );'
 
 #define debug(format, ...) format, ## __VA_ARGS__)
 debug(V);
diff --git a/test/Preprocessor/macro_paste_empty.c b/test/Preprocessor/macro_paste_empty.c
index 8b78ecd..75504bc 100644
--- a/test/Preprocessor/macro_paste_empty.c
+++ b/test/Preprocessor/macro_paste_empty.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep 'a:Y' &&
-// RUN: clang -E %s | grep 'b:Y' &&
-// RUN: clang -E %s | grep 'c:YY'
+// RUN: clang-cc -E %s | grep 'a:Y' &&
+// RUN: clang-cc -E %s | grep 'b:Y' &&
+// RUN: clang-cc -E %s | grep 'c:YY'
 
 #define FOO(X) X ## Y
 a:FOO()
diff --git a/test/Preprocessor/macro_paste_hard.c b/test/Preprocessor/macro_paste_hard.c
index be46745..25b6c19 100644
--- a/test/Preprocessor/macro_paste_hard.c
+++ b/test/Preprocessor/macro_paste_hard.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '1: aaab 2' &&
-// RUN: clang -E %s | grep '2: 2 baaa' &&
-// RUN: clang -E %s | grep '3: 2 xx'
+// RUN: clang-cc -E %s | grep '1: aaab 2' &&
+// RUN: clang-cc -E %s | grep '2: 2 baaa' &&
+// RUN: clang-cc -E %s | grep '3: 2 xx'
 
 #define a(n) aaa ## n
 #define b 2
diff --git a/test/Preprocessor/macro_paste_hashhash.c b/test/Preprocessor/macro_paste_hashhash.c
index 4ebf55e..42654fd 100644
--- a/test/Preprocessor/macro_paste_hashhash.c
+++ b/test/Preprocessor/macro_paste_hashhash.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^"x ## y";$'
+// RUN: clang-cc -E %s | grep '^"x ## y";$'
 #define hash_hash # ## # 
 #define mkstr(a) # a 
 #define in_between(a) mkstr(a) 
diff --git a/test/Preprocessor/macro_paste_mscomment.c b/test/Preprocessor/macro_paste_mscomment.c
index 858337a..b0fc571 100644
--- a/test/Preprocessor/macro_paste_mscomment.c
+++ b/test/Preprocessor/macro_paste_mscomment.c
@@ -1,4 +1,4 @@
-// RUN: clang -P -E -fms-extensions %s | sed '/^#.\+/d' | tr -d '\n' |
+// RUN: clang-cc -P -E -fms-extensions %s | sed '/^#.\+/d' | tr -d '\n' |
 // RUN:   grep '^int foo;int bar;int baz;$' | count 1
 // This horrible stuff should preprocess into (other than whitespace):
 //   int foo;
diff --git a/test/Preprocessor/macro_paste_none.c b/test/Preprocessor/macro_paste_none.c
index 2ba2820..e978fca 100644
--- a/test/Preprocessor/macro_paste_none.c
+++ b/test/Preprocessor/macro_paste_none.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '!!'
+// RUN: clang-cc -E %s | grep '!!'
 
 #define A(B,C) B ## C
 
diff --git a/test/Preprocessor/macro_paste_simple.c b/test/Preprocessor/macro_paste_simple.c
index 82b75da..2affbac 100644
--- a/test/Preprocessor/macro_paste_simple.c
+++ b/test/Preprocessor/macro_paste_simple.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep "barbaz123"
+// RUN: clang-cc %s -E | grep "barbaz123"
 
 #define FOO bar ## baz ## 123
 
diff --git a/test/Preprocessor/macro_paste_spacing.c b/test/Preprocessor/macro_paste_spacing.c
index 471ebcc..130548d 100644
--- a/test/Preprocessor/macro_paste_spacing.c
+++ b/test/Preprocessor/macro_paste_spacing.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep "^xy$"
+// RUN: clang-cc %s -E | grep "^xy$"
 
 #define A  x ## y
 blah
diff --git a/test/Preprocessor/macro_rescan.c b/test/Preprocessor/macro_rescan.c
index 2ceb292..17b4dc2 100644
--- a/test/Preprocessor/macro_rescan.c
+++ b/test/Preprocessor/macro_rescan.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep 'ei_1 = (17 +1);' &&
-// RUN: clang -E %s | grep 'ei_2 = (M1)(17);'
+// RUN: clang-cc -E %s | grep 'ei_1 = (17 +1);' &&
+// RUN: clang-cc -E %s | grep 'ei_2 = (M1)(17);'
 
 #define M1(a) (a+1) 
 #define M2(b) b 
diff --git a/test/Preprocessor/macro_rescan2.c b/test/Preprocessor/macro_rescan2.c
index 4fae444..6914ae0 100644
--- a/test/Preprocessor/macro_rescan2.c
+++ b/test/Preprocessor/macro_rescan2.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'a: 2\*f(9)' &&
-// RUN: clang %s -E | grep 'b: 2\*9\*g'
+// RUN: clang-cc %s -E | grep 'a: 2\*f(9)' &&
+// RUN: clang-cc %s -E | grep 'b: 2\*9\*g'
 
 #define f(a) a*g 
 #define g f 
diff --git a/test/Preprocessor/macro_rescan_varargs.c b/test/Preprocessor/macro_rescan_varargs.c
index 3c79d0e..ed1056a 100644
--- a/test/Preprocessor/macro_rescan_varargs.c
+++ b/test/Preprocessor/macro_rescan_varargs.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep -F "1: F, (, 'a', 'b', );" &&
-// RUN: clang -E %s | grep -F "2: 'a' + 'b';"
+// RUN: clang-cc -E %s | grep -F "1: F, (, 'a', 'b', );" &&
+// RUN: clang-cc -E %s | grep -F "2: 'a' + 'b';"
 #define LPAREN ( 
 #define RPAREN ) 
 #define F(x, y) x + y 
diff --git a/test/Preprocessor/macro_rparen_scan.c b/test/Preprocessor/macro_rparen_scan.c
index d4e6283..9275098 100644
--- a/test/Preprocessor/macro_rparen_scan.c
+++ b/test/Preprocessor/macro_rparen_scan.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^3 ;$'
+// RUN: clang-cc -E %s | grep '^3 ;$'
 
 /* Right paren scanning, hard case.  Should expand to 3. */
 #define i(x) 3 
diff --git a/test/Preprocessor/macro_rparen_scan2.c b/test/Preprocessor/macro_rparen_scan2.c
index a9ca9d1..41748ac 100644
--- a/test/Preprocessor/macro_rparen_scan2.c
+++ b/test/Preprocessor/macro_rparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep -F 'static int glob = (1 + 1 );'
+// RUN: clang-cc -E %s | grep -F 'static int glob = (1 + 1 );'
 
 #define R_PAREN ) 
 
diff --git a/test/Preprocessor/macro_space.c b/test/Preprocessor/macro_space.c
index 553fddb..4fdbb0a 100644
--- a/test/Preprocessor/macro_space.c
+++ b/test/Preprocessor/macro_space.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep '! ,'
+// RUN: clang-cc %s -E | grep '! ,'
 
 #define XX
 ! XX,
diff --git a/test/Preprocessor/mi_opt.c b/test/Preprocessor/mi_opt.c
index 96029dc..aa69e2b 100644
--- a/test/Preprocessor/mi_opt.c
+++ b/test/Preprocessor/mi_opt.c
@@ -1,4 +1,4 @@
-// RUN: not clang -fsyntax-only %s
+// RUN: not clang-cc -fsyntax-only %s
 // PR1900
 // This test should get a redefinition error from m_iopt.h: the MI opt 
 // shouldn't apply.
diff --git a/test/Preprocessor/objc-pp.m b/test/Preprocessor/objc-pp.m
index 0648acd..866e7e4 100644
--- a/test/Preprocessor/objc-pp.m
+++ b/test/Preprocessor/objc-pp.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
 
 #import <stdio.h>  // no warning.
 
diff --git a/test/Preprocessor/output_paste_avoid.c b/test/Preprocessor/output_paste_avoid.c
index 7fe8788..b23d22a 100644
--- a/test/Preprocessor/output_paste_avoid.c
+++ b/test/Preprocessor/output_paste_avoid.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '+ + - - + + = = =' &&
-// RUN: clang -E %s | not grep -F '...' &&
-// RUN: clang -E %s | not grep -F 'L"str"'
+// RUN: clang-cc -E %s | grep '+ + - - + + = = =' &&
+// RUN: clang-cc -E %s | not grep -F '...' &&
+// RUN: clang-cc -E %s | not grep -F 'L"str"'
 
 // This should print as ".. ." to avoid turning into ...
 #define y(a) ..a
diff --git a/test/Preprocessor/paste_bad.c b/test/Preprocessor/paste_bad.c
index 89e8799..de2417f 100644
--- a/test/Preprocessor/paste_bad.c
+++ b/test/Preprocessor/paste_bad.c
@@ -1,6 +1,6 @@
 // GCC PR 20077
-// RUN: not clang -E %s &&
-// RUN: not clang -E %s 2>&1 | grep error: | wc -l | grep 10
+// RUN: not clang-cc -E %s &&
+// RUN: not clang-cc -E %s 2>&1 | grep error: | wc -l | grep 10
 
 #define a   a ## ## /* { dg-error "end of a macro expansion" } */
 #define b() b ## ## /* { dg-error "end of a macro expansion" } */
diff --git a/test/Preprocessor/poison.c b/test/Preprocessor/poison.c
index 5df4b47..9759ae4 100644
--- a/test/Preprocessor/poison.c
+++ b/test/Preprocessor/poison.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep error
+// RUN: clang-cc %s -E 2>&1 | grep error
 
 #pragma GCC poison rindex
 rindex(some_string, 'h');
diff --git a/test/Preprocessor/poison_expansion.c b/test/Preprocessor/poison_expansion.c
index 3444bac..45676c8 100644
--- a/test/Preprocessor/poison_expansion.c
+++ b/test/Preprocessor/poison_expansion.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | not grep error
+// RUN: clang-cc %s -E 2>&1 | not grep error
 
 #define strrchr rindex
 #pragma GCC poison rindex
diff --git a/test/Preprocessor/pr2086.c b/test/Preprocessor/pr2086.c
index ddf2c16..4df65a4 100644
--- a/test/Preprocessor/pr2086.c
+++ b/test/Preprocessor/pr2086.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s
+// RUN: clang-cc -E %s
 
 #define test
 #include "pr2086.h"
diff --git a/test/Preprocessor/pragma_microsoft.c b/test/Preprocessor/pragma_microsoft.c
index e05126d..81e90e3 100644
--- a/test/Preprocessor/pragma_microsoft.c
+++ b/test/Preprocessor/pragma_microsoft.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fms-extensions
+// RUN: clang-cc %s -fsyntax-only -verify -fms-extensions
 
 // rdar://6495941
 
diff --git a/test/Preprocessor/pragma_unknown.c b/test/Preprocessor/pragma_unknown.c
index ca2bea1..e1b040b 100644
--- a/test/Preprocessor/pragma_unknown.c
+++ b/test/Preprocessor/pragma_unknown.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '#pragma foo bar'
+// RUN: clang-cc -E %s | grep '#pragma foo bar'
 
 // GCC doesn't expand macro args for unrecognized pragmas.
 #define bar xX
diff --git a/test/Preprocessor/print_line_track.c b/test/Preprocessor/print_line_track.c
index 505e5f9..539433d 100644
--- a/test/Preprocessor/print_line_track.c
+++ b/test/Preprocessor/print_line_track.c
@@ -1,8 +1,8 @@
-/* RUN: clang -E %s | grep 'a 3' &&
- * RUN: clang -E %s | grep 'b 16' &&
- * RUN: clang -E -P %s | grep 'a 3' &&
- * RUN: clang -E -P %s | grep 'b 16' &&
- * RUN: clang -E %s | not grep '# 0 '
+/* RUN: clang-cc -E %s | grep 'a 3' &&
+ * RUN: clang-cc -E %s | grep 'b 16' &&
+ * RUN: clang-cc -E -P %s | grep 'a 3' &&
+ * RUN: clang-cc -E -P %s | grep 'b 16' &&
+ * RUN: clang-cc -E %s | not grep '# 0 '
  * PR1848
  * PR3437
 */
diff --git a/test/Preprocessor/skipping_unclean.c b/test/Preprocessor/skipping_unclean.c
index 9efdd64..31ce9b4 100644
--- a/test/Preprocessor/skipping_unclean.c
+++ b/test/Preprocessor/skipping_unclean.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep bark
+// RUN: clang-cc -E %s | grep bark
 
 #if 0
 blah
diff --git a/test/Preprocessor/stringize_misc.c b/test/Preprocessor/stringize_misc.c
index b8e4480..251116a 100644
--- a/test/Preprocessor/stringize_misc.c
+++ b/test/Preprocessor/stringize_misc.c
@@ -1,9 +1,9 @@
-// RUN: clang -E %s | grep -F '"f(1, 2)" "g((x=y++, y))"' &&
-// RUN: clang -E %s | grep -F '"{a=1" "b=2;}"' &&
-// RUN: clang -E %s | grep -F '"<" "["' &&
-// RUN: clang -E %s | grep -F '"(,)" "(...)"' &&
-// RUN: clang -E %s | grep -F '{a=1 c=3; b=2;}' &&
-// RUN: clang -E %s | grep -F '"a COMMA b" "(a, b)"'
+// RUN: clang-cc -E %s | grep -F '"f(1, 2)" "g((x=y++, y))"' &&
+// RUN: clang-cc -E %s | grep -F '"{a=1" "b=2;}"' &&
+// RUN: clang-cc -E %s | grep -F '"<" "["' &&
+// RUN: clang-cc -E %s | grep -F '"(,)" "(...)"' &&
+// RUN: clang-cc -E %s | grep -F '{a=1 c=3; b=2;}' &&
+// RUN: clang-cc -E %s | grep -F '"a COMMA b" "(a, b)"'
 
 #define M(x, y) #x #y
 
diff --git a/test/Preprocessor/stringize_space.c b/test/Preprocessor/stringize_space.c
index 8c83677..e41736c 100644
--- a/test/Preprocessor/stringize_space.c
+++ b/test/Preprocessor/stringize_space.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep -- '-"" , - "" , -"" , - ""'
+// RUN: clang-cc -E %s | grep -- '-"" , - "" , -"" , - ""'
 
 #define A(b) -#b  ,  - #b  ,  -# b  ,  - # b
 A()
diff --git a/test/Preprocessor/stringize_space2.c b/test/Preprocessor/stringize_space2.c
index cf81674..6a96894 100644
--- a/test/Preprocessor/stringize_space2.c
+++ b/test/Preprocessor/stringize_space2.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E %s | grep 'a c'
+/* RUN: clang-cc -E %s | grep 'a c'
  */
 #define t(x) #x
 t(a
diff --git a/test/Preprocessor/undef-error.c b/test/Preprocessor/undef-error.c
index a276934..f818e59 100644
--- a/test/Preprocessor/undef-error.c
+++ b/test/Preprocessor/undef-error.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -pedantic-errors -verify 
+// RUN: clang-cc %s -pedantic-errors -verify 
 // PR2045
 
 #define b
diff --git a/test/Preprocessor/unterminated.c b/test/Preprocessor/unterminated.c
index 59bcae8..2040aac 100644
--- a/test/Preprocessor/unterminated.c
+++ b/test/Preprocessor/unterminated.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -verify %s
+// RUN: clang-cc -E -verify %s
 // PR3096
 #ifdef FOO // expected-error {{unterminated conditional directive}}
 /* /* */
diff --git a/test/Rewriter/block-test.c b/test/Rewriter/block-test.c
index c65815f..9b24e63 100644
--- a/test/Rewriter/block-test.c
+++ b/test/Rewriter/block-test.c
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-blocks %s -fblocks -o -
+// RUN: clang-cc -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/test/Rewriter/crash.m b/test/Rewriter/crash.m
index 2e34850..d4aba58 100644
--- a/test/Rewriter/crash.m
+++ b/test/Rewriter/crash.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc -o - %s
+// RUN: clang-cc -rewrite-objc -o - %s
 // rdar://5950938
 @interface NSArray {}
 + (id)arrayWithObjects:(id)firstObj, ...;
diff --git a/test/Rewriter/finally.m b/test/Rewriter/finally.m
index 0d623dc..bdc5a34 100644
--- a/test/Rewriter/finally.m
+++ b/test/Rewriter/finally.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc -verify %s -o -
+// RUN: clang-cc -rewrite-objc -verify %s -o -
 
 int main() {
   @try {
diff --git a/test/Rewriter/id-test-3.m b/test/Rewriter/id-test-3.m
index 121af3e..ad1e76d 100644
--- a/test/Rewriter/id-test-3.m
+++ b/test/Rewriter/id-test-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @protocol P
 - (id<P>) Meth: (id<P>) Arg;
diff --git a/test/Rewriter/ivar-encoding-1.m b/test/Rewriter/ivar-encoding-1.m
index fb504fd..7591461 100644
--- a/test/Rewriter/ivar-encoding-1.m
+++ b/test/Rewriter/ivar-encoding-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface Intf
 {
diff --git a/test/Rewriter/ivar-encoding-2.m b/test/Rewriter/ivar-encoding-2.m
index a5872d4..86cc9b6 100644
--- a/test/Rewriter/ivar-encoding-2.m
+++ b/test/Rewriter/ivar-encoding-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @implementation Intf
 {
diff --git a/test/Rewriter/metadata-test-1.m b/test/Rewriter/metadata-test-1.m
index 03586c5..40eded1 100644
--- a/test/Rewriter/metadata-test-1.m
+++ b/test/Rewriter/metadata-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface Intf 
 @end
diff --git a/test/Rewriter/metadata-test-2.m b/test/Rewriter/metadata-test-2.m
index 9a53bda..ab838f1 100644
--- a/test/Rewriter/metadata-test-2.m
+++ b/test/Rewriter/metadata-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 typedef struct _NSPoint {
     float x;
diff --git a/test/Rewriter/method-encoding-1.m b/test/Rewriter/method-encoding-1.m
index 6559c6b..25dccbf 100644
--- a/test/Rewriter/method-encoding-1.m
+++ b/test/Rewriter/method-encoding-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @protocol P1
 - (void) MyProtoMeth : (int **) arg1 : (void*) arg2;
diff --git a/test/Rewriter/objc-encoding-bug-1.m b/test/Rewriter/objc-encoding-bug-1.m
index d294437..684a0d2 100644
--- a/test/Rewriter/objc-encoding-bug-1.m
+++ b/test/Rewriter/objc-encoding-bug-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 typedef struct NSMethodFrameArgInfo {
     struct NSMethodFrameArgInfo *subInfo;
diff --git a/test/Rewriter/objc-ivar-receiver-1.m b/test/Rewriter/objc-ivar-receiver-1.m
index 5a9365f..c7ad05a 100644
--- a/test/Rewriter/objc-ivar-receiver-1.m
+++ b/test/Rewriter/objc-ivar-receiver-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -rewrite-objc %s -o - &&
-// RUN: clang -rewrite-objc %s -o - | grep 'newInv->_container'
+// RUN: clang-cc -rewrite-objc %s -o - &&
+// RUN: clang-cc -rewrite-objc %s -o - | grep 'newInv->_container'
 
 @interface NSMutableArray 
 - (void)addObject:(id)addObject;
diff --git a/test/Rewriter/objc-string-concat-1.m b/test/Rewriter/objc-string-concat-1.m
index bb3e835..e8f8a88 100644
--- a/test/Rewriter/objc-string-concat-1.m
+++ b/test/Rewriter/objc-string-concat-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @class NSString;
 
diff --git a/test/Rewriter/objc-super-test.m b/test/Rewriter/objc-super-test.m
index fd61dbe..500933d 100644
--- a/test/Rewriter/objc-super-test.m
+++ b/test/Rewriter/objc-super-test.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o - | grep objc_msgSendSuper | grep MainMethod
+// RUN: clang-cc -rewrite-objc %s -o - | grep objc_msgSendSuper | grep MainMethod
 
 typedef struct objc_selector    *SEL;
 typedef struct objc_object *id;
diff --git a/test/Rewriter/objc-synchronized-1.m b/test/Rewriter/objc-synchronized-1.m
index 5f8ae31..e3c4116 100644
--- a/test/Rewriter/objc-synchronized-1.m
+++ b/test/Rewriter/objc-synchronized-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 id SYNCH_EXPR();
 void SYNCH_BODY();
diff --git a/test/Rewriter/properties.m b/test/Rewriter/properties.m
index 68ce6e9..ac8ee9f 100644
--- a/test/Rewriter/properties.m
+++ b/test/Rewriter/properties.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o -
+// RUN: clang-cc -rewrite-objc %s -o -
 
 @interface Foo {
     int i;
diff --git a/test/Rewriter/protocol-rewrite-1.m b/test/Rewriter/protocol-rewrite-1.m
index 204f34a..263a97d 100644
--- a/test/Rewriter/protocol-rewrite-1.m
+++ b/test/Rewriter/protocol-rewrite-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 typedef struct MyWidget {
   int a;
diff --git a/test/Rewriter/rewrite-api-bug.m b/test/Rewriter/rewrite-api-bug.m
index 4d69eb0..ba0511b 100644
--- a/test/Rewriter/rewrite-api-bug.m
+++ b/test/Rewriter/rewrite-api-bug.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface MyDerived
 - (void) instanceMethod;
diff --git a/test/Rewriter/rewrite-foreach-1.m b/test/Rewriter/rewrite-foreach-1.m
index a4e83a3..eef33f8 100644
--- a/test/Rewriter/rewrite-foreach-1.m
+++ b/test/Rewriter/rewrite-foreach-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
             
 @protocol P @end
 
diff --git a/test/Rewriter/rewrite-foreach-2.m b/test/Rewriter/rewrite-foreach-2.m
index 8ef4e96..12f0e83 100644
--- a/test/Rewriter/rewrite-foreach-2.m
+++ b/test/Rewriter/rewrite-foreach-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @protocol P @end
 
diff --git a/test/Rewriter/rewrite-foreach-3.m b/test/Rewriter/rewrite-foreach-3.m
index 7bb4e9b..3aa0d95 100644
--- a/test/Rewriter/rewrite-foreach-3.m
+++ b/test/Rewriter/rewrite-foreach-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @protocol P @end
 
diff --git a/test/Rewriter/rewrite-foreach-4.m b/test/Rewriter/rewrite-foreach-4.m
index c4d8bf6..774f9a0 100644
--- a/test/Rewriter/rewrite-foreach-4.m
+++ b/test/Rewriter/rewrite-foreach-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface MyList
 - (id) allKeys;
diff --git a/test/Rewriter/rewrite-foreach-5.m b/test/Rewriter/rewrite-foreach-5.m
index 0016da3..d0d1244 100644
--- a/test/Rewriter/rewrite-foreach-5.m
+++ b/test/Rewriter/rewrite-foreach-5.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface MyList
 - (id) allKeys;
diff --git a/test/Rewriter/rewrite-foreach-6.m b/test/Rewriter/rewrite-foreach-6.m
index 3bea346..c6043bb 100644
--- a/test/Rewriter/rewrite-foreach-6.m
+++ b/test/Rewriter/rewrite-foreach-6.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -rewrite-objc -o=-
+// RUN: clang-cc %s -rewrite-objc -o=-
 // rdar://5716356
 // FIXME: Should be able to pipe into clang, but code is not
 // yet correct for other reasons: rdar://5716940
diff --git a/test/Rewriter/rewrite-nest.m b/test/Rewriter/rewrite-nest.m
index 1a82935..7a1690a 100644
--- a/test/Rewriter/rewrite-nest.m
+++ b/test/Rewriter/rewrite-nest.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface NSMapTable @end
 @interface NSEnumerator @end
diff --git a/test/Rewriter/rewrite-protocol-type-1.m b/test/Rewriter/rewrite-protocol-type-1.m
index 47610df..48dc029 100644
--- a/test/Rewriter/rewrite-protocol-type-1.m
+++ b/test/Rewriter/rewrite-protocol-type-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @protocol MyProto1 
 @end
diff --git a/test/Rewriter/rewrite-try-catch.m b/test/Rewriter/rewrite-try-catch.m
index be0bf09..8c6d08f 100644
--- a/test/Rewriter/rewrite-try-catch.m
+++ b/test/Rewriter/rewrite-try-catch.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface Foo @end
 @interface GARF @end
diff --git a/test/Rewriter/static-type-protocol-1.m b/test/Rewriter/static-type-protocol-1.m
index 4283d07..0985a9d 100644
--- a/test/Rewriter/static-type-protocol-1.m
+++ b/test/Rewriter/static-type-protocol-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @protocol Proto
 - (void) ProtoDidget;
diff --git a/test/Rewriter/undecl-objc-h.m b/test/Rewriter/undecl-objc-h.m
index 938a397..b097651 100644
--- a/test/Rewriter/undecl-objc-h.m
+++ b/test/Rewriter/undecl-objc-h.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 typedef struct S {
 	int * pint;
diff --git a/test/Rewriter/undeclared-method-1.m b/test/Rewriter/undeclared-method-1.m
index 67b9705..795fd61 100644
--- a/test/Rewriter/undeclared-method-1.m
+++ b/test/Rewriter/undeclared-method-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface Derived @end
 
diff --git a/test/Rewriter/undef-field-reference-1.m b/test/Rewriter/undef-field-reference-1.m
index f91345e..43bc2ad 100644
--- a/test/Rewriter/undef-field-reference-1.m
+++ b/test/Rewriter/undef-field-reference-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 @interface MyDerived 
 {
diff --git a/test/Rewriter/va-method.m b/test/Rewriter/va-method.m
index 00065eb..3bee599 100644
--- a/test/Rewriter/va-method.m
+++ b/test/Rewriter/va-method.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
 
 #include <stdarg.h>
 
diff --git a/test/Sema/128bitint.c b/test/Sema/128bitint.c
index 45678e9..2a18d90 100644
--- a/test/Sema/128bitint.c
+++ b/test/Sema/128bitint.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef int i128 __attribute__((__mode__(TI)));
 typedef unsigned u128 __attribute__((__mode__(TI)));
 
diff --git a/test/Sema/PR2727.c b/test/Sema/PR2727.c
index 1b3096f..52d8392 100644
--- a/test/Sema/PR2727.c
+++ b/test/Sema/PR2727.c
@@ -1,5 +1,5 @@
-// RUN: clang -verify -fsyntax-only -std=c90 %s &&
-// RUN: clang -verify -fsyntax-only -std=c99 %s
+// RUN: clang-cc -verify -fsyntax-only -std=c90 %s &&
+// RUN: clang-cc -verify -fsyntax-only -std=c99 %s
 
 int f (int x)
 {
diff --git a/test/Sema/PR2728.c b/test/Sema/PR2728.c
index 01a3be7..26c96fe 100644
--- a/test/Sema/PR2728.c
+++ b/test/Sema/PR2728.c
@@ -1,5 +1,5 @@
-// RUN: clang -verify -fsyntax-only -std=c90 %s &&
-// RUN: clang -verify -fsyntax-only -std=c99 %s
+// RUN: clang-cc -verify -fsyntax-only -std=c90 %s &&
+// RUN: clang-cc -verify -fsyntax-only -std=c99 %s
 
 struct s
 {
diff --git a/test/Sema/PR2919-builtin-types-compat-strips-crv.c b/test/Sema/PR2919-builtin-types-compat-strips-crv.c
index 0e37488..160ec4a 100644
--- a/test/Sema/PR2919-builtin-types-compat-strips-crv.c
+++ b/test/Sema/PR2919-builtin-types-compat-strips-crv.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 typedef struct foo T0;
 typedef const struct foo T1;
diff --git a/test/Sema/PR2923.c b/test/Sema/PR2923.c
index 5d82776..c75e7ba 100644
--- a/test/Sema/PR2923.c
+++ b/test/Sema/PR2923.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // Test for absence of crash reported in PR 2923:
 //
diff --git a/test/Sema/PR2963-enum-constant.c b/test/Sema/PR2963-enum-constant.c
index 28becc3..7a08814 100644
--- a/test/Sema/PR2963-enum-constant.c
+++ b/test/Sema/PR2963-enum-constant.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -pedantic -fsyntax-only
+// RUN: clang-cc %s -verify -pedantic -fsyntax-only
 
 typedef short short_fixed;
 
diff --git a/test/Sema/address-constant.c b/test/Sema/address-constant.c
index e1704b8..69f2f79 100644
--- a/test/Sema/address-constant.c
+++ b/test/Sema/address-constant.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int i;
 int a[] = {0};
diff --git a/test/Sema/address_spaces.c b/test/Sema/address_spaces.c
index a081b38..8f63726 100644
--- a/test/Sema/address_spaces.c
+++ b/test/Sema/address_spaces.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 #define _AS1 __attribute__((address_space(1)))
 #define _AS2 __attribute__((address_space(2)))
diff --git a/test/Sema/align-x86.c b/test/Sema/align-x86.c
index df392a2..f6668dd 100644
--- a/test/Sema/align-x86.c
+++ b/test/Sema/align-x86.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
 
 // PR3433
 double g1;
diff --git a/test/Sema/annotate.c b/test/Sema/annotate.c
index 4387d4f..aec2af8 100644
--- a/test/Sema/annotate.c
+++ b/test/Sema/annotate.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 void __attribute__((annotate("foo"))) foo(float *a) { 
   __attribute__((annotate("bar"))) int x;
diff --git a/test/Sema/anonymous-struct-union.c b/test/Sema/anonymous-struct-union.c
index 9784236..ca1133b 100644
--- a/test/Sema/anonymous-struct-union.c
+++ b/test/Sema/anonymous-struct-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 struct X {
   union {
     float f3;
diff --git a/test/Sema/arg-duplicate.c b/test/Sema/arg-duplicate.c
index c5498a2..82b2992 100644
--- a/test/Sema/arg-duplicate.c
+++ b/test/Sema/arg-duplicate.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int f3(y, x, 
        x)          // expected-error {{redefinition of parameter}}
diff --git a/test/Sema/arg-scope-c99.c b/test/Sema/arg-scope-c99.c
index 2d386c4..b5b1c8a 100644
--- a/test/Sema/arg-scope-c99.c
+++ b/test/Sema/arg-scope-c99.c
@@ -1,2 +1,2 @@
-// RUN: clang -fsyntax-only -std=c99 -verify %s
+// RUN: clang-cc -fsyntax-only -std=c99 -verify %s
 int bb(int sz, int ar[sz][sz]) { }
diff --git a/test/Sema/arg-scope.c b/test/Sema/arg-scope.c
index fc2bb70..c1cc7e1 100644
--- a/test/Sema/arg-scope.c
+++ b/test/Sema/arg-scope.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 int aa(int b, int x[sizeof b]) {}
 
 void foo(int i, int A[i]) {}
diff --git a/test/Sema/array-constraint.c b/test/Sema/array-constraint.c
index 06b5d74..5a09e20 100644
--- a/test/Sema/array-constraint.c
+++ b/test/Sema/array-constraint.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 struct s;  // expected-note 2 {{forward declaration of 'struct s'}}
 struct s* t (struct s z[]) {   // expected-error {{array has incomplete element type}}
diff --git a/test/Sema/array-declared-as-incorrect-type.c b/test/Sema/array-declared-as-incorrect-type.c
index 9b7d8b7..3f6fa33 100644
--- a/test/Sema/array-declared-as-incorrect-type.c
+++ b/test/Sema/array-declared-as-incorrect-type.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 extern int a1[];
 int a1[1];
diff --git a/test/Sema/array-init.c b/test/Sema/array-init.c
index 0c1bbc0..4e95a01 100644
--- a/test/Sema/array-init.c
+++ b/test/Sema/array-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
 
 extern int foof() = 1; // expected-error{{illegal initializer (only variables can be initialized)}}
 
diff --git a/test/Sema/asm.c b/test/Sema/asm.c
index 6ed9c50..4072a5c 100644
--- a/test/Sema/asm.c
+++ b/test/Sema/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -arch=i386 -verify -fsyntax-only
+// RUN: clang-cc %s -arch=i386 -verify -fsyntax-only
 
 void f() {
   int i;
diff --git a/test/Sema/assign-null.c b/test/Sema/assign-null.c
index 6972d90..a343c80 100644
--- a/test/Sema/assign-null.c
+++ b/test/Sema/assign-null.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #include <stddef.h>
 
diff --git a/test/Sema/assign.c b/test/Sema/assign.c
index 4ddb25a..b25262c 100644
--- a/test/Sema/assign.c
+++ b/test/Sema/assign.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void *test1(void) { return 0; }
 
diff --git a/test/Sema/ast-print.c b/test/Sema/ast-print.c
index 34b0411..a8988b0 100644
--- a/test/Sema/ast-print.c
+++ b/test/Sema/ast-print.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -ast-print
+// RUN: clang-cc %s -ast-print
 
 typedef void func_typedef();
 func_typedef xxx;
diff --git a/test/Sema/attr-aligned.c b/test/Sema/attr-aligned.c
index e689c0e..c7d65ee 100644
--- a/test/Sema/attr-aligned.c
+++ b/test/Sema/attr-aligned.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
 
 int x __attribute__((aligned(3))); // expected-error {{requested alignment is not a power of 2}}
 
diff --git a/test/Sema/attr-cleanup.c b/test/Sema/attr-cleanup.c
index d239c1a..6989608 100644
--- a/test/Sema/attr-cleanup.c
+++ b/test/Sema/attr-cleanup.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 void c1(int *a);
 
diff --git a/test/Sema/attr-deprecated.c b/test/Sema/attr-deprecated.c
index 2540e59..6597bad 100644
--- a/test/Sema/attr-deprecated.c
+++ b/test/Sema/attr-deprecated.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 int f() __attribute__((deprecated));
 void g() __attribute__((deprecated));
diff --git a/test/Sema/attr-mode.c b/test/Sema/attr-mode.c
index 4d6ce28..ac411d7 100644
--- a/test/Sema/attr-mode.c
+++ b/test/Sema/attr-mode.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef int i16_1 __attribute((mode(HI)));
 int i16_1_test[sizeof(i16_1) == 2 ? 1 : -1];
diff --git a/test/Sema/attr-nodebug.c b/test/Sema/attr-nodebug.c
index a3b525c..512ecfd 100644
--- a/test/Sema/attr-nodebug.c
+++ b/test/Sema/attr-nodebug.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 int a __attribute__((nodebug)); // expected-warning {{'nodebug' attribute only applies to function types}}
 
diff --git a/test/Sema/attr-noinline.c b/test/Sema/attr-noinline.c
index 2d1c0f0..cf695f0 100644
--- a/test/Sema/attr-noinline.c
+++ b/test/Sema/attr-noinline.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 int a __attribute__((noinline)); // expected-warning {{'noinline' attribute only applies to function types}}
 
diff --git a/test/Sema/attr-noreturn.c b/test/Sema/attr-noreturn.c
index 5384eaf..35c2bb5 100644
--- a/test/Sema/attr-noreturn.c
+++ b/test/Sema/attr-noreturn.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
 
 static void (*fp0)(void) __attribute__((noreturn));
 
diff --git a/test/Sema/attr-unused.c b/test/Sema/attr-unused.c
index 87d5857..dbb5e63 100644
--- a/test/Sema/attr-unused.c
+++ b/test/Sema/attr-unused.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
 
 static void (*fp0)(void) __attribute__((unused));
 
diff --git a/test/Sema/attr-used.c b/test/Sema/attr-used.c
index 1067481..fdabf7f 100644
--- a/test/Sema/attr-used.c
+++ b/test/Sema/attr-used.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
 
 extern int l0 __attribute__((used)); // expected-warning {{used attribute ignored}}
 __private_extern__ int l1 __attribute__((used)); // expected-warning {{used attribute ignored}}
diff --git a/test/Sema/attr-warn_unused_result.c b/test/Sema/attr-warn_unused_result.c
index 38f201c..b4ef1bb 100644
--- a/test/Sema/attr-warn_unused_result.c
+++ b/test/Sema/attr-warn_unused_result.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 // rdar://6587766
 
 int fn1() __attribute__ ((warn_unused_result));
diff --git a/test/Sema/attr-weak.c b/test/Sema/attr-weak.c
index a58e61e..b79e1e7 100644
--- a/test/Sema/attr-weak.c
+++ b/test/Sema/attr-weak.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
 
 extern int g0 __attribute__((weak));
 extern int g1 __attribute__((weak_import));
diff --git a/test/Sema/bitfield-layout.c b/test/Sema/bitfield-layout.c
index 0ac5dd2..4405c80 100644
--- a/test/Sema/bitfield-layout.c
+++ b/test/Sema/bitfield-layout.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -triple=i686-apple-darwin9
+// RUN: clang-cc %s -fsyntax-only -verify -triple=i686-apple-darwin9
 
 #define CHECK_SIZE(kind, name, size) extern int name##1[sizeof(kind name) == size ? 1 : -1];
 #define CHECK_ALIGN(kind, name, size) extern int name##2[__alignof(kind name) == size ? 1 : -1];
diff --git a/test/Sema/bitfield.c b/test/Sema/bitfield.c
index 0a658c5..0022b4d 100644
--- a/test/Sema/bitfield.c
+++ b/test/Sema/bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify 
+// RUN: clang-cc %s -fsyntax-only -verify 
 enum e0; // expected-note{{forward declaration of 'enum e0'}}
 
 struct a {
diff --git a/test/Sema/block-args.c b/test/Sema/block-args.c
index d518fef..a2d8e5a 100644
--- a/test/Sema/block-args.c
+++ b/test/Sema/block-args.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
 
 void take(void*);
 
diff --git a/test/Sema/block-as-object.m b/test/Sema/block-as-object.m
index 28f8d77..219b1a0 100644
--- a/test/Sema/block-as-object.m
+++ b/test/Sema/block-as-object.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
 
 @interface Whatever
 - copy;
diff --git a/test/Sema/block-byref-args.c b/test/Sema/block-byref-args.c
index 29f5a3a..39745d5 100644
--- a/test/Sema/block-byref-args.c
+++ b/test/Sema/block-byref-args.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
 
 #include <stdio.h>
 
diff --git a/test/Sema/block-call.c b/test/Sema/block-call.c
index c52f0ed..3326131 100644
--- a/test/Sema/block-call.c
+++ b/test/Sema/block-call.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -verify %s -fblocks
 
 int (*FP)();
 int (^IFP) ();
diff --git a/test/Sema/block-explicit-return-type.c b/test/Sema/block-explicit-return-type.c
index a0d5da6..c7b26b3 100644
--- a/test/Sema/block-explicit-return-type.c
+++ b/test/Sema/block-explicit-return-type.c
@@ -1,4 +1,4 @@
-// RUN: clang -ObjC -fsyntax-only %s -verify -fblocks
+// RUN: clang-cc -ObjC -fsyntax-only %s -verify -fblocks
 // FIXME: should compile
 // Test for blocks with explicit return type specified.
 
diff --git a/test/Sema/block-labels.c b/test/Sema/block-labels.c
index 15e6f61..f0f8c48 100644
--- a/test/Sema/block-labels.c
+++ b/test/Sema/block-labels.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fblocks -fsyntax-only
+// RUN: clang-cc %s -verify -fblocks -fsyntax-only
 
 int a() { 
   A:if (1) xx();
diff --git a/test/Sema/block-literal.c b/test/Sema/block-literal.c
index 4890839..2dc4581 100644
--- a/test/Sema/block-literal.c
+++ b/test/Sema/block-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -fblocks
+// RUN: clang-cc -fsyntax-only %s -verify -fblocks
 
 void I( void (^)(void));
 void (^noop)(void);
diff --git a/test/Sema/block-misc.c b/test/Sema/block-misc.c
index c3de7b7..dde07f0 100644
--- a/test/Sema/block-misc.c
+++ b/test/Sema/block-misc.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -verify %s -fblocks
 void donotwarn();
 
 int (^IFP) ();
diff --git a/test/Sema/block-return.c b/test/Sema/block-return.c
index a370534..d7717b3 100644
--- a/test/Sema/block-return.c
+++ b/test/Sema/block-return.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -fblocks
+// RUN: clang-cc -fsyntax-only %s -verify -fblocks
 
 typedef void (^CL)(void);
 
diff --git a/test/Sema/block-storageclass.c b/test/Sema/block-storageclass.c
index 0ae723d..3d2527b 100644
--- a/test/Sema/block-storageclass.c
+++ b/test/Sema/block-storageclass.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
 
 #include <stdio.h>
 void _Block_byref_release(void*src){}
diff --git a/test/Sema/block-syntax-error.c b/test/Sema/block-syntax-error.c
index 5f6c204..b046f46 100644
--- a/test/Sema/block-syntax-error.c
+++ b/test/Sema/block-syntax-error.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
 
 void (^noop)(void);
 
diff --git a/test/Sema/builtin-object-size.c b/test/Sema/builtin-object-size.c
index 27a2782..4b15cb1 100644
--- a/test/Sema/builtin-object-size.c
+++ b/test/Sema/builtin-object-size.c
@@ -1,5 +1,5 @@
-// RUN: clang -fsyntax-only -verify %s &&
-// RUN: clang -fsyntax-only -triple x86_64-apple-darwin9 -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s &&
+// RUN: clang-cc -fsyntax-only -triple x86_64-apple-darwin9 -verify %s
 
 int a[10];
 
diff --git a/test/Sema/builtin-prefetch.c b/test/Sema/builtin-prefetch.c
index 187552d..6b39e75 100644
--- a/test/Sema/builtin-prefetch.c
+++ b/test/Sema/builtin-prefetch.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int foo() {
   int a;
diff --git a/test/Sema/builtin-stackaddress.c b/test/Sema/builtin-stackaddress.c
index c030ab3..67582a5 100644
--- a/test/Sema/builtin-stackaddress.c
+++ b/test/Sema/builtin-stackaddress.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 void* a(unsigned x) {
 return __builtin_return_address(0);
 }
diff --git a/test/Sema/builtins.c b/test/Sema/builtins.c
index bbbad42..9090855 100644
--- a/test/Sema/builtins.c
+++ b/test/Sema/builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic -triple=i686-apple-darwin9
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic -triple=i686-apple-darwin9
 // This test needs to set the target because it uses __builtin_ia32_vec_ext_v4si
 
 int test1(float a, int b) {
diff --git a/test/Sema/c89-2.c b/test/Sema/c89-2.c
index 128046f..723bd7c 100644
--- a/test/Sema/c89-2.c
+++ b/test/Sema/c89-2.c
@@ -1,4 +1,4 @@
-/* RUN: not clang %s -std=c89 -pedantic-errors
+/* RUN: not clang-cc %s -std=c89 -pedantic-errors
  */
 
 /* We can't put expected-warning lines on #if lines. */
diff --git a/test/Sema/c89.c b/test/Sema/c89.c
index 0c7496a..138d6fa 100644
--- a/test/Sema/c89.c
+++ b/test/Sema/c89.c
@@ -1,4 +1,4 @@
-/* RUN: clang %s -std=c89 -pedantic -fsyntax-only -verify
+/* RUN: clang-cc %s -std=c89 -pedantic -fsyntax-only -verify
  */
 void test1() {
   {
diff --git a/test/Sema/callingconv.c b/test/Sema/callingconv.c
index fa0af76..cb69c59 100644
--- a/test/Sema/callingconv.c
+++ b/test/Sema/callingconv.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 void __attribute__((fastcall)) foo(float *a) { 
 }
diff --git a/test/Sema/carbon.c b/test/Sema/carbon.c
index 94a7075..edb4d97 100644
--- a/test/Sema/carbon.c
+++ b/test/Sema/carbon.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -fsyntax-only -print-stats &&
-// RUN: clang -x c-header -o %t %s && clang -token-cache %t %s
+// RUN: clang-cc %s -fsyntax-only -print-stats &&
+// RUN: clang-cc -x c-header -o %t %s && clang-cc -token-cache %t %s
 #ifdef __APPLE__
 #include <Carbon/Carbon.h>
 #endif
diff --git a/test/Sema/cast-to-union.c b/test/Sema/cast-to-union.c
index 495b27c..24f913b 100644
--- a/test/Sema/cast-to-union.c
+++ b/test/Sema/cast-to-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 union u { int i; };
 void f(union u);
diff --git a/test/Sema/cast.c b/test/Sema/cast.c
index 14bfe13..6ceec69 100644
--- a/test/Sema/cast.c
+++ b/test/Sema/cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
 
 typedef struct { unsigned long bits[(((1) + (64) - 1) / (64))]; } cpumask_t;
 cpumask_t x;
diff --git a/test/Sema/check-increment.c b/test/Sema/check-increment.c
index 4447feb..9809544 100644
--- a/test/Sema/check-increment.c
+++ b/test/Sema/check-increment.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #include <stdio.h>
 typedef int *pint;
diff --git a/test/Sema/compare.c b/test/Sema/compare.c
index e1ebf57..4b44bf5 100644
--- a/test/Sema/compare.c
+++ b/test/Sema/compare.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
 
 int test(char *C) { // nothing here should warn.
   return C != ((void*)0);
diff --git a/test/Sema/complex-int.c b/test/Sema/complex-int.c
index 77bfc9c..5977b4d 100644
--- a/test/Sema/complex-int.c
+++ b/test/Sema/complex-int.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 void a() {
 __complex__ int arr;
diff --git a/test/Sema/complex-promotion.c b/test/Sema/complex-promotion.c
index f7e5f63..3d86c20 100644
--- a/test/Sema/complex-promotion.c
+++ b/test/Sema/complex-promotion.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 float a;
 
diff --git a/test/Sema/compound-literal.c b/test/Sema/compound-literal.c
index e457c72..24ec223 100644
--- a/test/Sema/compound-literal.c
+++ b/test/Sema/compound-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 struct foo { int a, b; };
 
diff --git a/test/Sema/conditional-expr.c b/test/Sema/conditional-expr.c
index ae973d6..c068113 100644
--- a/test/Sema/conditional-expr.c
+++ b/test/Sema/conditional-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 void foo() {
   *(0 ? (double *)0 : (void *)0) = 0;
   // FIXME: GCC doesn't consider the the following two statements to be errors.
diff --git a/test/Sema/conditional.c b/test/Sema/conditional.c
index e1ad1a5..1c7486a 100644
--- a/test/Sema/conditional.c
+++ b/test/Sema/conditional.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 const char* test1 = 1 ? "i" : 1 == 1 ? "v" : "r";
 
diff --git a/test/Sema/const-eval.c b/test/Sema/const-eval.c
index 03aeb2a..dd91c48 100644
--- a/test/Sema/const-eval.c
+++ b/test/Sema/const-eval.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #define EVAL_EXPR(testno, expr) int test##testno = sizeof(struct{char qq[expr];});
 int x;
diff --git a/test/Sema/const-ptr-int-ptr-cast.c b/test/Sema/const-ptr-int-ptr-cast.c
index 3590583..4e08bff 100644
--- a/test/Sema/const-ptr-int-ptr-cast.c
+++ b/test/Sema/const-ptr-int-ptr-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #include <stdint.h>
 
diff --git a/test/Sema/constant-builtins-2.c b/test/Sema/constant-builtins-2.c
index d47cc35..146d9e9 100644
--- a/test/Sema/constant-builtins-2.c
+++ b/test/Sema/constant-builtins-2.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 // Math stuff
 
diff --git a/test/Sema/constant-builtins.c b/test/Sema/constant-builtins.c
index b1c5e2a..3914641 100644
--- a/test/Sema/constant-builtins.c
+++ b/test/Sema/constant-builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -pedantic
+// RUN: clang-cc -fsyntax-only %s -verify -pedantic
 
 // Math stuff
 
diff --git a/test/Sema/constructor-attribute.c b/test/Sema/constructor-attribute.c
index 3f240b0..bf876f34 100644
--- a/test/Sema/constructor-attribute.c
+++ b/test/Sema/constructor-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int x __attribute__((constructor)); // expected-warning {{'constructor' attribute only applies to function types}}
 int f() __attribute__((constructor));
diff --git a/test/Sema/darwin-align-cast.c b/test/Sema/darwin-align-cast.c
index adf938f..09808b5 100644
--- a/test/Sema/darwin-align-cast.c
+++ b/test/Sema/darwin-align-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef long unsigned int __darwin_size_t;
 typedef long __darwin_ssize_t;
 typedef __darwin_size_t size_t;
diff --git a/test/Sema/decl-invalid.c b/test/Sema/decl-invalid.c
index 78a9ee1..0e10bdd 100644
--- a/test/Sema/decl-invalid.c
+++ b/test/Sema/decl-invalid.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 // See Sema::ParsedFreeStandingDeclSpec about the double diagnostic
 typedef union <anonymous> __mbstate_t;  // expected-error {{declaration of anonymous union must be a definition}} expected-error {{declaration does not declare anything}}
diff --git a/test/Sema/decl-type-merging.c b/test/Sema/decl-type-merging.c
index 89bc494..1b789a1 100644
--- a/test/Sema/decl-type-merging.c
+++ b/test/Sema/decl-type-merging.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c99 -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -std=c99 -verify -pedantic %s
 
 int x[10];
 int x[] = {1,2,3};
diff --git a/test/Sema/declspec.c b/test/Sema/declspec.c
index 0207b4a..e325cc8 100644
--- a/test/Sema/declspec.c
+++ b/test/Sema/declspec.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 typedef char T[4];
 
 T foo(int n, int m) {  }  // expected-error {{cannot return array or function}}
diff --git a/test/Sema/default.c b/test/Sema/default.c
index 4efac17..5dac991 100644
--- a/test/Sema/default.c
+++ b/test/Sema/default.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f5 (int z) { 
   if (z) 
diff --git a/test/Sema/default1.c b/test/Sema/default1.c
index a72d0ae..6e8a27b 100644
--- a/test/Sema/default1.c
+++ b/test/Sema/default1.c
@@ -1,2 +1,2 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 void f(int i = 0); // expected-error {{C does not support default arguments}}
diff --git a/test/Sema/deref.c b/test/Sema/deref.c
index 83f7f83..fad5643 100644
--- a/test/Sema/deref.c
+++ b/test/Sema/deref.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c90 %s
+// RUN: clang-cc -fsyntax-only -verify -std=c90 %s
 void
 foo (void)
 {
diff --git a/test/Sema/designated-initializers.c b/test/Sema/designated-initializers.c
index f604701..cfbe802 100644
--- a/test/Sema/designated-initializers.c
+++ b/test/Sema/designated-initializers.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -arch x86_64 %s
+// RUN: clang-cc -fsyntax-only -verify -arch x86_64 %s
 
 int complete_array_from_init[] = { 1, 2, [10] = 5, 1, 2, [5] = 2, 6 };
 
diff --git a/test/Sema/dllimport-dllexport.c b/test/Sema/dllimport-dllexport.c
index 3f385d1..90ed145 100644
--- a/test/Sema/dllimport-dllexport.c
+++ b/test/Sema/dllimport-dllexport.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 inline void __attribute__((dllexport)) foo1(){} // expected-warning{{dllexport attribute ignored}}
 inline void __attribute__((dllimport)) foo2(){} // expected-warning{{dllimport attribute ignored}}
diff --git a/test/Sema/enum.c b/test/Sema/enum.c
index dbc250a..adb9375 100644
--- a/test/Sema/enum.c
+++ b/test/Sema/enum.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
 enum e {A, 
         B = 42LL << 32,        // expected-warning {{ISO C restricts enumerator values to range of 'int'}}
       C = -4, D = 12456 };
diff --git a/test/Sema/expr-address-of.c b/test/Sema/expr-address-of.c
index 7dd7dd6..b3ea9c5 100644
--- a/test/Sema/expr-address-of.c
+++ b/test/Sema/expr-address-of.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 struct xx { int bitf:1; };
 
 struct entry { struct xx *whatever; 
diff --git a/test/Sema/expr-comma-c89.c b/test/Sema/expr-comma-c89.c
index 4949ee3..b2b17dc 100644
--- a/test/Sema/expr-comma-c89.c
+++ b/test/Sema/expr-comma-c89.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -std=c99
+// RUN: clang-cc %s -fsyntax-only -verify -std=c99
 // rdar://6095180
 
 #include <assert.h>
diff --git a/test/Sema/expr-comma.c b/test/Sema/expr-comma.c
index 849e8d5..6407986 100644
--- a/test/Sema/expr-comma.c
+++ b/test/Sema/expr-comma.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -std=c89
+// RUN: clang-cc %s -fsyntax-only -verify -std=c89
 // rdar://6095180
 
 #include <assert.h>
diff --git a/test/Sema/exprs.c b/test/Sema/exprs.c
index 8bf42f7..d348d9e 100644
--- a/test/Sema/exprs.c
+++ b/test/Sema/exprs.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -pedantic -fsyntax-only
+// RUN: clang-cc %s -verify -pedantic -fsyntax-only
 
 // PR1966
 _Complex double test1() {
diff --git a/test/Sema/ext_vector_components.c b/test/Sema/ext_vector_components.c
index ad0277b..422a9e6 100644
--- a/test/Sema/ext_vector_components.c
+++ b/test/Sema/ext_vector_components.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef __attribute__(( ext_vector_type(2) )) float float2;
 typedef __attribute__(( ext_vector_type(3) )) float float3;
diff --git a/test/Sema/flexible-array-init.c b/test/Sema/flexible-array-init.c
index 2b8f40f..afe31fb 100644
--- a/test/Sema/flexible-array-init.c
+++ b/test/Sema/flexible-array-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
 struct one {
   int a;
   int values[]; // expected-note 3{{initialized flexible array member 'values' is here}}
diff --git a/test/Sema/floating-point-compare.c b/test/Sema/floating-point-compare.c
index ae0d0fe..763a8f4 100644
--- a/test/Sema/floating-point-compare.c
+++ b/test/Sema/floating-point-compare.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Wfloat-equal -verify %s
+// RUN: clang-cc -fsyntax-only -Wfloat-equal -verify %s
 
 int f1(float x, float y) {
   return x == y; // expected-warning {{comparing floating point with ==}}
diff --git a/test/Sema/for.c b/test/Sema/for.c
index c08f532..183a95d 100644
--- a/test/Sema/for.c
+++ b/test/Sema/for.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // Check C99 6.8.5p3
 void b1 (void) { for (void (*f) (void);;); }
diff --git a/test/Sema/format-attribute.c b/test/Sema/format-attribute.c
index a1cd0b8..cb82331 100644
--- a/test/Sema/format-attribute.c
+++ b/test/Sema/format-attribute.c
@@ -1,4 +1,4 @@
-//RUN: clang -fsyntax-only -verify %s
+//RUN: clang-cc -fsyntax-only -verify %s
 
 #include <stdarg.h>
 
diff --git a/test/Sema/format-strings.c b/test/Sema/format-strings.c
index 9237a59..cbeadc2 100644
--- a/test/Sema/format-strings.c
+++ b/test/Sema/format-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // Define this to get vasprintf on Linux
 #define _GNU_SOURCE
diff --git a/test/Sema/function-ptr.c b/test/Sema/function-ptr.c
index 83e4d74..6b41001 100644
--- a/test/Sema/function-ptr.c
+++ b/test/Sema/function-ptr.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -pedantic
+// RUN: clang-cc %s -verify -pedantic
 typedef int unary_int_func(int arg);
 unary_int_func *func;
 
diff --git a/test/Sema/function-redecl.c b/test/Sema/function-redecl.c
index fc2e199..28593b0 100644
--- a/test/Sema/function-redecl.c
+++ b/test/Sema/function-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // PR3588
 void g0(int, int);
diff --git a/test/Sema/function.c b/test/Sema/function.c
index 90ade33..c240896 100644
--- a/test/Sema/function.c
+++ b/test/Sema/function.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
 // PR1892
 void f(double a[restrict][5]);  // should promote to restrict ptr.
 void f(double (* restrict a)[5]);
diff --git a/test/Sema/heinous-extensions-off.c b/test/Sema/heinous-extensions-off.c
index 2b15f29..3a9880c 100644
--- a/test/Sema/heinous-extensions-off.c
+++ b/test/Sema/heinous-extensions-off.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify
+// RUN: clang-cc %s -verify
 
 int foo() {
         int a;
diff --git a/test/Sema/heinous-extensions-on.c b/test/Sema/heinous-extensions-on.c
index 6b831f1..480b1b4 100644
--- a/test/Sema/heinous-extensions-on.c
+++ b/test/Sema/heinous-extensions-on.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fheinous-gnu-extensions
+// RUN: clang-cc %s -verify -fheinous-gnu-extensions
 
 int foo() {
         int a;
diff --git a/test/Sema/i-c-e.c b/test/Sema/i-c-e.c
index d877075..6bc3541 100644
--- a/test/Sema/i-c-e.c
+++ b/test/Sema/i-c-e.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic -fpascal-strings
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic -fpascal-strings
 
 #include <stdint.h>
 #include <limits.h>
diff --git a/test/Sema/if-empty-body.c b/test/Sema/if-empty-body.c
index 376eb98..1d1df40 100644
--- a/test/Sema/if-empty-body.c
+++ b/test/Sema/if-empty-body.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f1(int a) {
     if (a); // expected-warning {{if statement has empty body}}
diff --git a/test/Sema/illegal-types.c b/test/Sema/illegal-types.c
index 411f272..c932bb2 100644
--- a/test/Sema/illegal-types.c
+++ b/test/Sema/illegal-types.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++98 %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++98 %s
 
 void a (void []()); // expected-error{{'type name' declared as array of functions}}
 void b (void p[]()); // expected-error{{'p' declared as array of functions}}
diff --git a/test/Sema/implicit-builtin-decl.c b/test/Sema/implicit-builtin-decl.c
index e022b6d..696a2b9 100644
--- a/test/Sema/implicit-builtin-decl.c
+++ b/test/Sema/implicit-builtin-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 void f() {
   int *ptr = malloc(sizeof(int) * 10); // expected-warning{{implicitly declaring C library function 'malloc' with type}} \
   // expected-note{{please include the header <stdlib.h> or explicitly provide a declaration for 'malloc'}} \
diff --git a/test/Sema/implicit-builtin-freestanding.c b/test/Sema/implicit-builtin-freestanding.c
index f36aa09..9bd5c05 100644
--- a/test/Sema/implicit-builtin-freestanding.c
+++ b/test/Sema/implicit-builtin-freestanding.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -ffreestanding %s
+// RUN: clang-cc -fsyntax-only -verify -ffreestanding %s
 
 int malloc(int a) { return a; }
 
diff --git a/test/Sema/implicit-builtin-redecl.c b/test/Sema/implicit-builtin-redecl.c
index 2ad3518..cd99b54 100644
--- a/test/Sema/implicit-builtin-redecl.c
+++ b/test/Sema/implicit-builtin-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // PR3592
 static void* malloc(int);
diff --git a/test/Sema/implicit-cast.c b/test/Sema/implicit-cast.c
index fe83bd9..ce34ad6 100644
--- a/test/Sema/implicit-cast.c
+++ b/test/Sema/implicit-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 static char *test1(int cf) {
   return cf ? "abc" : 0;
diff --git a/test/Sema/implicit-decl.c b/test/Sema/implicit-decl.c
index 91f5dd1..8873e76 100644
--- a/test/Sema/implicit-decl.c
+++ b/test/Sema/implicit-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 typedef int int32_t;
 typedef unsigned char Boolean;
diff --git a/test/Sema/implicit-def.c b/test/Sema/implicit-def.c
index ea42d0c..2c25946 100644
--- a/test/Sema/implicit-def.c
+++ b/test/Sema/implicit-def.c
@@ -1,5 +1,5 @@
-/* RUN: clang -fsyntax-only %s -std=c89 &&
- * RUN: not clang -fsyntax-only %s -std=c99 -pedantic-errors
+/* RUN: clang-cc -fsyntax-only %s -std=c89 &&
+ * RUN: not clang-cc -fsyntax-only %s -std=c99 -pedantic-errors
  */
 
 int A() {
diff --git a/test/Sema/implicit-int.c b/test/Sema/implicit-int.c
index 2896253..71a5724 100644
--- a/test/Sema/implicit-int.c
+++ b/test/Sema/implicit-int.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -pedantic
+// RUN: clang-cc -fsyntax-only %s -verify -pedantic
 
 foo() { // expected-warning {{type specifier missing, defaults to 'int'}}
 }
diff --git a/test/Sema/incompatible-sign.c b/test/Sema/incompatible-sign.c
index 9747327..a62f9a8 100644
--- a/test/Sema/incompatible-sign.c
+++ b/test/Sema/incompatible-sign.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 int a(int* x);
 int b(unsigned* y) { return a(y); } // expected-warning {{pointer types point to integer types with different sign}}
diff --git a/test/Sema/incomplete-call.c b/test/Sema/incomplete-call.c
index c8b104a..aedfe50 100644
--- a/test/Sema/incomplete-call.c
+++ b/test/Sema/incomplete-call.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct foo; // expected-note 3 {{forward declaration of 'struct foo'}}
 
diff --git a/test/Sema/incomplete-decl.c b/test/Sema/incomplete-decl.c
index de95740..8468cf4 100644
--- a/test/Sema/incomplete-decl.c
+++ b/test/Sema/incomplete-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct foo; // expected-note 4 {{forward declaration of 'struct foo'}}
 
diff --git a/test/Sema/init-struct-qualified.c b/test/Sema/init-struct-qualified.c
index 37637e1..539820a 100644
--- a/test/Sema/init-struct-qualified.c
+++ b/test/Sema/init-struct-qualified.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify < %s
+// RUN: clang-cc -fsyntax-only -verify < %s
 typedef float CGFloat;
 typedef struct _NSPoint { CGFloat x; CGFloat y; } NSPoint;
 typedef struct _NSSize { CGFloat width; CGFloat height; } NSSize;
diff --git a/test/Sema/init.c b/test/Sema/init.c
index 73c6887..9430f31 100644
--- a/test/Sema/init.c
+++ b/test/Sema/init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 #include <stdint.h>
 
diff --git a/test/Sema/int-arith-convert.c b/test/Sema/int-arith-convert.c
index c2fad4b..5bbab7d 100644
--- a/test/Sema/int-arith-convert.c
+++ b/test/Sema/int-arith-convert.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-linux-gnu -fsyntax-only -verify %s
+// RUN: clang-cc -triple=i686-linux-gnu -fsyntax-only -verify %s
 
 // Check types are the same through redeclaration
 unsigned long x;
diff --git a/test/Sema/invalid-decl.c b/test/Sema/invalid-decl.c
index 17f3168..e9130c8 100644
--- a/test/Sema/invalid-decl.c
+++ b/test/Sema/invalid-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 void test() {
     char = 4;  // expected-error {{expected identifier}}
diff --git a/test/Sema/invalid-init-diag.c b/test/Sema/invalid-init-diag.c
index 8eaefa6..724d0ea 100644
--- a/test/Sema/invalid-init-diag.c
+++ b/test/Sema/invalid-init-diag.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 int a;
 struct {int x;} x = a; // expected-error {{incompatible type initializing 'int', expected 'struct <anonymous>'}}
diff --git a/test/Sema/invalid-struct-init.c b/test/Sema/invalid-struct-init.c
index 9777a27..73e2e44 100644
--- a/test/Sema/invalid-struct-init.c
+++ b/test/Sema/invalid-struct-init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 typedef struct _zend_module_entry zend_module_entry;
 struct _zend_module_entry {
diff --git a/test/Sema/knr-def-call.c b/test/Sema/knr-def-call.c
index 83a0c5e..0e562d7 100644
--- a/test/Sema/knr-def-call.c
+++ b/test/Sema/knr-def-call.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // C DR #316, PR 3626.
 void f0(a, b, c, d) int a,b,c,d; {}
diff --git a/test/Sema/member-reference.c b/test/Sema/member-reference.c
index b434f5b..b810ccf 100644
--- a/test/Sema/member-reference.c
+++ b/test/Sema/member-reference.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 struct simple { int i; };
 
diff --git a/test/Sema/merge-decls.c b/test/Sema/merge-decls.c
index e6d60c4..f4c25f5 100644
--- a/test/Sema/merge-decls.c
+++ b/test/Sema/merge-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 void foo(void);
 void foo(void) {} 
diff --git a/test/Sema/ms-fuzzy-asm.c b/test/Sema/ms-fuzzy-asm.c
index 5e387f3..58dcbcf 100644
--- a/test/Sema/ms-fuzzy-asm.c
+++ b/test/Sema/ms-fuzzy-asm.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fms-extensions
+// RUN: clang-cc %s -verify -fms-extensions
 
 #define M __asm int 0x2c
 #define M2 int
diff --git a/test/Sema/nested-redef.c b/test/Sema/nested-redef.c
index 0264ad4..53b22d6 100644
--- a/test/Sema/nested-redef.c
+++ b/test/Sema/nested-redef.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 struct X { // expected-note{{previous definition is here}}
   struct X { } x; // expected-error{{nested redefinition of 'X'}} \
                      expected-error {{field has incomplete type}}
diff --git a/test/Sema/nonnull.c b/test/Sema/nonnull.c
index 9a64ce4..3d9b329 100644
--- a/test/Sema/nonnull.c
+++ b/test/Sema/nonnull.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int f1(int x) __attribute__((nonnull)); // expected-warning{{'nonnull' attribute applied to function with no pointer arguments}}
 int f2(int *x) __attribute__ ((nonnull (1)));
diff --git a/test/Sema/offsetof.c b/test/Sema/offsetof.c
index 0d33b77..5e52de7 100644
--- a/test/Sema/offsetof.c
+++ b/test/Sema/offsetof.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER)
 
diff --git a/test/Sema/overloadable-complex.c b/test/Sema/overloadable-complex.c
index 4df59aa..62b3882 100644
--- a/test/Sema/overloadable-complex.c
+++ b/test/Sema/overloadable-complex.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 char *foo(float) __attribute__((__overloadable__)); // expected-note 3 {{candidate function}}
 
 void test_foo_1(float fv, double dv, float _Complex fc, double _Complex dc) {
diff --git a/test/Sema/overloadable.c b/test/Sema/overloadable.c
index 2072292..0d5db3a 100644
--- a/test/Sema/overloadable.c
+++ b/test/Sema/overloadable.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int var __attribute__((overloadable)); // expected-error{{'overloadable' attribute can only be applied to a function}}
 
diff --git a/test/Sema/pointer-addition.c b/test/Sema/pointer-addition.c
index 3a924b0..87d5eaf 100644
--- a/test/Sema/pointer-addition.c
+++ b/test/Sema/pointer-addition.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
 
 typedef struct S S; // expected-note 3 {{forward declaration of 'struct S'}}
 void a(S* b, void* c) {
diff --git a/test/Sema/pointer-subtract-compat.c b/test/Sema/pointer-subtract-compat.c
index 9aebe9c..b3be37e 100644
--- a/test/Sema/pointer-subtract-compat.c
+++ b/test/Sema/pointer-subtract-compat.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
 
 typedef const char rchar;
 int a(char* a, rchar* b) {
diff --git a/test/Sema/pragma-pack-2.c b/test/Sema/pragma-pack-2.c
index c86136b..25be553 100644
--- a/test/Sema/pragma-pack-2.c
+++ b/test/Sema/pragma-pack-2.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i686-apple-darwin9 %s -fsyntax-only -verify
+// RUN: clang-cc -triple i686-apple-darwin9 %s -fsyntax-only -verify
 
 #include <stddef.h>
 
diff --git a/test/Sema/pragma-pack.c b/test/Sema/pragma-pack.c
index a426025..51398fa 100644
--- a/test/Sema/pragma-pack.c
+++ b/test/Sema/pragma-pack.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i686-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i686-apple-darwin9 -fsyntax-only -verify %s
 
 /* expected-warning {{value of #pragma pack(show) == 8}} */ #pragma pack(show)
 /* expected-warning {{expected #pragma pack parameter to be}} */ #pragma pack(3)
diff --git a/test/Sema/pragma-unused.c b/test/Sema/pragma-unused.c
index 8181802..fe8bf860 100644
--- a/test/Sema/pragma-unused.c
+++ b/test/Sema/pragma-unused.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f1(void) {
   int x, y, z;
diff --git a/test/Sema/predef.c b/test/Sema/predef.c
index 097950c..7b3fe50 100644
--- a/test/Sema/predef.c
+++ b/test/Sema/predef.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void abcdefghi12(void) {
  const char (*ss)[12] = &__func__;
diff --git a/test/Sema/predefined-function.c b/test/Sema/predefined-function.c
index bce6355..e8ccb36 100644
--- a/test/Sema/predefined-function.c
+++ b/test/Sema/predefined-function.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 char *funk(int format);
 enum Test {A=-1};
diff --git a/test/Sema/rdar6248119.m b/test/Sema/rdar6248119.m
index ff402b2..631c7b3 100644
--- a/test/Sema/rdar6248119.m
+++ b/test/Sema/rdar6248119.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
 // Test case for: 
 //   <rdar://problem/6248119> @finally doesn't introduce a new scope
 
diff --git a/test/Sema/rdr6094103-unordered-compare-promote.c b/test/Sema/rdr6094103-unordered-compare-promote.c
index 7de91f2..636f770 100644
--- a/test/Sema/rdr6094103-unordered-compare-promote.c
+++ b/test/Sema/rdr6094103-unordered-compare-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang -ast-dump %s 2>&1 | grep ImplicitCastExpr | count 2
+// RUN: clang-cc -ast-dump %s 2>&1 | grep ImplicitCastExpr | count 2
 
 int foo (double x, long double y) {
   // There needs to be an implicit cast on x here.
diff --git a/test/Sema/recover-goto.c b/test/Sema/recover-goto.c
index 4bb7c51..e7b9f3c 100644
--- a/test/Sema/recover-goto.c
+++ b/test/Sema/recover-goto.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
 
 void a() {goto A; // expected-error {{use of undeclared label}}
 // expected-error {{expected '}'}}
diff --git a/test/Sema/redefinition.c b/test/Sema/redefinition.c
index 97e0473..26c90c8 100644
--- a/test/Sema/redefinition.c
+++ b/test/Sema/redefinition.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 int f(int a) { } // expected-note {{previous definition is here}}
 int f(int);
 int f(int a) { } // expected-error {{redefinition of 'f'}}
diff --git a/test/Sema/scope-check.c b/test/Sema/scope-check.c
index 71c9d2f..20cecbf 100644
--- a/test/Sema/scope-check.c
+++ b/test/Sema/scope-check.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int test1(int x) {
   goto L; // expected-error{{illegal jump}}
diff --git a/test/Sema/self-comparison.c b/test/Sema/self-comparison.c
index 8bf54fd..db56e8b 100644
--- a/test/Sema/self-comparison.c
+++ b/test/Sema/self-comparison.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int foo(int x) {
   return x == x; // expected-warning {{self-comparison always results}}
diff --git a/test/Sema/sentinel-attribute.c b/test/Sema/sentinel-attribute.c
index 37d0adc..e9451b8 100644
--- a/test/Sema/sentinel-attribute.c
+++ b/test/Sema/sentinel-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 int x __attribute__((sentinel)); //expected-warning{{'sentinel' attribute only applies to function or method types}}
 
 void f1(int a, ...) __attribute__ ((sentinel));
diff --git a/test/Sema/shift.c b/test/Sema/shift.c
index d5ae5c1..5acbe12 100644
--- a/test/Sema/shift.c
+++ b/test/Sema/shift.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 void test() {
   char c;
diff --git a/test/Sema/static-init.c b/test/Sema/static-init.c
index 9ab3146..e6592f3 100644
--- a/test/Sema/static-init.c
+++ b/test/Sema/static-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -fsyntax-only -verify %s
+// RUN: clang-cc -arch i386 -fsyntax-only -verify %s
 
 #include <stdint.h>
 
diff --git a/test/Sema/stdcall-fastcall.c b/test/Sema/stdcall-fastcall.c
index 4e938f575..353bbfc 100644
--- a/test/Sema/stdcall-fastcall.c
+++ b/test/Sema/stdcall-fastcall.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // CC qualifier can be applied only to functions
 int __attribute__((stdcall)) var1; // expected-warning{{'stdcall' attribute only applies to function types}}
diff --git a/test/Sema/stmt_exprs.c b/test/Sema/stmt_exprs.c
index 10b9e47..3af984a 100644
--- a/test/Sema/stmt_exprs.c
+++ b/test/Sema/stmt_exprs.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 typedef unsigned __uint32_t;
 
diff --git a/test/Sema/struct-cast.c b/test/Sema/struct-cast.c
index 734be80..063e8e3 100644
--- a/test/Sema/struct-cast.c
+++ b/test/Sema/struct-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
 
 struct S {
  int one;
diff --git a/test/Sema/struct-compat.c b/test/Sema/struct-compat.c
index 489ff47..35d8fb1 100644
--- a/test/Sema/struct-compat.c
+++ b/test/Sema/struct-compat.c
@@ -1,4 +1,4 @@
-/* RUN: clang %s -fsyntax-only -pedantic -verify
+/* RUN: clang-cc %s -fsyntax-only -pedantic -verify
  */
 
 extern struct {int a;} x; // expected-note {{previous definition is here}}
diff --git a/test/Sema/struct-decl.c b/test/Sema/struct-decl.c
index 3f95b7a..9d9f527 100644
--- a/test/Sema/struct-decl.c
+++ b/test/Sema/struct-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // PR3459
 struct bar {
 	char n[1];
diff --git a/test/Sema/struct-packed-align.c b/test/Sema/struct-packed-align.c
index 2b5a889..8250c14 100644
--- a/test/Sema/struct-packed-align.c
+++ b/test/Sema/struct-packed-align.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 // Packed structs.
 struct s {
diff --git a/test/Sema/switch.c b/test/Sema/switch.c
index 25e1d4d..5999f34 100644
--- a/test/Sema/switch.c
+++ b/test/Sema/switch.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f (int z) { 
   while (z) { 
diff --git a/test/Sema/tentative-decls.c b/test/Sema/tentative-decls.c
index ea8d622..3a830bf 100644
--- a/test/Sema/tentative-decls.c
+++ b/test/Sema/tentative-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 // PR3310
 struct a x1; // expected-note 2{{forward declaration of 'struct a'}}
diff --git a/test/Sema/text-diag.c b/test/Sema/text-diag.c
index 2e31291..19847c6 100644
--- a/test/Sema/text-diag.c
+++ b/test/Sema/text-diag.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 unsigned char *foo = "texto\
 que continua\
 e continua";
diff --git a/test/Sema/transparent-union-pointer.c b/test/Sema/transparent-union-pointer.c
index 58597b1..ea761f1 100644
--- a/test/Sema/transparent-union-pointer.c
+++ b/test/Sema/transparent-union-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 typedef union   {
 	union wait *__uptr;
diff --git a/test/Sema/type-spec-struct-union.c b/test/Sema/type-spec-struct-union.c
index 47de16b..2b68b78 100644
--- a/test/Sema/type-spec-struct-union.c
+++ b/test/Sema/type-spec-struct-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
 
 /* This test checks the introduction of struct and union types based
    on a type specifier of the form "struct-or-union identifier" when they
diff --git a/test/Sema/typecheck-binop.c b/test/Sema/typecheck-binop.c
index 7977e7e..496bdd3 100644
--- a/test/Sema/typecheck-binop.c
+++ b/test/Sema/typecheck-binop.c
@@ -1,4 +1,4 @@
-/* RUN: clang %s -fsyntax-only -pedantic -verify
+/* RUN: clang-cc %s -fsyntax-only -pedantic -verify
  */
 struct incomplete;
 
diff --git a/test/Sema/typedef-prototype.c b/test/Sema/typedef-prototype.c
index e646604..fc0e05e 100644
--- a/test/Sema/typedef-prototype.c
+++ b/test/Sema/typedef-prototype.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef int unary_int_func(int arg);
 unary_int_func add_one;
diff --git a/test/Sema/typedef-redef.c b/test/Sema/typedef-redef.c
index 48c4863..9ec6226 100644
--- a/test/Sema/typedef-redef.c
+++ b/test/Sema/typedef-redef.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // size_t coming from a system header.
 #include <stddef.h>
diff --git a/test/Sema/typedef-retain.c b/test/Sema/typedef-retain.c
index b621743..ef9ec76 100644
--- a/test/Sema/typedef-retain.c
+++ b/test/Sema/typedef-retain.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fno-lax-vector-conversions
+// RUN: clang-cc -fsyntax-only -verify %s -fno-lax-vector-conversions
 
 typedef float float4 __attribute__((vector_size(16)));
 typedef int int4 __attribute__((vector_size(16)));
diff --git a/test/Sema/typedef-variable-type.c b/test/Sema/typedef-variable-type.c
index 703792f..7a9bb48 100644
--- a/test/Sema/typedef-variable-type.c
+++ b/test/Sema/typedef-variable-type.c
@@ -1,3 +1,3 @@
-// RUN: clang %s -verify -fsyntax-only -pedantic
+// RUN: clang-cc %s -verify -fsyntax-only -pedantic
 
 typedef int (*a)[!.0]; // expected-warning{{size of static array must be an integer constant expression}}
diff --git a/test/Sema/types.c b/test/Sema/types.c
index da02588..40dfd89 100644
--- a/test/Sema/types.c
+++ b/test/Sema/types.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -pedantic -verify
+// RUN: clang-cc %s -pedantic -verify
 
 // rdar://6097662
 typedef int (*T)[2];
diff --git a/test/Sema/unnamed-bitfield-init.c b/test/Sema/unnamed-bitfield-init.c
index 3a3869a..249f06e 100644
--- a/test/Sema/unnamed-bitfield-init.c
+++ b/test/Sema/unnamed-bitfield-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef struct {
         int a; int : 24; char b;
 } S;
diff --git a/test/Sema/unused-expr.c b/test/Sema/unused-expr.c
index a44d1c8..b3d6efb 100644
--- a/test/Sema/unused-expr.c
+++ b/test/Sema/unused-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fno-math-errno %s
+// RUN: clang-cc -fsyntax-only -verify -fno-math-errno %s
 
 int foo(int X, int Y);
 
diff --git a/test/Sema/usual-float.c b/test/Sema/usual-float.c
index 9c1977f..40c0bde 100644
--- a/test/Sema/usual-float.c
+++ b/test/Sema/usual-float.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 
 typedef float CGFloat;
 
diff --git a/test/Sema/va_arg_x86_64.c b/test/Sema/va_arg_x86_64.c
index 3e51b86..680abb7 100644
--- a/test/Sema/va_arg_x86_64.c
+++ b/test/Sema/va_arg_x86_64.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -triple=x86_64-unknown-freebsd7.0 %s
+// RUN: clang-cc -fsyntax-only -verify -triple=x86_64-unknown-freebsd7.0 %s
 
 // PR2631
 char* foo(char *fmt, __builtin_va_list ap)
diff --git a/test/Sema/var-redecl.c b/test/Sema/var-redecl.c
index 037a8f1..129fd17 100644
--- a/test/Sema/var-redecl.c
+++ b/test/Sema/var-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int outer1; // expected-note{{previous definition is here}}
 extern int outer2; // expected-note{{previous definition is here}}
diff --git a/test/Sema/varargs.c b/test/Sema/varargs.c
index b340177..434e4ce 100644
--- a/test/Sema/varargs.c
+++ b/test/Sema/varargs.c
@@ -1,5 +1,5 @@
-// RUN: clang -fsyntax-only -verify %s &&
-// RUN: clang -fsyntax-only -verify %s -triple x86_64-apple-darwin9
+// RUN: clang-cc -fsyntax-only -verify %s &&
+// RUN: clang-cc -fsyntax-only -verify %s -triple x86_64-apple-darwin9
 
 void f1(int a)
 {
diff --git a/test/Sema/vector-assign.c b/test/Sema/vector-assign.c
index 548c08e..3c0cd90 100644
--- a/test/Sema/vector-assign.c
+++ b/test/Sema/vector-assign.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 typedef unsigned int v2u __attribute__ ((vector_size (8)));
 typedef signed int v2s __attribute__ ((vector_size (8)));
 typedef signed int v1s __attribute__ ((vector_size (4)));
diff --git a/test/Sema/vector-cast.c b/test/Sema/vector-cast.c
index 111430b..15f29b9 100644
--- a/test/Sema/vector-cast.c
+++ b/test/Sema/vector-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
 
 typedef long long t1 __attribute__ ((vector_size (8)));
 typedef char t2 __attribute__ ((vector_size (16)));
diff --git a/test/Sema/vector-init.c b/test/Sema/vector-init.c
index eb009b9..d0d9cf0 100644
--- a/test/Sema/vector-init.c
+++ b/test/Sema/vector-init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 //typedef __attribute__(( ext_vector_type(4) ))  float float4;
 typedef float float4 __attribute__((vector_size(16)));
diff --git a/test/Sema/vla.c b/test/Sema/vla.c
index 74ac134..252e9ff 100644
--- a/test/Sema/vla.c
+++ b/test/Sema/vla.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only -pedantic
+// RUN: clang-cc %s -verify -fsyntax-only -pedantic
 
 int test1() {
   typedef int x[test1()];  // vla
diff --git a/test/Sema/void_arg.c b/test/Sema/void_arg.c
index d0571fc..6799146 100644
--- a/test/Sema/void_arg.c
+++ b/test/Sema/void_arg.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only %s -verify
+/* RUN: clang-cc -fsyntax-only %s -verify
  */
 
 typedef void Void;
diff --git a/test/Sema/warn-freestanding-complex.c b/test/Sema/warn-freestanding-complex.c
index aa59b95..a4d3f5b 100644
--- a/test/Sema/warn-freestanding-complex.c
+++ b/test/Sema/warn-freestanding-complex.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -ffreestanding -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -ffreestanding -pedantic -verify %s
 
 void foo(float _Complex c) { // expected-warning{{complex numbers are an extension in a freestanding C99 implementation}}
 }
diff --git a/test/Sema/wchar.c b/test/Sema/wchar.c
index b7171fe..1637600 100644
--- a/test/Sema/wchar.c
+++ b/test/Sema/wchar.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify 
+// RUN: clang-cc %s -fsyntax-only -verify 
 #include <wchar.h>
 
 int check_wchar_size[sizeof(*L"") == sizeof(wchar_t) ? 1 : -1];
diff --git a/test/SemaCXX/__null.cpp b/test/SemaCXX/__null.cpp
index 798e0aa..4672801 100644
--- a/test/SemaCXX/__null.cpp
+++ b/test/SemaCXX/__null.cpp
@@ -1,5 +1,5 @@
-// RUN: clang -triple x86_64-unknown-unknown %s -fsyntax-only -verify &&
-// RUN: clang -triple i686-unknown-unknown %s -fsyntax-only -verify
+// RUN: clang-cc -triple x86_64-unknown-unknown %s -fsyntax-only -verify &&
+// RUN: clang-cc -triple i686-unknown-unknown %s -fsyntax-only -verify
 
 void f() {
   int* i = __null;
diff --git a/test/SemaCXX/abstract.cpp b/test/SemaCXX/abstract.cpp
index dfe0a65..0230588 100644
--- a/test/SemaCXX/abstract.cpp
+++ b/test/SemaCXX/abstract.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -std=c++0x
+// RUN: clang-cc -fsyntax-only -verify %s -std=c++0x
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 #define __CONCAT(__X, __Y) __CONCAT1(__X, __Y)
diff --git a/test/SemaCXX/addr-of-overloaded-function.cpp b/test/SemaCXX/addr-of-overloaded-function.cpp
index 2184116..9c9f0e1 100644
--- a/test/SemaCXX/addr-of-overloaded-function.cpp
+++ b/test/SemaCXX/addr-of-overloaded-function.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 int f(double);
 int f(int);
 
diff --git a/test/SemaCXX/address-of.cpp b/test/SemaCXX/address-of.cpp
index 3d0e57f..4e436d6 100644
--- a/test/SemaCXX/address-of.cpp
+++ b/test/SemaCXX/address-of.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // PR clang/3175
 
 void bar(int*);
diff --git a/test/SemaCXX/aggregate-initialization.cpp b/test/SemaCXX/aggregate-initialization.cpp
index 75b872f..c96eda4 100644
--- a/test/SemaCXX/aggregate-initialization.cpp
+++ b/test/SemaCXX/aggregate-initialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++98 %s 
+// RUN: clang-cc -fsyntax-only -verify -std=c++98 %s 
 
 // Verify that we can't initialize non-aggregates with an initializer
 // list.
diff --git a/test/SemaCXX/anonymous-union.cpp b/test/SemaCXX/anonymous-union.cpp
index 5860ed4..f77fa03 100644
--- a/test/SemaCXX/anonymous-union.cpp
+++ b/test/SemaCXX/anonymous-union.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 struct X {
   union {
     float f3;
diff --git a/test/SemaCXX/attr-unavailable.cpp b/test/SemaCXX/attr-unavailable.cpp
index 78e348a..8e5f76b 100644
--- a/test/SemaCXX/attr-unavailable.cpp
+++ b/test/SemaCXX/attr-unavailable.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int &foo(int);
 double &foo(double);
diff --git a/test/SemaCXX/basic_lookup_argdep.cpp b/test/SemaCXX/basic_lookup_argdep.cpp
index 53448d1..486a688 100644
--- a/test/SemaCXX/basic_lookup_argdep.cpp
+++ b/test/SemaCXX/basic_lookup_argdep.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 namespace N {
   struct X { };
diff --git a/test/SemaCXX/blocks.cpp b/test/SemaCXX/blocks.cpp
index 8b4b3ae..837fb04 100644
--- a/test/SemaCXX/blocks.cpp
+++ b/test/SemaCXX/blocks.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -verify %s -fblocks
 
 void tovoid(void*);
 
diff --git a/test/SemaCXX/bool.cpp b/test/SemaCXX/bool.cpp
index e606a51..c5ad30e 100644
--- a/test/SemaCXX/bool.cpp
+++ b/test/SemaCXX/bool.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 
 // Bool literals can be enum values.
 enum {
diff --git a/test/SemaCXX/carbon.cpp b/test/SemaCXX/carbon.cpp
index 9c9c378..983a000 100644
--- a/test/SemaCXX/carbon.cpp
+++ b/test/SemaCXX/carbon.cpp
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -print-stats
+// RUN: clang-cc %s -fsyntax-only -print-stats
 #ifdef __APPLE__
 #include <Carbon/Carbon.h>
 #endif
diff --git a/test/SemaCXX/class-names.cpp b/test/SemaCXX/class-names.cpp
index 1166b10..a5569c0 100644
--- a/test/SemaCXX/class-names.cpp
+++ b/test/SemaCXX/class-names.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 class C { };
 
 C c;
diff --git a/test/SemaCXX/class.cpp b/test/SemaCXX/class.cpp
index 628253b..d2a8114 100644
--- a/test/SemaCXX/class.cpp
+++ b/test/SemaCXX/class.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 class C {
 public:
   auto int errx; // expected-error {{error: storage class specified for a member declaration}}
diff --git a/test/SemaCXX/complex-overload.cpp b/test/SemaCXX/complex-overload.cpp
index 300d349..55d3c76 100644
--- a/test/SemaCXX/complex-overload.cpp
+++ b/test/SemaCXX/complex-overload.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 char *foo(float); // expected-note 3 {{candidate function}}
 
 void test_foo_1(float fv, double dv, float _Complex fc, double _Complex dc) {
diff --git a/test/SemaCXX/condition.cpp b/test/SemaCXX/condition.cpp
index babb827..7c9cee5 100644
--- a/test/SemaCXX/condition.cpp
+++ b/test/SemaCXX/condition.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 
 void test() {
   int x;
diff --git a/test/SemaCXX/const-cast.cpp b/test/SemaCXX/const-cast.cpp
index 8424cf2..39d61db 100644
--- a/test/SemaCXX/const-cast.cpp
+++ b/test/SemaCXX/const-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct A {};
 
diff --git a/test/SemaCXX/constructor-initializer.cpp b/test/SemaCXX/constructor-initializer.cpp
index ded9010..81d56ea 100644
--- a/test/SemaCXX/constructor-initializer.cpp
+++ b/test/SemaCXX/constructor-initializer.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 class A { 
   int m;
 };
diff --git a/test/SemaCXX/constructor.cpp b/test/SemaCXX/constructor.cpp
index 68099ec..4e3f417 100644
--- a/test/SemaCXX/constructor.cpp
+++ b/test/SemaCXX/constructor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 typedef int INT;
 
 class Foo {
diff --git a/test/SemaCXX/conversion-function.cpp b/test/SemaCXX/conversion-function.cpp
index f9dd600..b5dca08 100644
--- a/test/SemaCXX/conversion-function.cpp
+++ b/test/SemaCXX/conversion-function.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 class X { 
 public:
   operator bool();
diff --git a/test/SemaCXX/convert-to-bool.cpp b/test/SemaCXX/convert-to-bool.cpp
index 74d925a..638afd0 100644
--- a/test/SemaCXX/convert-to-bool.cpp
+++ b/test/SemaCXX/convert-to-bool.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 struct ConvToBool {
   operator bool() const;
 };
diff --git a/test/SemaCXX/converting-constructor.cpp b/test/SemaCXX/converting-constructor.cpp
index edded17..59b793e 100644
--- a/test/SemaCXX/converting-constructor.cpp
+++ b/test/SemaCXX/converting-constructor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 class Z { };
 
 class Y { 
diff --git a/test/SemaCXX/copy-initialization.cpp b/test/SemaCXX/copy-initialization.cpp
index a56a886..5b1fbaa 100644
--- a/test/SemaCXX/copy-initialization.cpp
+++ b/test/SemaCXX/copy-initialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 class X {
 public:
   explicit X(const X&);
diff --git a/test/SemaCXX/dcl_init_aggr.cpp b/test/SemaCXX/dcl_init_aggr.cpp
index bed526d..10c15cc 100644
--- a/test/SemaCXX/dcl_init_aggr.cpp
+++ b/test/SemaCXX/dcl_init_aggr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
 // C++ [dcl.init.aggr]p2
 struct A { 
   int x;
diff --git a/test/SemaCXX/decl-expr-ambiguity.cpp b/test/SemaCXX/decl-expr-ambiguity.cpp
index 0cc9d7e..227834a 100644
--- a/test/SemaCXX/decl-expr-ambiguity.cpp
+++ b/test/SemaCXX/decl-expr-ambiguity.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic-errors %s 
+// RUN: clang-cc -fsyntax-only -verify -pedantic-errors %s 
 
 void f() {
   int a;
diff --git a/test/SemaCXX/default1.cpp b/test/SemaCXX/default1.cpp
index 2844420..be264ad 100644
--- a/test/SemaCXX/default1.cpp
+++ b/test/SemaCXX/default1.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 void f(int i);
 void f(int i = 0); // expected-note {{previous definition is here}}
 void f(int i = 17); // expected-error {{redefinition of default argument}}
diff --git a/test/SemaCXX/default2.cpp b/test/SemaCXX/default2.cpp
index f3d726f..f99e454 100644
--- a/test/SemaCXX/default2.cpp
+++ b/test/SemaCXX/default2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f(int i, int j, int k = 3);
 void f(int i, int j, int k);
diff --git a/test/SemaCXX/dependent-types.cpp b/test/SemaCXX/dependent-types.cpp
index a5d23ff..b2a5c45 100644
--- a/test/SemaCXX/dependent-types.cpp
+++ b/test/SemaCXX/dependent-types.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
 
 template<typename T, int Size> void f() {
   T x1;
diff --git a/test/SemaCXX/derived-to-base-ambig.cpp b/test/SemaCXX/derived-to-base-ambig.cpp
index fa9fff4..e15ddde 100644
--- a/test/SemaCXX/derived-to-base-ambig.cpp
+++ b/test/SemaCXX/derived-to-base-ambig.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 class A { };
 class B : public A { };
 class C : public A { };
diff --git a/test/SemaCXX/destructor.cpp b/test/SemaCXX/destructor.cpp
index f5b35cb..3ba5fd5 100644
--- a/test/SemaCXX/destructor.cpp
+++ b/test/SemaCXX/destructor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 class A {
 public:
   ~A();
diff --git a/test/SemaCXX/direct-initializer.cpp b/test/SemaCXX/direct-initializer.cpp
index 8f4fbb2..149b65c 100644
--- a/test/SemaCXX/direct-initializer.cpp
+++ b/test/SemaCXX/direct-initializer.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 
 int x(1);
 int (x2)(1);
diff --git a/test/SemaCXX/do-while-scope.cpp b/test/SemaCXX/do-while-scope.cpp
index 8adaade..4e4a483 100644
--- a/test/SemaCXX/do-while-scope.cpp
+++ b/test/SemaCXX/do-while-scope.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 
 void test() {
   int x;
diff --git a/test/SemaCXX/dynamic-cast.cpp b/test/SemaCXX/dynamic-cast.cpp
index 1fa8c3d..42c5e01 100644
--- a/test/SemaCXX/dynamic-cast.cpp
+++ b/test/SemaCXX/dynamic-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct A {};
 struct B : A {};
diff --git a/test/SemaCXX/elaborated-type-specifier.cpp b/test/SemaCXX/elaborated-type-specifier.cpp
index fe4e210..c7bf46a 100644
--- a/test/SemaCXX/elaborated-type-specifier.cpp
+++ b/test/SemaCXX/elaborated-type-specifier.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // Test the use of elaborated-type-specifiers to inject the names of
 // structs (or classes or unions) into an outer scope as described in
diff --git a/test/SemaCXX/enum.cpp b/test/SemaCXX/enum.cpp
index 9657113..9668c84 100644
--- a/test/SemaCXX/enum.cpp
+++ b/test/SemaCXX/enum.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 enum E {
   Val1,
   Val2
diff --git a/test/SemaCXX/expressions.cpp b/test/SemaCXX/expressions.cpp
index 23983a1..6a2f30d 100644
--- a/test/SemaCXX/expressions.cpp
+++ b/test/SemaCXX/expressions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 
 void choice(int);
 int choice(bool);
diff --git a/test/SemaCXX/fntype-decl.cpp b/test/SemaCXX/fntype-decl.cpp
index 51aeab8..ae85ff4 100644
--- a/test/SemaCXX/fntype-decl.cpp
+++ b/test/SemaCXX/fntype-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // PR2942
 typedef void fn(int);
diff --git a/test/SemaCXX/function-redecl.cpp b/test/SemaCXX/function-redecl.cpp
index baad312..9f67837 100644
--- a/test/SemaCXX/function-redecl.cpp
+++ b/test/SemaCXX/function-redecl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 int foo(int);
 
 namespace N {
diff --git a/test/SemaCXX/function-type-qual.cpp b/test/SemaCXX/function-type-qual.cpp
index dd3e550..f1d5aac 100644
--- a/test/SemaCXX/function-type-qual.cpp
+++ b/test/SemaCXX/function-type-qual.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f() const; // expected-error {{type qualifier is not allowed on this function}}
 
diff --git a/test/SemaCXX/functional-cast.cpp b/test/SemaCXX/functional-cast.cpp
index 9db742e..0be7ddb 100644
--- a/test/SemaCXX/functional-cast.cpp
+++ b/test/SemaCXX/functional-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct SimpleValueInit {
   int i;
diff --git a/test/SemaCXX/i-c-e-cxx.cpp b/test/SemaCXX/i-c-e-cxx.cpp
index 64ffe8b..32d04e2 100644
--- a/test/SemaCXX/i-c-e-cxx.cpp
+++ b/test/SemaCXX/i-c-e-cxx.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // C++-specific tests for integral constant expressions.
 
diff --git a/test/SemaCXX/implicit-int.cpp b/test/SemaCXX/implicit-int.cpp
index f771810..6fa8dd3 100644
--- a/test/SemaCXX/implicit-int.cpp
+++ b/test/SemaCXX/implicit-int.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 x; // expected-error{{C++ requires a type specifier for all declarations}}
 
diff --git a/test/SemaCXX/inherit.cpp b/test/SemaCXX/inherit.cpp
index 7e04052..eaad97c 100644
--- a/test/SemaCXX/inherit.cpp
+++ b/test/SemaCXX/inherit.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 class A { };
 
 class B1 : A { };
diff --git a/test/SemaCXX/linkage-spec.cpp b/test/SemaCXX/linkage-spec.cpp
index 6f25da0..40f3221 100644
--- a/test/SemaCXX/linkage-spec.cpp
+++ b/test/SemaCXX/linkage-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 extern "C" {
   extern "C" void f(int);
 }
diff --git a/test/SemaCXX/member-expr.cpp b/test/SemaCXX/member-expr.cpp
index d5f9347..58e5be9 100644
--- a/test/SemaCXX/member-expr.cpp
+++ b/test/SemaCXX/member-expr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 class X{
 public:
diff --git a/test/SemaCXX/member-name-lookup.cpp b/test/SemaCXX/member-name-lookup.cpp
index 3203067..871bc99 100644
--- a/test/SemaCXX/member-name-lookup.cpp
+++ b/test/SemaCXX/member-name-lookup.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // XFAIL
 // fails due to exact diagnostic matching
 
diff --git a/test/SemaCXX/member-pointer.cpp b/test/SemaCXX/member-pointer.cpp
index 449ff9f..daee255 100644
--- a/test/SemaCXX/member-pointer.cpp
+++ b/test/SemaCXX/member-pointer.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct A {};
 enum B { Dummy };
diff --git a/test/SemaCXX/ms-exception-spec.cpp b/test/SemaCXX/ms-exception-spec.cpp
index ec4e29a..b84ea17 100644
--- a/test/SemaCXX/ms-exception-spec.cpp
+++ b/test/SemaCXX/ms-exception-spec.cpp
@@ -1,3 +1,3 @@
-// RUN: clang %s -fsyntax-only -verify -fms-extensions
+// RUN: clang-cc %s -fsyntax-only -verify -fms-extensions
 
 void f() throw(...) { }
diff --git a/test/SemaCXX/namespace.cpp b/test/SemaCXX/namespace.cpp
index ea7737e..24a0a46 100644
--- a/test/SemaCXX/namespace.cpp
+++ b/test/SemaCXX/namespace.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 namespace A { // expected-note 2 {{previous definition is here}}
   int A;
   void f() { A = 0; }
diff --git a/test/SemaCXX/nested-name-spec.cpp b/test/SemaCXX/nested-name-spec.cpp
index 4b4d435..7aaa991 100644
--- a/test/SemaCXX/nested-name-spec.cpp
+++ b/test/SemaCXX/nested-name-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c++98 -verify %s 
+// RUN: clang-cc -fsyntax-only -std=c++98 -verify %s 
 namespace A {
   struct C {
     static int cx;
diff --git a/test/SemaCXX/new-delete.cpp b/test/SemaCXX/new-delete.cpp
index 7611264..5037a8d 100644
--- a/test/SemaCXX/new-delete.cpp
+++ b/test/SemaCXX/new-delete.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #include <stddef.h>
 
diff --git a/test/SemaCXX/no-implicit-builtin-decls.cpp b/test/SemaCXX/no-implicit-builtin-decls.cpp
index 8a0df94..bd11f92 100644
--- a/test/SemaCXX/no-implicit-builtin-decls.cpp
+++ b/test/SemaCXX/no-implicit-builtin-decls.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f() {
   void *p = malloc(sizeof(int) * 10); // expected-error{{no matching function for call to 'malloc'}}
diff --git a/test/SemaCXX/overload-call-copycon.cpp b/test/SemaCXX/overload-call-copycon.cpp
index 281f4ce..755e27a 100644
--- a/test/SemaCXX/overload-call-copycon.cpp
+++ b/test/SemaCXX/overload-call-copycon.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s 
+// RUN: clang-cc -fsyntax-only %s 
 class X { };
 
 int& copycon(X x);
diff --git a/test/SemaCXX/overload-call.cpp b/test/SemaCXX/overload-call.cpp
index eed8223..94f352e 100644
--- a/test/SemaCXX/overload-call.cpp
+++ b/test/SemaCXX/overload-call.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
 int* f(int) { return 0; }
 float* f(float) { return 0; }
 void f();
diff --git a/test/SemaCXX/overload-decl.cpp b/test/SemaCXX/overload-decl.cpp
index 96378ba..2bc832f 100644
--- a/test/SemaCXX/overload-decl.cpp
+++ b/test/SemaCXX/overload-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 void f();
 void f(int);
 void f(int, float); 
diff --git a/test/SemaCXX/overload-member-call.cpp b/test/SemaCXX/overload-member-call.cpp
index 07936e7..96e570d 100644
--- a/test/SemaCXX/overload-member-call.cpp
+++ b/test/SemaCXX/overload-member-call.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct X {
   int& f(int) const; // expected-note 2 {{candidate function}}
diff --git a/test/SemaCXX/overloaded-builtin-operators.cpp b/test/SemaCXX/overloaded-builtin-operators.cpp
index 2424930..5989dc2 100644
--- a/test/SemaCXX/overloaded-builtin-operators.cpp
+++ b/test/SemaCXX/overloaded-builtin-operators.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 struct yes;
 struct no;
 
diff --git a/test/SemaCXX/overloaded-operator-decl.cpp b/test/SemaCXX/overloaded-operator-decl.cpp
index 8008b20..fc17faf 100644
--- a/test/SemaCXX/overloaded-operator-decl.cpp
+++ b/test/SemaCXX/overloaded-operator-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 struct X { 
   X();
   X(int); 
diff --git a/test/SemaCXX/overloaded-operator.cpp b/test/SemaCXX/overloaded-operator.cpp
index d51354e..2bf8a35 100644
--- a/test/SemaCXX/overloaded-operator.cpp
+++ b/test/SemaCXX/overloaded-operator.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 class X { };
 
 X operator+(X, X);
diff --git a/test/SemaCXX/qualification-conversion.cpp b/test/SemaCXX/qualification-conversion.cpp
index 689a7b3..01e503d 100644
--- a/test/SemaCXX/qualification-conversion.cpp
+++ b/test/SemaCXX/qualification-conversion.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s 
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s 
 int* quals1(int const * p);
 int* quals2(int const * const * pp);
 int* quals3(int const * * const * ppp); // expected-note{{candidate function}}
diff --git a/test/SemaCXX/qualified-id-lookup.cpp b/test/SemaCXX/qualified-id-lookup.cpp
index 2783710..254a18d 100644
--- a/test/SemaCXX/qualified-id-lookup.cpp
+++ b/test/SemaCXX/qualified-id-lookup.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 namespace Ns {
   int f(); // expected-note{{previous declaration is here}}
 
diff --git a/test/SemaCXX/qualified-names-diag.cpp b/test/SemaCXX/qualified-names-diag.cpp
index cb82f31..a1591d0 100644
--- a/test/SemaCXX/qualified-names-diag.cpp
+++ b/test/SemaCXX/qualified-names-diag.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 namespace foo {
   namespace wibble {
     struct x { int y; };
diff --git a/test/SemaCXX/qualified-names-print.cpp b/test/SemaCXX/qualified-names-print.cpp
index 9026552..1cb19f0 100644
--- a/test/SemaCXX/qualified-names-print.cpp
+++ b/test/SemaCXX/qualified-names-print.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s 2>&1 | grep "N::M::X<INT>::value"
+// RUN: clang-cc -ast-print %s 2>&1 | grep "N::M::X<INT>::value"
 namespace N {
   namespace M {
     template<typename T>
diff --git a/test/SemaCXX/references.cpp b/test/SemaCXX/references.cpp
index 8ee7745..9067a86 100644
--- a/test/SemaCXX/references.cpp
+++ b/test/SemaCXX/references.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 int g(int);
 
 void f() {
diff --git a/test/SemaCXX/reinterpret-cast.cpp b/test/SemaCXX/reinterpret-cast.cpp
index e6d6352..fd5ca8c 100644
--- a/test/SemaCXX/reinterpret-cast.cpp
+++ b/test/SemaCXX/reinterpret-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 enum test { testval = 1 };
 struct structure { int m; };
diff --git a/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp b/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp
index b39d1f0..16b8659 100644
--- a/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp
+++ b/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++98 -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++98 -pedantic %s
 
 void fnptrs()
 {
diff --git a/test/SemaCXX/return-stack-addr.cpp b/test/SemaCXX/return-stack-addr.cpp
index 9eadac7..457de29 100644
--- a/test/SemaCXX/return-stack-addr.cpp
+++ b/test/SemaCXX/return-stack-addr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 int* ret_local() {
   int x = 1;
diff --git a/test/SemaCXX/rval-references.cpp b/test/SemaCXX/rval-references.cpp
index df46814..d305760 100644
--- a/test/SemaCXX/rval-references.cpp
+++ b/test/SemaCXX/rval-references.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++0x %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++0x %s
 
 typedef int&& irr;
 typedef irr& ilr_c1; // Collapses to int&
diff --git a/test/SemaCXX/statements.cpp b/test/SemaCXX/statements.cpp
index bfd8af5..d6925fe 100644
--- a/test/SemaCXX/statements.cpp
+++ b/test/SemaCXX/statements.cpp
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -pedantic
+// RUN: clang-cc %s -fsyntax-only -pedantic
 
 void foo() { 
   return foo();
diff --git a/test/SemaCXX/static-assert.cpp b/test/SemaCXX/static-assert.cpp
index 7e1ee46..caf7603 100644
--- a/test/SemaCXX/static-assert.cpp
+++ b/test/SemaCXX/static-assert.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -std=c++0x
+// RUN: clang-cc -fsyntax-only -verify %s -std=c++0x
 
 int f();
 
diff --git a/test/SemaCXX/static-cast.cpp b/test/SemaCXX/static-cast.cpp
index bf7561d..8399e77 100644
--- a/test/SemaCXX/static-cast.cpp
+++ b/test/SemaCXX/static-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct A {};
 struct B : public A {};             // Single public base.
diff --git a/test/SemaCXX/static-initializers.cpp b/test/SemaCXX/static-initializers.cpp
index 0da412a..3d92a53 100644
--- a/test/SemaCXX/static-initializers.cpp
+++ b/test/SemaCXX/static-initializers.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 int f()
 {
 	return 10;
diff --git a/test/SemaCXX/template-specialization.cpp b/test/SemaCXX/template-specialization.cpp
index 5442514..b3bb08d 100644
--- a/test/SemaCXX/template-specialization.cpp
+++ b/test/SemaCXX/template-specialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 template<int N> void f(int (&array)[N]);
 
 template<> void f<1>(int (&array)[1]) { }
diff --git a/test/SemaCXX/this.cpp b/test/SemaCXX/this.cpp
index b8bf4b7..0577d3c 100644
--- a/test/SemaCXX/this.cpp
+++ b/test/SemaCXX/this.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 int x = this; // expected-error {{error: invalid use of 'this' outside of a nonstatic member function}}
 
 void f() {
diff --git a/test/SemaCXX/try-catch.cpp b/test/SemaCXX/try-catch.cpp
index cb5d0f8..653deaa 100644
--- a/test/SemaCXX/try-catch.cpp
+++ b/test/SemaCXX/try-catch.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct A; // expected-note 3 {{forward declaration of 'struct A'}}
 
diff --git a/test/SemaCXX/type-convert-construct.cpp b/test/SemaCXX/type-convert-construct.cpp
index 64191a2..1840456 100644
--- a/test/SemaCXX/type-convert-construct.cpp
+++ b/test/SemaCXX/type-convert-construct.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 
 void f() {
   float v1 = float(1);
diff --git a/test/SemaCXX/type-dependent-exprs.cpp b/test/SemaCXX/type-dependent-exprs.cpp
index 7c2de69..dd31ef0 100644
--- a/test/SemaCXX/type-dependent-exprs.cpp
+++ b/test/SemaCXX/type-dependent-exprs.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 class X { 
 public:
   virtual int f();
diff --git a/test/SemaCXX/type-traits.cpp b/test/SemaCXX/type-traits.cpp
index d008b01..1a2e329 100644
--- a/test/SemaCXX/type-traits.cpp
+++ b/test/SemaCXX/type-traits.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 #define T(b) (b) ? 1 : -1
 #define F(b) (b) ? -1 : 1
 
diff --git a/test/SemaCXX/typedef-redecl.cpp b/test/SemaCXX/typedef-redecl.cpp
index c7e7d45..10be77c 100644
--- a/test/SemaCXX/typedef-redecl.cpp
+++ b/test/SemaCXX/typedef-redecl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 typedef int INT;
 typedef INT REALLY_INT; // expected-note {{previous definition is here}}
 typedef REALLY_INT REALLY_REALLY_INT;
diff --git a/test/SemaCXX/typeid.cpp b/test/SemaCXX/typeid.cpp
index 80a70a7..f9ad759 100644
--- a/test/SemaCXX/typeid.cpp
+++ b/test/SemaCXX/typeid.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 void f()
 {
diff --git a/test/SemaCXX/user-defined-conversions.cpp b/test/SemaCXX/user-defined-conversions.cpp
index c6941b9..0a4bb77 100644
--- a/test/SemaCXX/user-defined-conversions.cpp
+++ b/test/SemaCXX/user-defined-conversions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 struct X {
   operator bool();
 };
diff --git a/test/SemaCXX/using-directive.cpp b/test/SemaCXX/using-directive.cpp
index 505c06d..767b49b 100644
--- a/test/SemaCXX/using-directive.cpp
+++ b/test/SemaCXX/using-directive.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // XFAIL
 // fails due to exact diagnostic matching
 
diff --git a/test/SemaCXX/vararg-non-pod.cpp b/test/SemaCXX/vararg-non-pod.cpp
index ac108e6..1c5fe74 100644
--- a/test/SemaCXX/vararg-non-pod.cpp
+++ b/test/SemaCXX/vararg-non-pod.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -fblocks %s
 
 extern char version[];
 
diff --git a/test/SemaCXX/virtuals.cpp b/test/SemaCXX/virtuals.cpp
index ad82edd..c2ac77b 100644
--- a/test/SemaCXX/virtuals.cpp
+++ b/test/SemaCXX/virtuals.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 class A {
   virtual void f();
diff --git a/test/SemaCXX/warn-for-var-in-else.cpp b/test/SemaCXX/warn-for-var-in-else.cpp
index dfbf35d..3368da2 100644
--- a/test/SemaCXX/warn-for-var-in-else.cpp
+++ b/test/SemaCXX/warn-for-var-in-else.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // rdar://6425550
 int bar();
 void do_something(int);
diff --git a/test/SemaCXX/wchar_t.cpp b/test/SemaCXX/wchar_t.cpp
index e3cd77a..fc258da 100644
--- a/test/SemaCXX/wchar_t.cpp
+++ b/test/SemaCXX/wchar_t.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s 
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s 
 wchar_t x;
 
 void f(wchar_t p) {
diff --git a/test/SemaObjC/DoubleMethod.m b/test/SemaObjC/DoubleMethod.m
index 07e8912..e43c1a0 100644
--- a/test/SemaObjC/DoubleMethod.m
+++ b/test/SemaObjC/DoubleMethod.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Subclass
 {
diff --git a/test/SemaObjC/access-property-getter.m b/test/SemaObjC/access-property-getter.m
index 903f53c..50a3016 100644
--- a/test/SemaObjC/access-property-getter.m
+++ b/test/SemaObjC/access-property-getter.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 @protocol NSObject
 - (oneway void)release;
diff --git a/test/SemaObjC/alias-test-1.m b/test/SemaObjC/alias-test-1.m
index 6a33b98..39358cd 100644
--- a/test/SemaObjC/alias-test-1.m
+++ b/test/SemaObjC/alias-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @compatibility_alias alias4 foo; // expected-warning {{cannot find interface declaration for 'foo'}}
 
diff --git a/test/SemaObjC/alias-test-2.m b/test/SemaObjC/alias-test-2.m
index 4eb2007..e0baf4e 100644
--- a/test/SemaObjC/alias-test-2.m
+++ b/test/SemaObjC/alias-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // Note: GCC doesn't produce any of the following errors.
 @interface Super @end // expected-note {{previous definition is here}}
diff --git a/test/SemaObjC/argument-checking.m b/test/SemaObjC/argument-checking.m
index 820a2f0..1b6c10d 100644
--- a/test/SemaObjC/argument-checking.m
+++ b/test/SemaObjC/argument-checking.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 struct S { int a; };
 
diff --git a/test/SemaObjC/at-defs.m b/test/SemaObjC/at-defs.m
index 5bbdd6a..4aa56c4 100644
--- a/test/SemaObjC/at-defs.m
+++ b/test/SemaObjC/at-defs.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 
 @interface Test {
 	double a;
diff --git a/test/SemaObjC/attr-cleanup.m b/test/SemaObjC/attr-cleanup.m
index 8490e6d..f4d057b 100644
--- a/test/SemaObjC/attr-cleanup.m
+++ b/test/SemaObjC/attr-cleanup.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 @class NSString;
 
diff --git a/test/SemaObjC/attr-deprecated.m b/test/SemaObjC/attr-deprecated.m
index 87d6f21..52f654a 100644
--- a/test/SemaObjC/attr-deprecated.m
+++ b/test/SemaObjC/attr-deprecated.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 @interface A {
   int X __attribute__((deprecated));
diff --git a/test/SemaObjC/attr-objc-exception.m b/test/SemaObjC/attr-objc-exception.m
index 12d0b31..3efb8cf 100644
--- a/test/SemaObjC/attr-objc-exception.m
+++ b/test/SemaObjC/attr-objc-exception.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 __attribute__((__objc_exception__))
 @interface NSException {
diff --git a/test/SemaObjC/attr-objc-gc.m b/test/SemaObjC/attr-objc-gc.m
index 1f2db34..20da639 100644
--- a/test/SemaObjC/attr-objc-gc.m
+++ b/test/SemaObjC/attr-objc-gc.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 static id __attribute((objc_gc(weak))) a;
 static id __attribute((objc_gc(strong))) b;
 
diff --git a/test/SemaObjC/bad-receiver-1.m b/test/SemaObjC/bad-receiver-1.m
index de90a1e..64ff3d1 100644
--- a/test/SemaObjC/bad-receiver-1.m
+++ b/test/SemaObjC/bad-receiver-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface I
 - (id) retain;
diff --git a/test/SemaObjC/block-ivar.m b/test/SemaObjC/block-ivar.m
index 4220183..231c9a2 100644
--- a/test/SemaObjC/block-ivar.m
+++ b/test/SemaObjC/block-ivar.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -verify %s -fblocks
 
 @interface NSObject {
   struct objc_object *isa;
diff --git a/test/SemaObjC/blocks.m b/test/SemaObjC/blocks.m
index 8e72be6..6d525a9 100644
--- a/test/SemaObjC/blocks.m
+++ b/test/SemaObjC/blocks.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -fblocks %s
 @protocol NSObject;
 
 void bar(id(^)(void));
diff --git a/test/SemaObjC/call-super-2.m b/test/SemaObjC/call-super-2.m
index a1f8c87..6b1804b 100644
--- a/test/SemaObjC/call-super-2.m
+++ b/test/SemaObjC/call-super-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #include <stddef.h>
 
diff --git a/test/SemaObjC/catch-stmt.m b/test/SemaObjC/catch-stmt.m
index 33894a2..18b3ee3 100644
--- a/test/SemaObjC/catch-stmt.m
+++ b/test/SemaObjC/catch-stmt.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 @protocol P;
 
diff --git a/test/SemaObjC/category-1.m b/test/SemaObjC/category-1.m
index 84f4c19..6ae7758 100644
--- a/test/SemaObjC/category-1.m
+++ b/test/SemaObjC/category-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface MyClass1 @end
 
diff --git a/test/SemaObjC/category-method-lookup-2.m b/test/SemaObjC/category-method-lookup-2.m
index 7bbba8b..76048cc 100644
--- a/test/SemaObjC/category-method-lookup-2.m
+++ b/test/SemaObjC/category-method-lookup-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef struct objc_class *Class;
 @interface NSObject
@@ -19,4 +19,4 @@
   [[self class] classMethod];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/test/SemaObjC/category-method-lookup.m b/test/SemaObjC/category-method-lookup.m
index a709008..bda4657 100644
--- a/test/SemaObjC/category-method-lookup.m
+++ b/test/SemaObjC/category-method-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Foo
 @end
diff --git a/test/SemaObjC/check-dup-decl-methods-1.m b/test/SemaObjC/check-dup-decl-methods-1.m
index 985a4c1..ae0cab0 100644
--- a/test/SemaObjC/check-dup-decl-methods-1.m
+++ b/test/SemaObjC/check-dup-decl-methods-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface SUPER
 - (int) meth;
diff --git a/test/SemaObjC/check-dup-objc-decls-1.m b/test/SemaObjC/check-dup-objc-decls-1.m
index 5498850..4181ac0 100644
--- a/test/SemaObjC/check-dup-objc-decls-1.m
+++ b/test/SemaObjC/check-dup-objc-decls-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Foo // expected-note {{previous definition is here}}
 @end
diff --git a/test/SemaObjC/class-bitfield.m b/test/SemaObjC/class-bitfield.m
index a67927f..01b5324 100644
--- a/test/SemaObjC/class-bitfield.m
+++ b/test/SemaObjC/class-bitfield.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify 
+// RUN: clang-cc %s -fsyntax-only -verify 
 
 @interface X 
 {
diff --git a/test/SemaObjC/class-conforming-protocol-1.m b/test/SemaObjC/class-conforming-protocol-1.m
index 00f3204..a9712b2 100644
--- a/test/SemaObjC/class-conforming-protocol-1.m
+++ b/test/SemaObjC/class-conforming-protocol-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol P1 @end
 @protocol P2 @end
diff --git a/test/SemaObjC/class-def-test-1.m b/test/SemaObjC/class-def-test-1.m
index 2c625fa..da8a326 100644
--- a/test/SemaObjC/class-def-test-1.m
+++ b/test/SemaObjC/class-def-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol SUPER;
 
diff --git a/test/SemaObjC/class-extension-dup-methods.m b/test/SemaObjC/class-extension-dup-methods.m
index d13b218..f50b293 100644
--- a/test/SemaObjC/class-extension-dup-methods.m
+++ b/test/SemaObjC/class-extension-dup-methods.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Foo
 - (int)  garf; // expected-note {{ previous declaration is here}}
diff --git a/test/SemaObjC/class-impl-1.m b/test/SemaObjC/class-impl-1.m
index a3a1852..5cd8a75 100644
--- a/test/SemaObjC/class-impl-1.m
+++ b/test/SemaObjC/class-impl-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef int INTF3; // expected-note {{previous definition is here}}
 
diff --git a/test/SemaObjC/class-method-lookup.m b/test/SemaObjC/class-method-lookup.m
index a62f0f0..cba9382 100644
--- a/test/SemaObjC/class-method-lookup.m
+++ b/test/SemaObjC/class-method-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface MyBase 
 - (void) rootInstanceMethod;
diff --git a/test/SemaObjC/class-proto-1.m b/test/SemaObjC/class-proto-1.m
index da6811e..8f0f3d8 100644
--- a/test/SemaObjC/class-proto-1.m
+++ b/test/SemaObjC/class-proto-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface INTF1 @end
 
diff --git a/test/SemaObjC/cocoa.m b/test/SemaObjC/cocoa.m
index 543c285..cba4481 100644
--- a/test/SemaObjC/cocoa.m
+++ b/test/SemaObjC/cocoa.m
@@ -1,7 +1,9 @@
-// RUN: clang %s -print-stats &&
-// RUN: clang %s -disable-free &&
-// RUN: clang -x objective-c-header -o %t %s && clang -token-cache %t %s &&
-// RUN: clang -x objective-c-header -o %t %s && clang -token-cache %t %s -E %s -o /dev/null
+// RUN: clang-cc %s -print-stats &&
+// RUN: clang-cc %s -disable-free &&
+// RUN: clang-cc -x objective-c-header -o %t %s && 
+// RUN: clang-cc -token-cache %t %s &&
+// RUN: clang-cc -x objective-c-header -o %t %s && 
+// RUN: clang-cc -token-cache %t %s -E %s -o /dev/null
 #ifdef __APPLE__
 #include <Cocoa/Cocoa.h>
 #endif
diff --git a/test/SemaObjC/compare-qualified-id.m b/test/SemaObjC/compare-qualified-id.m
index 1bcbd0e..86845c0 100644
--- a/test/SemaObjC/compare-qualified-id.m
+++ b/test/SemaObjC/compare-qualified-id.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
diff --git a/test/SemaObjC/compatible-protocol-qualified-types.m b/test/SemaObjC/compatible-protocol-qualified-types.m
index 583acb0..3c27b5f 100644
--- a/test/SemaObjC/compatible-protocol-qualified-types.m
+++ b/test/SemaObjC/compatible-protocol-qualified-types.m
@@ -1,4 +1,4 @@
-// RUN: clang -pedantic -fsyntax-only -verify %s
+// RUN: clang-cc -pedantic -fsyntax-only -verify %s
 typedef signed char BOOL;
 
 @class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/test/SemaObjC/comptypes-1.m b/test/SemaObjC/comptypes-1.m
index ab5262e..4bca895 100644
--- a/test/SemaObjC/comptypes-1.m
+++ b/test/SemaObjC/comptypes-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 #define nil (void *)0;
 #define Nil (void *)0;
diff --git a/test/SemaObjC/comptypes-2.m b/test/SemaObjC/comptypes-2.m
index d063d95..c24b67b 100644
--- a/test/SemaObjC/comptypes-2.m
+++ b/test/SemaObjC/comptypes-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #define nil (void *)0;
 #define Nil (void *)0;
diff --git a/test/SemaObjC/comptypes-3.m b/test/SemaObjC/comptypes-3.m
index b47c960..2d8f19d 100644
--- a/test/SemaObjC/comptypes-3.m
+++ b/test/SemaObjC/comptypes-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #define nil (void *)0;
 
diff --git a/test/SemaObjC/comptypes-4.m b/test/SemaObjC/comptypes-4.m
index bda9050..5989011 100644
--- a/test/SemaObjC/comptypes-4.m
+++ b/test/SemaObjC/comptypes-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 extern void foo();
 
diff --git a/test/SemaObjC/comptypes-5.m b/test/SemaObjC/comptypes-5.m
index 9905fc4..afd8a49 100644
--- a/test/SemaObjC/comptypes-5.m
+++ b/test/SemaObjC/comptypes-5.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
 
 #define nil (void *)0;
 
diff --git a/test/SemaObjC/comptypes-6.m b/test/SemaObjC/comptypes-6.m
index 2edb181..3217675 100644
--- a/test/SemaObjC/comptypes-6.m
+++ b/test/SemaObjC/comptypes-6.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 @interface Derived
 @end
diff --git a/test/SemaObjC/comptypes-7.m b/test/SemaObjC/comptypes-7.m
index 27b832b..faca693 100644
--- a/test/SemaObjC/comptypes-7.m
+++ b/test/SemaObjC/comptypes-7.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 #define nil (void *)0;
 #define Nil (void *)0;
diff --git a/test/SemaObjC/comptypes-8.m b/test/SemaObjC/comptypes-8.m
index d13ba38..af9267e 100644
--- a/test/SemaObjC/comptypes-8.m
+++ b/test/SemaObjC/comptypes-8.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol MyProtocol
 @end
diff --git a/test/SemaObjC/comptypes-9.m b/test/SemaObjC/comptypes-9.m
index 4f0a277..caa93b4 100644
--- a/test/SemaObjC/comptypes-9.m
+++ b/test/SemaObjC/comptypes-9.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 // FIXME: This test case tests the patch applied in: http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20080602/006017.html
 //   Eventually that logic should be treated as an extension.
 
diff --git a/test/SemaObjC/comptypes-a.m b/test/SemaObjC/comptypes-a.m
index 4abc9fd..ccbadf6 100644
--- a/test/SemaObjC/comptypes-a.m
+++ b/test/SemaObjC/comptypes-a.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 typedef signed char BOOL;
 typedef int NSInteger;
 
diff --git a/test/SemaObjC/comptypes-legal.m b/test/SemaObjC/comptypes-legal.m
index 71a2b29..cd7f89b 100644
--- a/test/SemaObjC/comptypes-legal.m
+++ b/test/SemaObjC/comptypes-legal.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 
 @protocol NSObject
 @end
diff --git a/test/SemaObjC/conditional-expr-2.m b/test/SemaObjC/conditional-expr-2.m
index 260482a..831f151 100644
--- a/test/SemaObjC/conditional-expr-2.m
+++ b/test/SemaObjC/conditional-expr-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface A
 @end
diff --git a/test/SemaObjC/conditional-expr-3.m b/test/SemaObjC/conditional-expr-3.m
index eb313df..31d4834 100644
--- a/test/SemaObjC/conditional-expr-3.m
+++ b/test/SemaObjC/conditional-expr-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol P0
 @end
@@ -64,4 +64,4 @@
 
 int f11(int cond, A* a, B* b) {
   return (cond? b : a)->x; // expected-error{{'A' does not have a member named 'x'}}
-}
\ No newline at end of file
+}
diff --git a/test/SemaObjC/conditional-expr-4.m b/test/SemaObjC/conditional-expr-4.m
index 8fdcf97..7d50ba6 100644
--- a/test/SemaObjC/conditional-expr-4.m
+++ b/test/SemaObjC/conditional-expr-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 // XFAIL
 // <rdar://problem/6212771>
 
diff --git a/test/SemaObjC/conditional-expr.m b/test/SemaObjC/conditional-expr.m
index 4792fa6..ec3613b 100644
--- a/test/SemaObjC/conditional-expr.m
+++ b/test/SemaObjC/conditional-expr.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
 @protocol NSObject
 @end
 
diff --git a/test/SemaObjC/conflicting-ivar-test-1.m b/test/SemaObjC/conflicting-ivar-test-1.m
index 3f27b2c..20ed157 100644
--- a/test/SemaObjC/conflicting-ivar-test-1.m
+++ b/test/SemaObjC/conflicting-ivar-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface INTF 
 {
diff --git a/test/SemaObjC/continuation-class-err.m b/test/SemaObjC/continuation-class-err.m
index bd60f55..f516a93 100644
--- a/test/SemaObjC/continuation-class-err.m
+++ b/test/SemaObjC/continuation-class-err.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface ReadOnly 
 {
diff --git a/test/SemaObjC/duplicate-ivar-check.m b/test/SemaObjC/duplicate-ivar-check.m
index 6dcdc38..a5e2cb9 100644
--- a/test/SemaObjC/duplicate-ivar-check.m
+++ b/test/SemaObjC/duplicate-ivar-check.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface B1 {
 @public
diff --git a/test/SemaObjC/enhanced-proto-2.m b/test/SemaObjC/enhanced-proto-2.m
index 82e23c4..0450d7b 100644
--- a/test/SemaObjC/enhanced-proto-2.m
+++ b/test/SemaObjC/enhanced-proto-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 @protocol MyProto1 
 @optional
diff --git a/test/SemaObjC/error-property-gc-attr.m b/test/SemaObjC/error-property-gc-attr.m
index 3b646ac..9c94c78 100644
--- a/test/SemaObjC/error-property-gc-attr.m
+++ b/test/SemaObjC/error-property-gc-attr.m
@@ -1,4 +1,4 @@
-// RUN: clang -fobjc-gc -fsyntax-only -verify %s
+// RUN: clang-cc -fobjc-gc -fsyntax-only -verify %s
 
 @interface INTF
 {
diff --git a/test/SemaObjC/exprs.m b/test/SemaObjC/exprs.m
index 3918923..342449d 100644
--- a/test/SemaObjC/exprs.m
+++ b/test/SemaObjC/exprs.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 // rdar://6597252
 Class test1(Class X) {
@@ -16,4 +16,4 @@
            @"baz"
            " b\0larg";  // expected-warning {{literal contains NUL character}}
   
-}
\ No newline at end of file
+}
diff --git a/test/SemaObjC/foreach-1.m b/test/SemaObjC/foreach-1.m
index 9de3294..d3ca424 100644
--- a/test/SemaObjC/foreach-1.m
+++ b/test/SemaObjC/foreach-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @class NSArray;
 
diff --git a/test/SemaObjC/format-strings-objc.m b/test/SemaObjC/format-strings-objc.m
index 42c2170..4b84902 100644
--- a/test/SemaObjC/format-strings-objc.m
+++ b/test/SemaObjC/format-strings-objc.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 //===----------------------------------------------------------------------===//
 // The following code is reduced using delta-debugging from
diff --git a/test/SemaObjC/forward-class-1.m b/test/SemaObjC/forward-class-1.m
index 5eb36e7..d8eb311 100644
--- a/test/SemaObjC/forward-class-1.m
+++ b/test/SemaObjC/forward-class-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @class FOO, BAR;
 @class FOO, BAR;
diff --git a/test/SemaObjC/gcc-cast-ext.m b/test/SemaObjC/gcc-cast-ext.m
index 866aee9..5d6670e 100644
--- a/test/SemaObjC/gcc-cast-ext.m
+++ b/test/SemaObjC/gcc-cast-ext.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fms-extensions
+// RUN: clang-cc %s -verify -fms-extensions
 @class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
 typedef struct _NSRange { } NSRange;
 
diff --git a/test/SemaObjC/id-1.m b/test/SemaObjC/id-1.m
index 758f101..399c6ec 100644
--- a/test/SemaObjC/id-1.m
+++ b/test/SemaObjC/id-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 /* Test attempt to redefine 'id' in an incompatible fashion.  */
 
 typedef int id;   // expected-error {{typedef redefinition with different types}}
diff --git a/test/SemaObjC/id_builtin.m b/test/SemaObjC/id_builtin.m
index d7c9161..1347537 100644
--- a/test/SemaObjC/id_builtin.m
+++ b/test/SemaObjC/id_builtin.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 // id is now builtin. There should be no errors. 
 id obj; 
diff --git a/test/SemaObjC/incompatible-protocol-qualified-types.m b/test/SemaObjC/incompatible-protocol-qualified-types.m
index ad8c45e..862265c 100644
--- a/test/SemaObjC/incompatible-protocol-qualified-types.m
+++ b/test/SemaObjC/incompatible-protocol-qualified-types.m
@@ -1,4 +1,4 @@
-// RUN: clang -pedantic -fsyntax-only -verify %s
+// RUN: clang-cc -pedantic -fsyntax-only -verify %s
 
 @protocol MyProto1 
 @end
diff --git a/test/SemaObjC/interface-1.m b/test/SemaObjC/interface-1.m
index b974b39..8af228e 100644
--- a/test/SemaObjC/interface-1.m
+++ b/test/SemaObjC/interface-1.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 // rdar://5957506
 
 @interface NSWhatever :
diff --git a/test/SemaObjC/interface-layout-2.m b/test/SemaObjC/interface-layout-2.m
index 50dd2f9..ec03a00 100644
--- a/test/SemaObjC/interface-layout-2.m
+++ b/test/SemaObjC/interface-layout-2.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 @interface A
 {
   int ivar;
diff --git a/test/SemaObjC/interface-layout.m b/test/SemaObjC/interface-layout.m
index 637de8e..70b140d 100644
--- a/test/SemaObjC/interface-layout.m
+++ b/test/SemaObjC/interface-layout.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 typedef struct objc_object {} *id;
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
diff --git a/test/SemaObjC/interface-scope-2.m b/test/SemaObjC/interface-scope-2.m
index e110959..d054e71 100644
--- a/test/SemaObjC/interface-scope-2.m
+++ b/test/SemaObjC/interface-scope-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -triple i686-apple-darwin9  %s
+// RUN: clang-cc -fsyntax-only -verify -triple i686-apple-darwin9  %s
 // FIXME: must also compile as Objective-C++ 
 
 // <rdar://problem/6487662>
diff --git a/test/SemaObjC/interface-scope.m b/test/SemaObjC/interface-scope.m
index 8f164a9..b4dfff6 100644
--- a/test/SemaObjC/interface-scope.m
+++ b/test/SemaObjC/interface-scope.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface I1 {
 @private
diff --git a/test/SemaObjC/interface-tu-variable.m b/test/SemaObjC/interface-tu-variable.m
index f992996..667c632 100644
--- a/test/SemaObjC/interface-tu-variable.m
+++ b/test/SemaObjC/interface-tu-variable.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface XX
 int x;  // expected-error {{cannot declare variable inside a class, protocol or category}}
diff --git a/test/SemaObjC/invalid-code.m b/test/SemaObjC/invalid-code.m
index 27d4147..6eacba0 100644
--- a/test/SemaObjC/invalid-code.m
+++ b/test/SemaObjC/invalid-code.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 // rdar://6124613
 void test1() {
diff --git a/test/SemaObjC/invalid-objc-decls-1.m b/test/SemaObjC/invalid-objc-decls-1.m
index 9db5f79..b65c061 100644
--- a/test/SemaObjC/invalid-objc-decls-1.m
+++ b/test/SemaObjC/invalid-objc-decls-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Super @end
 Super s1; // expected-error{{Objective-C type cannot be statically allocated}}
diff --git a/test/SemaObjC/invalid-receiver.m b/test/SemaObjC/invalid-receiver.m
index 829ec5d..e79df96 100644
--- a/test/SemaObjC/invalid-receiver.m
+++ b/test/SemaObjC/invalid-receiver.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef struct NotAClass {
   int a, b;
diff --git a/test/SemaObjC/invalid-typename.m b/test/SemaObjC/invalid-typename.m
index e4a5b4e..4077f91 100644
--- a/test/SemaObjC/invalid-typename.m
+++ b/test/SemaObjC/invalid-typename.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @class NSString, NSArray;
 
diff --git a/test/SemaObjC/ivar-access-tests.m b/test/SemaObjC/ivar-access-tests.m
index ad8f603..ca3cc4c 100644
--- a/test/SemaObjC/ivar-access-tests.m
+++ b/test/SemaObjC/ivar-access-tests.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface MySuperClass
 {
diff --git a/test/SemaObjC/ivar-lookup.m b/test/SemaObjC/ivar-lookup.m
index e599e9d..b168976 100644
--- a/test/SemaObjC/ivar-lookup.m
+++ b/test/SemaObjC/ivar-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 
 @interface Test {
    int x;
diff --git a/test/SemaObjC/ivar-ref-misuse.m b/test/SemaObjC/ivar-ref-misuse.m
index 814d465..85ede57 100644
--- a/test/SemaObjC/ivar-ref-misuse.m
+++ b/test/SemaObjC/ivar-ref-misuse.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Sprite {
   int sprite, spree;
diff --git a/test/SemaObjC/ivar-sem-check-1.m b/test/SemaObjC/ivar-sem-check-1.m
index 1833a0f..ab9f6b1 100644
--- a/test/SemaObjC/ivar-sem-check-1.m
+++ b/test/SemaObjC/ivar-sem-check-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 struct S; // expected-note{{forward declaration of 'struct S'}}
 typedef int FOO();
diff --git a/test/SemaObjC/legacy-implementation-1.m b/test/SemaObjC/legacy-implementation-1.m
index 7643447..63768ff 100644
--- a/test/SemaObjC/legacy-implementation-1.m
+++ b/test/SemaObjC/legacy-implementation-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @implementation INTF // expected-warning {{cannot find interface declaration for 'INTF'}}
 @end
diff --git a/test/SemaObjC/message.m b/test/SemaObjC/message.m
index 7dc4fc6..94db014 100644
--- a/test/SemaObjC/message.m
+++ b/test/SemaObjC/message.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface foo
 - (void)meth;
diff --git a/test/SemaObjC/method-arg-decay.m b/test/SemaObjC/method-arg-decay.m
index 571089a..4b04591 100644
--- a/test/SemaObjC/method-arg-decay.m
+++ b/test/SemaObjC/method-arg-decay.m
@@ -1,4 +1,4 @@
-// RUN: clang -checker-cfref -verify %s
+// RUN: clang-cc -checker-cfref -verify %s
 typedef signed char BOOL;
 typedef int NSInteger;
 typedef unsigned int NSUInteger;
diff --git a/test/SemaObjC/method-attributes.m b/test/SemaObjC/method-attributes.m
index 5b2cab6..003cea4 100644
--- a/test/SemaObjC/method-attributes.m
+++ b/test/SemaObjC/method-attributes.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
 
 @class NSString;
 
diff --git a/test/SemaObjC/method-bad-param.m b/test/SemaObjC/method-bad-param.m
index 2e36a15..23fc675 100644
--- a/test/SemaObjC/method-bad-param.m
+++ b/test/SemaObjC/method-bad-param.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface foo
 @end
diff --git a/test/SemaObjC/method-conflict.m b/test/SemaObjC/method-conflict.m
index c2fb7ca..042aed9 100644
--- a/test/SemaObjC/method-conflict.m
+++ b/test/SemaObjC/method-conflict.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
@@ -51,4 +51,4 @@
 // GCC doesn't currently warn about this.
 + (NSUInteger) compartmentsForClassifier: (id <XDSCClassifier>) classifier withSpecification: (XDSCDisplaySpecification *) displaySpec { // expected-warning {{conflicting types for 'compartmentsForClassifier:withSpecification:'}}
 }
-@end 
\ No newline at end of file
+@end 
diff --git a/test/SemaObjC/method-def-1.m b/test/SemaObjC/method-def-1.m
index 7948eed..9419405 100644
--- a/test/SemaObjC/method-def-1.m
+++ b/test/SemaObjC/method-def-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface foo
 - (int)meth;
diff --git a/test/SemaObjC/method-def-2.m b/test/SemaObjC/method-def-2.m
index d31a2b5..84cdd70 100644
--- a/test/SemaObjC/method-def-2.m
+++ b/test/SemaObjC/method-def-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
 extern void abort(void);
 #define CHECK_IF(expr) if(!(expr)) abort()
 
diff --git a/test/SemaObjC/method-encoding-2.m b/test/SemaObjC/method-encoding-2.m
index 08a579b..64a0bc4 100644
--- a/test/SemaObjC/method-encoding-2.m
+++ b/test/SemaObjC/method-encoding-2.m
@@ -1,4 +1,4 @@
-// RUN: clang %s
+// RUN: clang-cc %s
 // TODO: We don't support rewrite of method definitions
 
 @interface Intf 
diff --git a/test/SemaObjC/method-lookup-2.m b/test/SemaObjC/method-lookup-2.m
index 9939e34..dd0bca9 100644
--- a/test/SemaObjC/method-lookup-2.m
+++ b/test/SemaObjC/method-lookup-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 
 @protocol NSObject
diff --git a/test/SemaObjC/method-lookup-3.m b/test/SemaObjC/method-lookup-3.m
index 28c2e1a..8ed583f 100644
--- a/test/SemaObjC/method-lookup-3.m
+++ b/test/SemaObjC/method-lookup-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef struct { int y; } Abstract;
 
diff --git a/test/SemaObjC/method-lookup-4.m b/test/SemaObjC/method-lookup-4.m
index f5a20f5..3b2548b 100644
--- a/test/SemaObjC/method-lookup-4.m
+++ b/test/SemaObjC/method-lookup-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface NSObject {}
 
diff --git a/test/SemaObjC/method-lookup.m b/test/SemaObjC/method-lookup.m
index 4dfbc74..917ad6b 100644
--- a/test/SemaObjC/method-lookup.m
+++ b/test/SemaObjC/method-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 typedef int NSInteger;
 
diff --git a/test/SemaObjC/method-no-context.m b/test/SemaObjC/method-no-context.m
index 484322e..9351cb9 100644
--- a/test/SemaObjC/method-no-context.m
+++ b/test/SemaObjC/method-no-context.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 - im0 { int a; return 0; // expected-error{{missing context for method declaration}}
 // expected-error{{expected '}'}}
diff --git a/test/SemaObjC/method-not-defined.m b/test/SemaObjC/method-not-defined.m
index 62a8be7..3848fa2 100644
--- a/test/SemaObjC/method-not-defined.m
+++ b/test/SemaObjC/method-not-defined.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Foo
 @end
diff --git a/test/SemaObjC/method-typecheck-1.m b/test/SemaObjC/method-typecheck-1.m
index 391f25e..aba0bef 100644
--- a/test/SemaObjC/method-typecheck-1.m
+++ b/test/SemaObjC/method-typecheck-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface A
 - (void) setMoo: (int) x;	//  expected-note {{previous definition is here}}
diff --git a/test/SemaObjC/method-undef-category-warn-1.m b/test/SemaObjC/method-undef-category-warn-1.m
index 792c24d..82fd3c8 100644
--- a/test/SemaObjC/method-undef-category-warn-1.m
+++ b/test/SemaObjC/method-undef-category-warn-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface MyClass1 
 @end
diff --git a/test/SemaObjC/method-undef-extension-warn-1.m b/test/SemaObjC/method-undef-extension-warn-1.m
index 00201c8..7ce015f 100644
--- a/test/SemaObjC/method-undef-extension-warn-1.m
+++ b/test/SemaObjC/method-undef-extension-warn-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface MyClass
 @end
diff --git a/test/SemaObjC/method-undefined-warn-1.m b/test/SemaObjC/method-undefined-warn-1.m
index 9e646f8..fbb01df 100644
--- a/test/SemaObjC/method-undefined-warn-1.m
+++ b/test/SemaObjC/method-undefined-warn-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface INTF
 - (void) meth;
diff --git a/test/SemaObjC/missing-method-context.m b/test/SemaObjC/missing-method-context.m
index 20437b7..2d0758b 100644
--- a/test/SemaObjC/missing-method-context.m
+++ b/test/SemaObjC/missing-method-context.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 - (void)compilerTestAgainst;  // expected-error {{missing context for method declaration}}
 
 void xx();  // expected-error {{expected method body}}
diff --git a/test/SemaObjC/newproperty-class-method-1.m b/test/SemaObjC/newproperty-class-method-1.m
index 155955c..4946210 100644
--- a/test/SemaObjC/newproperty-class-method-1.m
+++ b/test/SemaObjC/newproperty-class-method-1.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 
 @interface Subclass
 + (int)magicNumber;
diff --git a/test/SemaObjC/nsobject-attribute.m b/test/SemaObjC/nsobject-attribute.m
index 5243a72..3544cb1 100644
--- a/test/SemaObjC/nsobject-attribute.m
+++ b/test/SemaObjC/nsobject-attribute.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef struct CGColor * __attribute__ ((NSObject)) CGColorRef;
 static int count;
diff --git a/test/SemaObjC/objc2-warn-weak-decl.m b/test/SemaObjC/objc2-warn-weak-decl.m
index 8fde620..a52ce88 100644
--- a/test/SemaObjC/objc2-warn-weak-decl.m
+++ b/test/SemaObjC/objc2-warn-weak-decl.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -fobjc-gc -verify %s
+// RUN: clang-cc -fsyntax-only -fobjc-gc -verify %s
 struct S {
 	__weak id  p;  // expected-warning {{__weak attribute cannot be specified on a field declaration}}
 };
diff --git a/test/SemaObjC/property-1.m b/test/SemaObjC/property-1.m
index 64e2605..40bb142 100644
--- a/test/SemaObjC/property-1.m
+++ b/test/SemaObjC/property-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
 
 @interface I 
 {
diff --git a/test/SemaObjC/property-10.m b/test/SemaObjC/property-10.m
index 26fde7b..81b8ee1 100644
--- a/test/SemaObjC/property-10.m
+++ b/test/SemaObjC/property-10.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Wreadonly-setter-attrs -verify %s  -fblocks
+// RUN: clang-cc -fsyntax-only -Wreadonly-setter-attrs -verify %s  -fblocks
 
 // Check property attribute consistency.
 
diff --git a/test/SemaObjC/property-11.m b/test/SemaObjC/property-11.m
index d28608a..e8e6091 100644
--- a/test/SemaObjC/property-11.m
+++ b/test/SemaObjC/property-11.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface NSSound
 @end
diff --git a/test/SemaObjC/property-12.m b/test/SemaObjC/property-12.m
index b6ac1b7..50fb63b 100644
--- a/test/SemaObjC/property-12.m
+++ b/test/SemaObjC/property-12.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Wreadonly-setter-attrs -verify %s
+// RUN: clang-cc -fsyntax-only -Wreadonly-setter-attrs -verify %s
 
 @protocol P0
 @property(readonly,assign) id X; // expected-warning {{property attributes 'readonly' and 'assign' are mutually exclusive}}
diff --git a/test/SemaObjC/property-13.m b/test/SemaObjC/property-13.m
index bcf8299..d0e40dc 100644
--- a/test/SemaObjC/property-13.m
+++ b/test/SemaObjC/property-13.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface NSObject 
 + alloc;
diff --git a/test/SemaObjC/property-2.m b/test/SemaObjC/property-2.m
index 4472a8f..159e06b 100644
--- a/test/SemaObjC/property-2.m
+++ b/test/SemaObjC/property-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Tester 
 @property char PropertyAtomic_char;
diff --git a/test/SemaObjC/property-3.m b/test/SemaObjC/property-3.m
index 6e92f25..a66b3d5 100644
--- a/test/SemaObjC/property-3.m
+++ b/test/SemaObjC/property-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 @interface I 
 {
diff --git a/test/SemaObjC/property-4.m b/test/SemaObjC/property-4.m
index b300096..56db282 100644
--- a/test/SemaObjC/property-4.m
+++ b/test/SemaObjC/property-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 @interface Object 
 @end
diff --git a/test/SemaObjC/property-5.m b/test/SemaObjC/property-5.m
index 1a31240..f463aae 100644
--- a/test/SemaObjC/property-5.m
+++ b/test/SemaObjC/property-5.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 @protocol P1 @end
 @protocol P2 @end
diff --git a/test/SemaObjC/property-6.m b/test/SemaObjC/property-6.m
index a51994d..8f77cf1 100644
--- a/test/SemaObjC/property-6.m
+++ b/test/SemaObjC/property-6.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 # 1 "<command line>"
 # 1 "/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h" 1 3
 typedef signed char BOOL;
diff --git a/test/SemaObjC/property-7.m b/test/SemaObjC/property-7.m
index ef7a98a..5812b97 100644
--- a/test/SemaObjC/property-7.m
+++ b/test/SemaObjC/property-7.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 typedef struct _NSZone NSZone;
 
diff --git a/test/SemaObjC/property-8.m b/test/SemaObjC/property-8.m
index 8ca0afc..49bd409 100644
--- a/test/SemaObjC/property-8.m
+++ b/test/SemaObjC/property-8.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
 typedef struct _NSZone NSZone;
diff --git a/test/SemaObjC/property-9-impl-method.m b/test/SemaObjC/property-9-impl-method.m
index e684c5e..c97f388 100644
--- a/test/SemaObjC/property-9-impl-method.m
+++ b/test/SemaObjC/property-9-impl-method.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
 // rdar://5967199
 
 typedef signed char BOOL;
diff --git a/test/SemaObjC/property-9.m b/test/SemaObjC/property-9.m
index 9aafcc9..752f9c0 100644
--- a/test/SemaObjC/property-9.m
+++ b/test/SemaObjC/property-9.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef signed char BOOL;
 @protocol NSObject  - (BOOL)isEqual:(id)object; @end
diff --git a/test/SemaObjC/property-category-1.m b/test/SemaObjC/property-category-1.m
index 243b774..c1c5dca 100644
--- a/test/SemaObjC/property-category-1.m
+++ b/test/SemaObjC/property-category-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Object
 + (id)new;
diff --git a/test/SemaObjC/property-category-2.m b/test/SemaObjC/property-category-2.m
index 2b86a9e..c245e36 100644
--- a/test/SemaObjC/property-category-2.m
+++ b/test/SemaObjC/property-category-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // Test that a property can be synthesize in a category
 // implementation with no error.
 
diff --git a/test/SemaObjC/property-category-3.m b/test/SemaObjC/property-category-3.m
index fdf7831..bf9e8cb 100644
--- a/test/SemaObjC/property-category-3.m
+++ b/test/SemaObjC/property-category-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol P
   @property(readonly) int X;
diff --git a/test/SemaObjC/property-error-readonly-assign.m b/test/SemaObjC/property-error-readonly-assign.m
index 673dc25..edeff09 100644
--- a/test/SemaObjC/property-error-readonly-assign.m
+++ b/test/SemaObjC/property-error-readonly-assign.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface A
  -(int) x;
diff --git a/test/SemaObjC/property-impl-misuse.m b/test/SemaObjC/property-impl-misuse.m
index e1913be..7b956b5 100644
--- a/test/SemaObjC/property-impl-misuse.m
+++ b/test/SemaObjC/property-impl-misuse.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface I {
   int Y;
diff --git a/test/SemaObjC/property-inherited.m b/test/SemaObjC/property-inherited.m
index 7669e44..6c06b90 100644
--- a/test/SemaObjC/property-inherited.m
+++ b/test/SemaObjC/property-inherited.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify 
+// RUN: clang-cc %s -fsyntax-only -verify 
 
 // <rdar://problem/6497242> Inherited overridden protocol declared objects don't work
 
diff --git a/test/SemaObjC/property-ivar-mismatch.m b/test/SemaObjC/property-ivar-mismatch.m
index a0bc929..75c1e97 100644
--- a/test/SemaObjC/property-ivar-mismatch.m
+++ b/test/SemaObjC/property-ivar-mismatch.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // Test that arithmatic types on property and its ivar have exact match.
 
 @interface Test4 
diff --git a/test/SemaObjC/property-missing.m b/test/SemaObjC/property-missing.m
index 23af006..1aa94ce 100644
--- a/test/SemaObjC/property-missing.m
+++ b/test/SemaObjC/property-missing.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // PR3234
 
diff --git a/test/SemaObjC/property-nonfragile-abi.m b/test/SemaObjC/property-nonfragile-abi.m
index 28ad942..31d415e 100644
--- a/test/SemaObjC/property-nonfragile-abi.m
+++ b/test/SemaObjC/property-nonfragile-abi.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -triple x86_64-apple-darwin9 -verify %s 
+// RUN: clang-cc -fsyntax-only -triple x86_64-apple-darwin9 -verify %s 
 
 typedef signed char BOOL;
 
diff --git a/test/SemaObjC/property-noprotocol-warning.m b/test/SemaObjC/property-noprotocol-warning.m
index 211185f..95ec15a 100644
--- a/test/SemaObjC/property-noprotocol-warning.m
+++ b/test/SemaObjC/property-noprotocol-warning.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 
 @interface Object
diff --git a/test/SemaObjC/property-redundant-decl-accessor.m b/test/SemaObjC/property-redundant-decl-accessor.m
index 8817787..ffd5129 100644
--- a/test/SemaObjC/property-redundant-decl-accessor.m
+++ b/test/SemaObjC/property-redundant-decl-accessor.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Werror -verify %s
+// RUN: clang-cc -fsyntax-only -Werror -verify %s
 
 @interface MyClass {
     const char	*_myName;
diff --git a/test/SemaObjC/property-typecheck-1.m b/test/SemaObjC/property-typecheck-1.m
index 30d5608..22e5e4a 100644
--- a/test/SemaObjC/property-typecheck-1.m
+++ b/test/SemaObjC/property-typecheck-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface A
 -(float) x;	// expected-note {{declared at}}
diff --git a/test/SemaObjC/property-user-setter.m b/test/SemaObjC/property-user-setter.m
index 489e3a7..9b0380e 100644
--- a/test/SemaObjC/property-user-setter.m
+++ b/test/SemaObjC/property-user-setter.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface I0 
 @property(readonly) int x;
diff --git a/test/SemaObjC/property-weak.m b/test/SemaObjC/property-weak.m
index 2e5edbd..293432f 100644
--- a/test/SemaObjC/property-weak.m
+++ b/test/SemaObjC/property-weak.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
 
 @interface foo
 @property(nonatomic) int foo __attribute__((weak_import));
diff --git a/test/SemaObjC/props-on-prots.m b/test/SemaObjC/props-on-prots.m
index aa5be25..a0c6e41 100644
--- a/test/SemaObjC/props-on-prots.m
+++ b/test/SemaObjC/props-on-prots.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 @class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
 
diff --git a/test/SemaObjC/protocol-archane.m b/test/SemaObjC/protocol-archane.m
index 647c5e7..3e70c05 100644
--- a/test/SemaObjC/protocol-archane.m
+++ b/test/SemaObjC/protocol-archane.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // rdar://5986251
 
 @protocol SomeProtocol
diff --git a/test/SemaObjC/protocol-atttribute-1.m b/test/SemaObjC/protocol-atttribute-1.m
index 1934091..ae84411 100644
--- a/test/SemaObjC/protocol-atttribute-1.m
+++ b/test/SemaObjC/protocol-atttribute-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 __attribute ((unavailable))
 @protocol FwProto; // expected-note{{marked unavailable}}
diff --git a/test/SemaObjC/protocol-expr-1.m b/test/SemaObjC/protocol-expr-1.m
index dff2866..cc1c323 100644
--- a/test/SemaObjC/protocol-expr-1.m
+++ b/test/SemaObjC/protocol-expr-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol fproto;
 
diff --git a/test/SemaObjC/protocol-expr-neg-1.m b/test/SemaObjC/protocol-expr-neg-1.m
index 427e744..9393fde 100644
--- a/test/SemaObjC/protocol-expr-neg-1.m
+++ b/test/SemaObjC/protocol-expr-neg-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @class Protocol;
 
diff --git a/test/SemaObjC/protocol-forward-circular.m b/test/SemaObjC/protocol-forward-circular.m
index 836d5b2..40da96e 100644
--- a/test/SemaObjC/protocol-forward-circular.m
+++ b/test/SemaObjC/protocol-forward-circular.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol B;
 @protocol C < B > // expected-warning{{cannot find protocol definition for 'B'}} // expected-note{{previous definition is here}}
diff --git a/test/SemaObjC/protocol-id-test-1.m b/test/SemaObjC/protocol-id-test-1.m
index 4e636d7..5e737a8 100644
--- a/test/SemaObjC/protocol-id-test-1.m
+++ b/test/SemaObjC/protocol-id-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 @interface FF
 - (void) Meth;
diff --git a/test/SemaObjC/protocol-id-test-2.m b/test/SemaObjC/protocol-id-test-2.m
index 3b4adcf..a55923c 100644
--- a/test/SemaObjC/protocol-id-test-2.m
+++ b/test/SemaObjC/protocol-id-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
 
 @protocol P
 @end
diff --git a/test/SemaObjC/protocol-id-test-3.m b/test/SemaObjC/protocol-id-test-3.m
index a4be20b..3c7f84a 100644
--- a/test/SemaObjC/protocol-id-test-3.m
+++ b/test/SemaObjC/protocol-id-test-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -pedantic -fsyntax-only -verify %s
+// RUN: clang-cc -pedantic -fsyntax-only -verify %s
 
 @protocol MyProto1 
 @end
diff --git a/test/SemaObjC/protocol-implementation-inherited.m b/test/SemaObjC/protocol-implementation-inherited.m
index 42c4995..1aace21 100644
--- a/test/SemaObjC/protocol-implementation-inherited.m
+++ b/test/SemaObjC/protocol-implementation-inherited.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol P0
 -bar;
diff --git a/test/SemaObjC/protocol-lookup-2.m b/test/SemaObjC/protocol-lookup-2.m
index 5d721e5..64d0c3a 100644
--- a/test/SemaObjC/protocol-lookup-2.m
+++ b/test/SemaObjC/protocol-lookup-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 @interface NSObject @end
 
 @protocol ProtocolA
diff --git a/test/SemaObjC/protocol-lookup.m b/test/SemaObjC/protocol-lookup.m
index ec02c2b..4f92822 100644
--- a/test/SemaObjC/protocol-lookup.m
+++ b/test/SemaObjC/protocol-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 @protocol NSObject
 - retain;
 - release;
diff --git a/test/SemaObjC/protocol-test-1.m b/test/SemaObjC/protocol-test-1.m
index c8e4080..6ca2bb8 100644
--- a/test/SemaObjC/protocol-test-1.m
+++ b/test/SemaObjC/protocol-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol PROTO1
 @required 
diff --git a/test/SemaObjC/protocol-test-2.m b/test/SemaObjC/protocol-test-2.m
index e5fff2d..a882809 100644
--- a/test/SemaObjC/protocol-test-2.m
+++ b/test/SemaObjC/protocol-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface INTF1 @end
 
diff --git a/test/SemaObjC/protocol-typecheck.m b/test/SemaObjC/protocol-typecheck.m
index 5ffe73f..de66ded 100644
--- a/test/SemaObjC/protocol-typecheck.m
+++ b/test/SemaObjC/protocol-typecheck.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface NSObject @end
 @protocol XCElementP @end
diff --git a/test/SemaObjC/protocol-undef.m b/test/SemaObjC/protocol-undef.m
index a490fa2..34a33c7 100644
--- a/test/SemaObjC/protocol-undef.m
+++ b/test/SemaObjC/protocol-undef.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef signed char BOOL;
 @class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/test/SemaObjC/rdr-6211479-array-property.m b/test/SemaObjC/rdr-6211479-array-property.m
index 8b7067f..f8e4a07 100644
--- a/test/SemaObjC/rdr-6211479-array-property.m
+++ b/test/SemaObjC/rdr-6211479-array-property.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 // XFAIL
 // <rdar://problem/6211479>
 
diff --git a/test/SemaObjC/selector-1.m b/test/SemaObjC/selector-1.m
index 1fd1d44..ee77015 100644
--- a/test/SemaObjC/selector-1.m
+++ b/test/SemaObjC/selector-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s 
+// RUN: clang-cc -verify %s 
 
 @interface Lancelot @end
 @implementation Lancelot
diff --git a/test/SemaObjC/selector-overload.m b/test/SemaObjC/selector-overload.m
index 7bd2544..7c30f79 100644
--- a/test/SemaObjC/selector-overload.m
+++ b/test/SemaObjC/selector-overload.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
 
 @interface NSObject
 + alloc;
diff --git a/test/SemaObjC/static-ivar-ref-1.m b/test/SemaObjC/static-ivar-ref-1.m
index a0b389e..3c37e9e 100644
--- a/test/SemaObjC/static-ivar-ref-1.m
+++ b/test/SemaObjC/static-ivar-ref-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
 
 @interface current 
 {
diff --git a/test/SemaObjC/string.m b/test/SemaObjC/string.m
index e14d3b1..3f078f6 100644
--- a/test/SemaObjC/string.m
+++ b/test/SemaObjC/string.m
@@ -1,5 +1,5 @@
-// RUN: clang %s -verify -fsyntax-only &&
-// RUN: clang %s -verify -fsyntax-only -DDECLAREIT
+// RUN: clang-cc %s -verify -fsyntax-only &&
+// RUN: clang-cc %s -verify -fsyntax-only -DDECLAREIT
 
 // a declaration of NSConstantString is not required.
 #ifdef DECLAREIT
diff --git a/test/SemaObjC/super-cat-prot.m b/test/SemaObjC/super-cat-prot.m
index ef4c0eb..1ab0752 100644
--- a/test/SemaObjC/super-cat-prot.m
+++ b/test/SemaObjC/super-cat-prot.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
 @class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/test/SemaObjC/super-property-notation.m b/test/SemaObjC/super-property-notation.m
index 4c96362..3b0887f 100644
--- a/test/SemaObjC/super-property-notation.m
+++ b/test/SemaObjC/super-property-notation.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface B
 +(int) classGetter;
diff --git a/test/SemaObjC/super.m b/test/SemaObjC/super.m
index 7fe79e2..9afd4eb 100644
--- a/test/SemaObjC/super.m
+++ b/test/SemaObjC/super.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Foo
 - iMethod;
diff --git a/test/SemaObjC/synchronized.m b/test/SemaObjC/synchronized.m
index 365da92..d4914fd 100644
--- a/test/SemaObjC/synchronized.m
+++ b/test/SemaObjC/synchronized.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
 typedef struct _NSZone NSZone;
diff --git a/test/SemaObjC/try-catch.m b/test/SemaObjC/try-catch.m
index 16e119d..bcb4e50 100644
--- a/test/SemaObjC/try-catch.m
+++ b/test/SemaObjC/try-catch.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 typedef struct _NSZone NSZone;
 
diff --git a/test/SemaObjC/typedef-class.m b/test/SemaObjC/typedef-class.m
index 1bb3f87..1288156 100644
--- a/test/SemaObjC/typedef-class.m
+++ b/test/SemaObjC/typedef-class.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
 typedef struct _NSZone NSZone;
diff --git a/test/SemaObjC/undef-class-messagin-error.m b/test/SemaObjC/undef-class-messagin-error.m
index 6d162ac..114b6ca 100644
--- a/test/SemaObjC/undef-class-messagin-error.m
+++ b/test/SemaObjC/undef-class-messagin-error.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface _Child
 + (int) flashCache;
diff --git a/test/SemaObjC/undef-protocol-methods-1.m b/test/SemaObjC/undef-protocol-methods-1.m
index 9ad3593..0524552 100644
--- a/test/SemaObjC/undef-protocol-methods-1.m
+++ b/test/SemaObjC/undef-protocol-methods-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol P1
 - (void) P1proto;
diff --git a/test/SemaObjC/undef-superclass-1.m b/test/SemaObjC/undef-superclass-1.m
index ba233f8..0d670f8 100644
--- a/test/SemaObjC/undef-superclass-1.m
+++ b/test/SemaObjC/undef-superclass-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @class SUPER, Y;
 
diff --git a/test/SemaObjC/undefined-protocol-type-1.m b/test/SemaObjC/undefined-protocol-type-1.m
index 117f418..572d55f 100644
--- a/test/SemaObjC/undefined-protocol-type-1.m
+++ b/test/SemaObjC/undefined-protocol-type-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @protocol p1, p4;
 @protocol p2 @end
diff --git a/test/SemaObjC/unused.m b/test/SemaObjC/unused.m
index cbe15a1..88c6f10 100644
--- a/test/SemaObjC/unused.m
+++ b/test/SemaObjC/unused.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
 #include <stdio.h>
 
 @interface Greeter
diff --git a/test/SemaObjC/va-method-1.m b/test/SemaObjC/va-method-1.m
index 077982a..3c8998f 100644
--- a/test/SemaObjC/va-method-1.m
+++ b/test/SemaObjC/va-method-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 #include <stdarg.h>
 
diff --git a/test/SemaObjC/warn-selector-selection.m b/test/SemaObjC/warn-selector-selection.m
index 777666d..4ab89b7 100644
--- a/test/SemaObjC/warn-selector-selection.m
+++ b/test/SemaObjC/warn-selector-selection.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface Object 
 - (void)foo;
diff --git a/test/SemaObjC/warn-weak-field.m b/test/SemaObjC/warn-weak-field.m
index a342acb..be222ee 100644
--- a/test/SemaObjC/warn-weak-field.m
+++ b/test/SemaObjC/warn-weak-field.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -fobjc-gc -verify %s
+// RUN: clang-cc -fsyntax-only -fobjc-gc -verify %s
 
 struct S {
 	__weak id w; // expected-warning {{__weak attribute cannot be specified on a field declaration}}
diff --git a/test/SemaObjC/weak-attr-ivar.m b/test/SemaObjC/weak-attr-ivar.m
index e48e06a..9e0e8cb 100644
--- a/test/SemaObjC/weak-attr-ivar.m
+++ b/test/SemaObjC/weak-attr-ivar.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 typedef signed char BOOL;
 typedef unsigned int NSUInteger;
diff --git a/test/SemaObjCXX/blocks.mm b/test/SemaObjCXX/blocks.mm
index 34f75a0..3d421a8 100644
--- a/test/SemaObjCXX/blocks.mm
+++ b/test/SemaObjCXX/blocks.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -fblocks %s
 @protocol NSObject;
 
 void bar(id(^)(void));
diff --git a/test/SemaObjCXX/cocoa.mm b/test/SemaObjCXX/cocoa.mm
index d6cbc04..00b6d74 100644
--- a/test/SemaObjCXX/cocoa.mm
+++ b/test/SemaObjCXX/cocoa.mm
@@ -1,5 +1,6 @@
-// RUN: clang %s -print-stats &&
-// RUN: clang -x objective-c++-header -o %t %s && clang -token-cache %t %s
+// RUN: clang-cc %s -print-stats &&
+// RUN: clang-cc -x objective-c++-header -o %t %s && 
+// RUN: clang-cc -token-cache %t %s
 #ifdef __APPLE__
 #include <Cocoa/Cocoa.h>
 #endif
diff --git a/test/SemaObjCXX/linkage-spec.mm b/test/SemaObjCXX/linkage-spec.mm
index c8221d4..2cc0936 100644
--- a/test/SemaObjCXX/linkage-spec.mm
+++ b/test/SemaObjCXX/linkage-spec.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 extern "C" {
 @class Protocol;
 }
diff --git a/test/SemaObjCXX/objc-decls-inside-namespace.mm b/test/SemaObjCXX/objc-decls-inside-namespace.mm
index 3ad3508..cedfcfd 100644
--- a/test/SemaObjCXX/objc-decls-inside-namespace.mm
+++ b/test/SemaObjCXX/objc-decls-inside-namespace.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 namespace C {
 
diff --git a/test/SemaObjCXX/overload.mm b/test/SemaObjCXX/overload.mm
index 397a471..8ab22e1 100644
--- a/test/SemaObjCXX/overload.mm
+++ b/test/SemaObjCXX/overload.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 @interface Foo
 @end
 
diff --git a/test/SemaObjCXX/protocol-lookup.mm b/test/SemaObjCXX/protocol-lookup.mm
index ec02c2b..4f92822 100644
--- a/test/SemaObjCXX/protocol-lookup.mm
+++ b/test/SemaObjCXX/protocol-lookup.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 @protocol NSObject
 - retain;
 - release;
diff --git a/test/SemaObjCXX/reserved-keyword-selectors.mm b/test/SemaObjCXX/reserved-keyword-selectors.mm
index 79f747f..2875f93 100644
--- a/test/SemaObjCXX/reserved-keyword-selectors.mm
+++ b/test/SemaObjCXX/reserved-keyword-selectors.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 @interface A 
 - (void)asm;
diff --git a/test/SemaObjCXX/vararg-non-pod.mm b/test/SemaObjCXX/vararg-non-pod.mm
index 70028c7..eeed09e 100644
--- a/test/SemaObjCXX/vararg-non-pod.mm
+++ b/test/SemaObjCXX/vararg-non-pod.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 extern char version[];
 
diff --git a/test/SemaObjCXX/void_to_obj.mm b/test/SemaObjCXX/void_to_obj.mm
index bd2ef14..d1fbf6b 100644
--- a/test/SemaObjCXX/void_to_obj.mm
+++ b/test/SemaObjCXX/void_to_obj.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // <rdar://problem/6463729>
 @class XX;
diff --git a/test/SemaTemplate/class-template-decl.cpp b/test/SemaTemplate/class-template-decl.cpp
index ff38132..475c7b9 100644
--- a/test/SemaTemplate/class-template-decl.cpp
+++ b/test/SemaTemplate/class-template-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 template<typename T> class A;
 
diff --git a/test/SemaTemplate/class-template-id-2.cpp b/test/SemaTemplate/class-template-id-2.cpp
index e77555f..c4388a7 100644
--- a/test/SemaTemplate/class-template-id-2.cpp
+++ b/test/SemaTemplate/class-template-id-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 namespace N {
   template<typename T> class A { };
 
diff --git a/test/SemaTemplate/class-template-id.cpp b/test/SemaTemplate/class-template-id.cpp
index 86100ef..e0e1cba 100644
--- a/test/SemaTemplate/class-template-id.cpp
+++ b/test/SemaTemplate/class-template-id.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 template<typename T, typename U = float> struct A { };
 
 typedef A<int> A_int;
diff --git a/test/SemaTemplate/class-template-spec.cpp b/test/SemaTemplate/class-template-spec.cpp
index 90ab39f..b3dc3b2 100644
--- a/test/SemaTemplate/class-template-spec.cpp
+++ b/test/SemaTemplate/class-template-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 template<typename T, typename U = int> struct A; // expected-note 2{{template is declared here}}
 
 template<> struct A<double, double>; // expected-note{{forward declaration}}
diff --git a/test/SemaTemplate/default-arguments.cpp b/test/SemaTemplate/default-arguments.cpp
index cc0da19..572227c 100644
--- a/test/SemaTemplate/default-arguments.cpp
+++ b/test/SemaTemplate/default-arguments.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 template<typename T, int N = 2> struct X; // expected-note{{template is declared here}}
 
diff --git a/test/SemaTemplate/fibonacci.cpp b/test/SemaTemplate/fibonacci.cpp
index b56d8cd..aa3b4b1 100644
--- a/test/SemaTemplate/fibonacci.cpp
+++ b/test/SemaTemplate/fibonacci.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 // FIXME: The Fibonacci/FibonacciEval dance is here to work around our
 // inability to parse injected-class-name<template-argument-list>.
diff --git a/test/SemaTemplate/fun-template-def.cpp b/test/SemaTemplate/fun-template-def.cpp
index e9871bb..fdcf6ee 100644
--- a/test/SemaTemplate/fun-template-def.cpp
+++ b/test/SemaTemplate/fun-template-def.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 // Tests that dependent expressions are always allowed, whereas non-dependent
 // are checked as usual.
diff --git a/test/SemaTemplate/instantiate-array.cpp b/test/SemaTemplate/instantiate-array.cpp
index d67645e..29279b4 100644
--- a/test/SemaTemplate/instantiate-array.cpp
+++ b/test/SemaTemplate/instantiate-array.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -std=c++0x
+// RUN: clang-cc -fsyntax-only -verify %s -std=c++0x
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
 #define __CONCAT(__X, __Y) __CONCAT1(__X, __Y)
diff --git a/test/SemaTemplate/instantiate-enum.cpp b/test/SemaTemplate/instantiate-enum.cpp
index 665746c..a7acf22 100644
--- a/test/SemaTemplate/instantiate-enum.cpp
+++ b/test/SemaTemplate/instantiate-enum.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 
 template<typename T, T I, int J>
 struct adder {
diff --git a/test/SemaTemplate/instantiate-expr-1.cpp b/test/SemaTemplate/instantiate-expr-1.cpp
index 2ea0641..13ee3ab 100644
--- a/test/SemaTemplate/instantiate-expr-1.cpp
+++ b/test/SemaTemplate/instantiate-expr-1.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 template<int I, int J>
 struct Bitfields {
diff --git a/test/SemaTemplate/instantiate-expr-2.cpp b/test/SemaTemplate/instantiate-expr-2.cpp
index b2c43ee..aa898dd 100644
--- a/test/SemaTemplate/instantiate-expr-2.cpp
+++ b/test/SemaTemplate/instantiate-expr-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
 typedef char one_byte;
 typedef char (&two_bytes)[2];
 typedef char (&four_bytes)[4];
diff --git a/test/SemaTemplate/instantiate-field.cpp b/test/SemaTemplate/instantiate-field.cpp
index dbfbd47..8e2a375 100644
--- a/test/SemaTemplate/instantiate-field.cpp
+++ b/test/SemaTemplate/instantiate-field.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 template<typename T>
 struct X {
diff --git a/test/SemaTemplate/instantiate-method.cpp b/test/SemaTemplate/instantiate-method.cpp
index 3497cbe..5baf2ad 100644
--- a/test/SemaTemplate/instantiate-method.cpp
+++ b/test/SemaTemplate/instantiate-method.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 template<typename T>
 class X {
 public:
diff --git a/test/SemaTemplate/instantiate-typedef.cpp b/test/SemaTemplate/instantiate-typedef.cpp
index 3e7c464..abdc37a 100644
--- a/test/SemaTemplate/instantiate-typedef.cpp
+++ b/test/SemaTemplate/instantiate-typedef.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 template<typename T>
 struct add_pointer {
diff --git a/test/SemaTemplate/instantiation-backtrace.cpp b/test/SemaTemplate/instantiation-backtrace.cpp
index 10c2de0..8696622 100644
--- a/test/SemaTemplate/instantiation-backtrace.cpp
+++ b/test/SemaTemplate/instantiation-backtrace.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 template<typename T> struct A; // expected-note 4{{template is declared here}}
 
 template<typename T> struct B : A<T*> { }; // expected-error{{implicit instantiation of undefined template}} \
diff --git a/test/SemaTemplate/instantiation-default-1.cpp b/test/SemaTemplate/instantiation-default-1.cpp
index 3060fdc..ecb1fb7 100644
--- a/test/SemaTemplate/instantiation-default-1.cpp
+++ b/test/SemaTemplate/instantiation-default-1.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 template<typename T, typename U = const T> struct Def1;
 
 template<> struct Def1<int> { 
diff --git a/test/SemaTemplate/instantiation-default-2.cpp b/test/SemaTemplate/instantiation-default-2.cpp
index 9d6b047..740832c 100644
--- a/test/SemaTemplate/instantiation-default-2.cpp
+++ b/test/SemaTemplate/instantiation-default-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 template<typename T, T Value> struct Constant; // expected-note{{template parameter is declared here}} \
 // FIXME: bad location expected-error{{a non-type template parameter cannot have type 'float'}}
diff --git a/test/SemaTemplate/instantiation-default-3.cpp b/test/SemaTemplate/instantiation-default-3.cpp
index b9379d6..521edf6 100644
--- a/test/SemaTemplate/instantiation-default-3.cpp
+++ b/test/SemaTemplate/instantiation-default-3.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 template<typename T> struct A { };
 
diff --git a/test/SemaTemplate/instantiation-depth.cpp b/test/SemaTemplate/instantiation-depth.cpp
index 06317d8..522c4e1 100644
--- a/test/SemaTemplate/instantiation-depth.cpp
+++ b/test/SemaTemplate/instantiation-depth.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -ftemplate-depth=5 -verify %s
+// RUN: clang-cc -fsyntax-only -ftemplate-depth=5 -verify %s
 
 template<typename T> struct X : X<T*> { }; // expected-error{{recursive template instantiation exceeded maximum depth of 5}} \
 // expected-note{{use -ftemplate-depth-N to increase recursive template instantiation depth}} \
diff --git a/test/SemaTemplate/nested-name-spec-template.cpp b/test/SemaTemplate/nested-name-spec-template.cpp
index 8db2bc3..f856268 100644
--- a/test/SemaTemplate/nested-name-spec-template.cpp
+++ b/test/SemaTemplate/nested-name-spec-template.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 namespace N { 
   namespace M {
diff --git a/test/SemaTemplate/qualified-names-diag.cpp b/test/SemaTemplate/qualified-names-diag.cpp
index 74e61bb..bf4ae11 100644
--- a/test/SemaTemplate/qualified-names-diag.cpp
+++ b/test/SemaTemplate/qualified-names-diag.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 namespace std {
   template<typename T> class vector { };
diff --git a/test/SemaTemplate/right-angle-brackets-0x.cpp b/test/SemaTemplate/right-angle-brackets-0x.cpp
index e11dfe9..57b6ee2 100644
--- a/test/SemaTemplate/right-angle-brackets-0x.cpp
+++ b/test/SemaTemplate/right-angle-brackets-0x.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c++0x -verify %s
+// RUN: clang-cc -fsyntax-only -std=c++0x -verify %s
 template<typename T> struct X;
 template<int I> struct Y;
 
diff --git a/test/SemaTemplate/right-angle-brackets-98.cpp b/test/SemaTemplate/right-angle-brackets-98.cpp
index 1994e3d..764bb7b 100644
--- a/test/SemaTemplate/right-angle-brackets-98.cpp
+++ b/test/SemaTemplate/right-angle-brackets-98.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c++98 -verify %s
+// RUN: clang-cc -fsyntax-only -std=c++98 -verify %s
 template<typename T> struct X;
 template<int I> struct Y;
 
diff --git a/test/SemaTemplate/temp_arg.cpp b/test/SemaTemplate/temp_arg.cpp
index b974c62..e873b8e 100644
--- a/test/SemaTemplate/temp_arg.cpp
+++ b/test/SemaTemplate/temp_arg.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 template<typename T, 
          int I, 
          template<typename> class TT>
diff --git a/test/SemaTemplate/temp_arg_nontype.cpp b/test/SemaTemplate/temp_arg_nontype.cpp
index 3819472..4faa72b 100644
--- a/test/SemaTemplate/temp_arg_nontype.cpp
+++ b/test/SemaTemplate/temp_arg_nontype.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c++98 -verify %s
+// RUN: clang-cc -fsyntax-only -std=c++98 -verify %s
 template<int N> struct A; // expected-note 5{{template parameter is declared here}}
 
 A<0> *a0;
diff --git a/test/SemaTemplate/temp_arg_template.cpp b/test/SemaTemplate/temp_arg_template.cpp
index 781ada9..a5e9f75 100644
--- a/test/SemaTemplate/temp_arg_template.cpp
+++ b/test/SemaTemplate/temp_arg_template.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 
 template<template<typename T> class X> struct A; // expected-note 2{{previous template template parameter is here}}
 
diff --git a/test/SemaTemplate/temp_arg_type.cpp b/test/SemaTemplate/temp_arg_type.cpp
index 94e4505..b322dae 100644
--- a/test/SemaTemplate/temp_arg_type.cpp
+++ b/test/SemaTemplate/temp_arg_type.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
 template<typename T> class A; // expected-note 2 {{template parameter is declared here}}
 
 // [temp.arg.type]p1
diff --git a/test/SemaTemplate/temp_param.cpp b/test/SemaTemplate/temp_param.cpp
index 1f10cc4..c042f08 100644
--- a/test/SemaTemplate/temp_param.cpp
+++ b/test/SemaTemplate/temp_param.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s 
+// RUN: clang-cc -fsyntax-only -verify %s 
 
 class X;
 
diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py
index e61f9d5..09b6ebd 100644
--- a/tools/ccc/ccclib/Tools.py
+++ b/tools/ccc/ccclib/Tools.py
@@ -442,7 +442,7 @@
             else:
                 cmd_args.extend(arglist.renderAsInput(input.source))
             
-        jobs.addJob(Jobs.Command(self.toolChain.getProgramPath('clang'), 
+        jobs.addJob(Jobs.Command(self.toolChain.getProgramPath('clang-cc'), 
                                  cmd_args))
         
 class Darwin_X86_CC1Tool(Tool):
diff --git a/tools/ccc/test/ccc/universal-hello.c b/tools/ccc/test/ccc/universal-hello.c
index 65560ec..36afd66 100644
--- a/tools/ccc/test/ccc/universal-hello.c
+++ b/tools/ccc/test/ccc/universal-hello.c
@@ -8,7 +8,7 @@
 // RUN: xcc -ccc-print-phases -### -arch ppc -arch ppc %s | grep 'linker,' | count 1 &&
 
 // Check that -ccc-clang-archs is honored.
-// RUN: xcc -ccc-clang-archs i386 -### -arch ppc -arch i386 %s 2>&1 | grep 'clang"' | count 1
+// RUN: xcc -ccc-clang-archs i386 -### -arch ppc -arch i386 %s 2>&1 | grep 'clang-cc"' | count 1
 
 int main() {
   printf("Hello, World!\n");