Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'.

 - This is designed to make it obvious that %clang_cc1 is a "test variable"
   which is substituted. It is '%clang_cc1' instead of '%clang -cc1' because it
   can be useful to redefine what gets run as 'clang -cc1' (for example, to set
   a default target).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91446 91177308-0d34-0410-b5e6-96231b3b80d8

204 files changed, 211 insertions, 211 deletions

diff --git a/test/Sema/128bitint.c b/test/Sema/128bitint.c
index a068d81e49..fe83d97ca4 100644
--- a/test/Sema/128bitint.c
+++ b/test/Sema/128bitint.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -triple x86_64-apple-darwin9 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64-apple-darwin9 %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 0829dc239d..332b0df728 100644
--- a/test/Sema/PR2727.c
+++ b/test/Sema/PR2727.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -verify -fsyntax-only -std=c90 %s
-// RUN: clang-cc -verify -fsyntax-only -std=c99 %s
+// RUN: %clang_cc1 -verify -fsyntax-only -std=c90 %s
+// RUN: %clang_cc1 -verify -fsyntax-only -std=c99 %s
 
 int f (int x)
 {
diff --git a/test/Sema/PR2728.c b/test/Sema/PR2728.c
index e8c2e268b5..e9f1deaf7c 100644
--- a/test/Sema/PR2728.c
+++ b/test/Sema/PR2728.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -verify -fsyntax-only -std=c90 %s
-// RUN: clang-cc -verify -fsyntax-only -std=c99 %s
+// RUN: %clang_cc1 -verify -fsyntax-only -std=c90 %s
+// RUN: %clang_cc1 -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 160ec4a380..9c1335786a 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-cc -fsyntax-only %s
+// RUN: %clang_cc1 -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 c75e7baed1..f22e70dd8d 100644
--- a/test/Sema/PR2923.c
+++ b/test/Sema/PR2923.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 78f2326dae..1900eefc7c 100644
--- a/test/Sema/PR2963-enum-constant.c
+++ b/test/Sema/PR2963-enum-constant.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -pedantic -fsyntax-only
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
 
 typedef short short_fixed;
 
diff --git a/test/Sema/address-constant.c b/test/Sema/address-constant.c
index 69f2f79f68..e842a7396b 100644
--- a/test/Sema/address-constant.c
+++ b/test/Sema/address-constant.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 int i;
 int a[] = {0};
diff --git a/test/Sema/address_spaces.c b/test/Sema/address_spaces.c
index d9d23edb3c..badd2383ab 100644
--- a/test/Sema/address_spaces.c
+++ b/test/Sema/address_spaces.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -verify
 
 #define _AS1 __attribute__((address_space(1)))
 #define _AS2 __attribute__((address_space(2)))
diff --git a/test/Sema/align-arm-apcs.c b/test/Sema/align-arm-apcs.c
index 9689906488..0a5d3fe921 100644
--- a/test/Sema/align-arm-apcs.c
+++ b/test/Sema/align-arm-apcs.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple arm-unknown-unknown -target-abi apcs-gnu -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple arm-unknown-unknown -target-abi apcs-gnu -fsyntax-only -verify %s
 
 struct s0 { double f0; int f1; };
 char chk0[__alignof__(struct s0) == 4 ? 1 : -1]; 
diff --git a/test/Sema/align-x86.c b/test/Sema/align-x86.c
index 2bc1cc8485..f67adecbf5 100644
--- a/test/Sema/align-x86.c
+++ b/test/Sema/align-x86.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple i386-apple-darwin9 -fsyntax-only -verify %s
 
 // PR3433
 double g1;
diff --git a/test/Sema/altivec-init.c b/test/Sema/altivec-init.c
index 2a33e1e56f..f22c1fc4db 100644
--- a/test/Sema/altivec-init.c
+++ b/test/Sema/altivec-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -faltivec -verify -pedantic -fsyntax-only
+// RUN: %clang_cc1 %s -faltivec -verify -pedantic -fsyntax-only
 
 typedef int v4 __attribute((vector_size(16)));
 typedef short v8 __attribute((vector_size(16)));
diff --git a/test/Sema/annotate.c b/test/Sema/annotate.c
index aec2af8b02..4d550759a2 100644
--- a/test/Sema/annotate.c
+++ b/test/Sema/annotate.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %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 ca1133bd8a..47fb2b6fba 100644
--- a/test/Sema/anonymous-struct-union.c
+++ b/test/Sema/anonymous-struct-union.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 struct X {
   union {
     float f3;
diff --git a/test/Sema/arg-duplicate.c b/test/Sema/arg-duplicate.c
index e40a964234..ca091eb309 100644
--- a/test/Sema/arg-duplicate.c
+++ b/test/Sema/arg-duplicate.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 1d81410b8d..912776ab8f 100644
--- a/test/Sema/arg-scope-c99.c
+++ b/test/Sema/arg-scope-c99.c
@@ -1,2 +1,2 @@
-// RUN: clang-cc -fsyntax-only -std=c99 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -std=c99 -verify %s
 void bb(int sz, int ar[sz][sz]) { }
diff --git a/test/Sema/arg-scope.c b/test/Sema/arg-scope.c
index d5e59603cf..ed9261941b 100644
--- a/test/Sema/arg-scope.c
+++ b/test/Sema/arg-scope.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 void 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 6407b5daf5..66f15c3a3c 100644
--- a/test/Sema/array-constraint.c
+++ b/test/Sema/array-constraint.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -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 3f6fa33a3b..b93fa9a0ed 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-cc -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -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 c78fd29a89..fbcf06bd16 100644
--- a/test/Sema/array-init.c
+++ b/test/Sema/array-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -pedantic -verify %s
+// RUN: %clang_cc1 -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 0a62545a1e..18d900c80d 100644
--- a/test/Sema/asm.c
+++ b/test/Sema/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple i386-pc-linux-gnu -verify -fsyntax-only
+// RUN: %clang_cc1 %s -triple i386-pc-linux-gnu -verify -fsyntax-only
 
 void f() {
   int i;
diff --git a/test/Sema/assign-null.c b/test/Sema/assign-null.c
index a343c8069f..7f172b1953 100644
--- a/test/Sema/assign-null.c
+++ b/test/Sema/assign-null.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 #include <stddef.h>
 
diff --git a/test/Sema/assign.c b/test/Sema/assign.c
index b25262c624..2d57029fc0 100644
--- a/test/Sema/assign.c
+++ b/test/Sema/assign.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 void *test1(void) { return 0; }
 
diff --git a/test/Sema/ast-print.c b/test/Sema/ast-print.c
index a8988b029f..ff66d35a1b 100644
--- a/test/Sema/ast-print.c
+++ b/test/Sema/ast-print.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -ast-print
+// RUN: %clang_cc1 %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 6e641cb371..bcb12ee40d 100644
--- a/test/Sema/attr-aligned.c
+++ b/test/Sema/attr-aligned.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 0434981c6c..9057c27a56 100644
--- a/test/Sema/attr-cleanup.c
+++ b/test/Sema/attr-cleanup.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %s -verify -fsyntax-only
 
 void c1(int *a);
 
diff --git a/test/Sema/attr-decl-after-definition.c b/test/Sema/attr-decl-after-definition.c
index c1d1b536fc..4d32e0028b 100644
--- a/test/Sema/attr-decl-after-definition.c
+++ b/test/Sema/attr-decl-after-definition.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 void foo();
 void foo() __attribute__((unused));
diff --git a/test/Sema/attr-deprecated.c b/test/Sema/attr-deprecated.c
index 4b889fc8aa..e723255c0c 100644
--- a/test/Sema/attr-deprecated.c
+++ b/test/Sema/attr-deprecated.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %s -verify -fsyntax-only
 
 int f() __attribute__((deprecated));
 void g() __attribute__((deprecated));
diff --git a/test/Sema/attr-format_arg.c b/test/Sema/attr-format_arg.c
index 5f06f4ba3f..64a2387831 100644
--- a/test/Sema/attr-format_arg.c
+++ b/test/Sema/attr-format_arg.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 int printf(const char *, ...);
 
diff --git a/test/Sema/attr-mode.c b/test/Sema/attr-mode.c
index ac411d7c42..9acd2c6f65 100644
--- a/test/Sema/attr-mode.c
+++ b/test/Sema/attr-mode.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 512ecfdcaf..203c2a7300 100644
--- a/test/Sema/attr-nodebug.c
+++ b/test/Sema/attr-nodebug.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 cf695f0d21..92dc9007eb 100644
--- a/test/Sema/attr-noinline.c
+++ b/test/Sema/attr-noinline.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 047cdad6b5..0966989bf9 100644
--- a/test/Sema/attr-noreturn.c
+++ b/test/Sema/attr-noreturn.c
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -verify -fsyntax-only %s
+// RUN: %clang_cc1 -verify -fsyntax-only %s
 
 static void (*fp0)(void) __attribute__((noreturn));
 
diff --git a/test/Sema/attr-regparm.c b/test/Sema/attr-regparm.c
index 944f01489c..045a41396e 100644
--- a/test/Sema/attr-regparm.c
+++ b/test/Sema/attr-regparm.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple i386-apple-darwin9 -fsyntax-only -verify %s
 
 __attribute((regparm(2))) int x(void);
 __attribute((regparm(1.0))) int x(void); // expected-error{{'regparm' attribute requires integer constant}}
diff --git a/test/Sema/attr-section.c b/test/Sema/attr-section.c
index c61ed80cbf..20ae2e3547 100644
--- a/test/Sema/attr-section.c
+++ b/test/Sema/attr-section.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -verify -fsyntax-only -triple x86_64-apple-darwin9 %s
+// RUN: %clang_cc1 -verify -fsyntax-only -triple x86_64-apple-darwin9 %s
 
 int x __attribute__((section(
    42)));  // expected-error {{argument to section attribute was not a string literal}}
diff --git a/test/Sema/attr-unused.c b/test/Sema/attr-unused.c
index dbb5e630d7..e45ec434f5 100644
--- a/test/Sema/attr-unused.c
+++ b/test/Sema/attr-unused.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -verify -fsyntax-only %s
+// RUN: %clang_cc1 -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 fdabf7ff2a..d50f4c09ac 100644
--- a/test/Sema/attr-used.c
+++ b/test/Sema/attr-used.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -verify -fsyntax-only %s
+// RUN: %clang_cc1 -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-weak.c b/test/Sema/attr-weak.c
index 4532cccf98..8e3e626c5d 100644
--- a/test/Sema/attr-weak.c
+++ b/test/Sema/attr-weak.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -verify -fsyntax-only %s
+// RUN: %clang_cc1 -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 4405c80fee..edc44bdefa 100644
--- a/test/Sema/bitfield-layout.c
+++ b/test/Sema/bitfield-layout.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -triple=i686-apple-darwin9
+// RUN: %clang_cc1 %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-promote-int-16bit.c b/test/Sema/bitfield-promote-int-16bit.c
index 12d47205e8..cd9adcffc0 100644
--- a/test/Sema/bitfield-promote-int-16bit.c
+++ b/test/Sema/bitfield-promote-int-16bit.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s -triple pic16-unknown-unknown
+// RUN: %clang_cc1 -fsyntax-only -verify %s -triple pic16-unknown-unknown
 
 // Check that int-sized unsigned bit-fields promote to unsigned int
 // on targets where sizeof(unsigned short) == sizeof(unsigned int)
diff --git a/test/Sema/bitfield-promote.c b/test/Sema/bitfield-promote.c
index 066f5d78e7..4d14ad191e 100644
--- a/test/Sema/bitfield-promote.c
+++ b/test/Sema/bitfield-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 struct {unsigned x : 2;} x;
 __typeof__((x.x+=1)+1) y;
 __typeof__(x.x<<1) y;
diff --git a/test/Sema/bitfield.c b/test/Sema/bitfield.c
index 581af6d0c5..6f129daceb 100644
--- a/test/Sema/bitfield.c
+++ b/test/Sema/bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify 
+// RUN: %clang_cc1 %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 3a58735f23..08af9b3773 100644
--- a/test/Sema/block-args.c
+++ b/test/Sema/block-args.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -fblocks
+// RUN: %clang_cc1 %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 1197a1972f..a85b606757 100644
--- a/test/Sema/block-as-object.m
+++ b/test/Sema/block-as-object.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 %s -fsyntax-only -verify -fblocks
+// RUN: %clang_cc1 %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 06bab121f9..7b7cc3d2c4 100644
--- a/test/Sema/block-byref-args.c
+++ b/test/Sema/block-byref-args.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -fblocks
+// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks
 
 int printf(const char *, ...);
 
diff --git a/test/Sema/block-call.c b/test/Sema/block-call.c
index 893a8f61da..0aba75e14a 100644
--- a/test/Sema/block-call.c
+++ b/test/Sema/block-call.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s -fblocks
+// RUN: %clang_cc1 -fsyntax-only -verify %s -fblocks
 
 int (*FP)();
 int (^IFP) ();
diff --git a/test/Sema/block-labels.c b/test/Sema/block-labels.c
index f0f8c4856d..af364b4f86 100644
--- a/test/Sema/block-labels.c
+++ b/test/Sema/block-labels.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fblocks -fsyntax-only
+// RUN: %clang_cc1 %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 9f5022dc63..e9c2341a99 100644
--- a/test/Sema/block-literal.c
+++ b/test/Sema/block-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify -fblocks
+// RUN: %clang_cc1 -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 8661fd8a52..9f1bc4025f 100644
--- a/test/Sema/block-misc.c
+++ b/test/Sema/block-misc.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s -fblocks
+// RUN: %clang_cc1 -fsyntax-only -verify %s -fblocks
 void donotwarn();
 
 int (^IFP) ();
diff --git a/test/Sema/block-printf-attribute-1.c b/test/Sema/block-printf-attribute-1.c
index 4941ae7bc6..8ea77ece12 100644
--- a/test/Sema/block-printf-attribute-1.c
+++ b/test/Sema/block-printf-attribute-1.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -fblocks
+// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks
 
 int main() {
   void (^b) (int arg, const char * format, ...) __attribute__ ((__format__ (__printf__, 1, 3))) =   // expected-error {{format argument not a string type}}
diff --git a/test/Sema/block-return-1.c b/test/Sema/block-return-1.c
index 2da87351e4..631a2d443e 100644
--- a/test/Sema/block-return-1.c
+++ b/test/Sema/block-return-1.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify -fblocks
+// RUN: %clang_cc1 -fsyntax-only %s -verify -fblocks
 
 int j;
 void foo() {
diff --git a/test/Sema/block-return-2.c b/test/Sema/block-return-2.c
index d389f4e4ff..d5fbc6f70c 100644
--- a/test/Sema/block-return-2.c
+++ b/test/Sema/block-return-2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify -fblocks
+// RUN: %clang_cc1 -fsyntax-only %s -verify -fblocks
 
 void foo() {
   ^ (void) __attribute__((noreturn)) { }(); // expected-error {{block declared 'noreturn' should not return}}
diff --git a/test/Sema/block-return-3.c b/test/Sema/block-return-3.c
index e7e9342e02..cd942a7f30 100644
--- a/test/Sema/block-return-3.c
+++ b/test/Sema/block-return-3.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify -fblocks
+// RUN: %clang_cc1 -fsyntax-only %s -verify -fblocks
 
 void foo() {
   ^ int (void) { }(); // expected-error {{control reaches end of non-void block}}
diff --git a/test/Sema/block-return.c b/test/Sema/block-return.c
index 98a72731d6..4240b09856 100644
--- a/test/Sema/block-return.c
+++ b/test/Sema/block-return.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify -fblocks
+// RUN: %clang_cc1 -fsyntax-only %s -verify -fblocks
 
 typedef void (^CL)(void);
 
diff --git a/test/Sema/block-sentinel-attribute.c b/test/Sema/block-sentinel-attribute.c
index 5628a2c780..b5ce0da15c 100644
--- a/test/Sema/block-sentinel-attribute.c
+++ b/test/Sema/block-sentinel-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fblocks -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fblocks -fsyntax-only -verify %s
 
 void (^e) (int arg, const char * format, ...) __attribute__ ((__sentinel__ (1,1)));
 
diff --git a/test/Sema/block-storageclass.c b/test/Sema/block-storageclass.c
index aacf8be2c0..9bfbfbd614 100644
--- a/test/Sema/block-storageclass.c
+++ b/test/Sema/block-storageclass.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -fblocks
+// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks
 
 int printf(const char *, ...);
 void _Block_byref_release(void*src){}
diff --git a/test/Sema/builtin-object-size.c b/test/Sema/builtin-object-size.c
index 0c6d288d8c..0abc27ba18 100644
--- a/test/Sema/builtin-object-size.c
+++ b/test/Sema/builtin-object-size.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -fsyntax-only -verify %s
-// RUN: clang-cc -fsyntax-only -triple x86_64-apple-darwin9 -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 4ee9f8947b..4f09da6c28 100644
--- a/test/Sema/builtin-prefetch.c
+++ b/test/Sema/builtin-prefetch.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 void foo() {
   int a;
diff --git a/test/Sema/builtin-stackaddress.c b/test/Sema/builtin-stackaddress.c
index 67582a549f..1feb57ea52 100644
--- a/test/Sema/builtin-stackaddress.c
+++ b/test/Sema/builtin-stackaddress.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 void* a(unsigned x) {
 return __builtin_return_address(0);
 }
diff --git a/test/Sema/builtin-unary-fp.c b/test/Sema/builtin-unary-fp.c
index 70c7a297fb..8f48d7ffc5 100644
--- a/test/Sema/builtin-unary-fp.c
+++ b/test/Sema/builtin-unary-fp.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -pedantic
+// RUN: %clang_cc1 %s -fsyntax-only -verify -pedantic
 void check(int);
 void a() {
   check(__builtin_isfinite(1.0f));
diff --git a/test/Sema/builtins.c b/test/Sema/builtins.c
index e133d626ee..a23273740c 100644
--- a/test/Sema/builtins.c
+++ b/test/Sema/builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -pedantic -triple=i686-apple-darwin9
+// RUN: %clang_cc1 %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 50c5f4e5a8..f6f6bd9720 100644
--- a/test/Sema/c89-2.c
+++ b/test/Sema/c89-2.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc %s -std=c89 -pedantic-errors -verify
+/* RUN: %clang_cc1 %s -std=c89 -pedantic-errors -verify
  */
 
 #if 1LL        /* expected-error {{long long}} */
diff --git a/test/Sema/c89.c b/test/Sema/c89.c
index fc50ebed66..8a9e622d87 100644
--- a/test/Sema/c89.c
+++ b/test/Sema/c89.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc %s -std=c89 -pedantic -fsyntax-only -verify
+/* RUN: %clang_cc1 %s -std=c89 -pedantic -fsyntax-only -verify
  */
 void test1() {
   {
diff --git a/test/Sema/callingconv.c b/test/Sema/callingconv.c
index f65aab463f..a32a495308 100644
--- a/test/Sema/callingconv.c
+++ b/test/Sema/callingconv.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -verify
 
 void __attribute__((fastcall)) foo(float *a) { 
 }
diff --git a/test/Sema/carbon.c b/test/Sema/carbon.c
index 8292ba8a50..c21dc58f2c 100644
--- a/test/Sema/carbon.c
+++ b/test/Sema/carbon.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -mcpu pentium4 %s -print-stats
+// RUN: %clang_cc1 -mcpu pentium4 %s -print-stats
 #ifdef __APPLE__
 #include <Carbon/Carbon.h>
 #endif
diff --git a/test/Sema/cast-to-union.c b/test/Sema/cast-to-union.c
index 24f913b9ea..6856c17c72 100644
--- a/test/Sema/cast-to-union.c
+++ b/test/Sema/cast-to-union.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -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 d2e3e0c7e3..e52dcaebbd 100644
--- a/test/Sema/cast.c
+++ b/test/Sema/cast.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify
+// RUN: %clang_cc1 -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 72eae06bfa..070ea74f68 100644
--- a/test/Sema/check-increment.c
+++ b/test/Sema/check-increment.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 int printf(const char *, ...);
 typedef int *pint;
diff --git a/test/Sema/compare.c b/test/Sema/compare.c
index fa2d3a062e..75a3cf1f62 100644
--- a/test/Sema/compare.c
+++ b/test/Sema/compare.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -fsyntax-only -pedantic -verify -Wsign-compare %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -pedantic -verify -Wsign-compare %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 6c660899e8..2bd03744d7 100644
--- a/test/Sema/complex-int.c
+++ b/test/Sema/complex-int.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %s -verify -fsyntax-only
 
 void a() {
 __complex__ int arr;
diff --git a/test/Sema/complex-promotion.c b/test/Sema/complex-promotion.c
index 3d86c20eb2..23c3b68953 100644
--- a/test/Sema/complex-promotion.c
+++ b/test/Sema/complex-promotion.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %s -verify -fsyntax-only
 
 float a;
 
diff --git a/test/Sema/compound-literal.c b/test/Sema/compound-literal.c
index b51bcfe2a2..a650d12de9 100644
--- a/test/Sema/compound-literal.c
+++ b/test/Sema/compound-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -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 8cac32c82f..5f01374be3 100644
--- a/test/Sema/conditional-expr.c
+++ b/test/Sema/conditional-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic -Wsign-compare %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -Wsign-compare %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 9f48c349c9..e67580ace6 100644
--- a/test/Sema/conditional.c
+++ b/test/Sema/conditional.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %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 39a24b3269..fee8d97f9b 100644
--- a/test/Sema/const-eval.c
+++ b/test/Sema/const-eval.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 4e08bfff2c..c6e70b8b24 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-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 #include <stdint.h>
 
diff --git a/test/Sema/constant-builtins-2.c b/test/Sema/constant-builtins-2.c
index 18dbb1e7c5..23aa314e0c 100644
--- a/test/Sema/constant-builtins-2.c
+++ b/test/Sema/constant-builtins-2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s
+// RUN: %clang_cc1 -fsyntax-only %s
 
 // Math stuff
 
diff --git a/test/Sema/constant-builtins.c b/test/Sema/constant-builtins.c
index f8cea33d67..5d67fc7cb7 100644
--- a/test/Sema/constant-builtins.c
+++ b/test/Sema/constant-builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify -pedantic
+// RUN: %clang_cc1 -fsyntax-only %s -verify -pedantic
 
 // Math stuff
 
diff --git a/test/Sema/constructor-attribute.c b/test/Sema/constructor-attribute.c
index bf876f344a..3dfbbcbe28 100644
--- a/test/Sema/constructor-attribute.c
+++ b/test/Sema/constructor-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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/conversion-64-32.c b/test/Sema/conversion-64-32.c
index 53830fd061..104399641d 100644
--- a/test/Sema/conversion-64-32.c
+++ b/test/Sema/conversion-64-32.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -Wshorten-64-to-32 -triple x86_64-apple-darwin %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wshorten-64-to-32 -triple x86_64-apple-darwin %s
 
 int test0(long v) {
   return v; // expected-warning {{implicit cast loses integer precision}}
diff --git a/test/Sema/conversion.c b/test/Sema/conversion.c
index bca23f8f8d..264e0430da 100644
--- a/test/Sema/conversion.c
+++ b/test/Sema/conversion.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -Wconversion -triple x86_64-apple-darwin %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wconversion -triple x86_64-apple-darwin %s
 
 #define BIG 0x7f7f7f7f7f7f7f7fL
 
diff --git a/test/Sema/darwin-align-cast.c b/test/Sema/darwin-align-cast.c
index fed8983191..208097481c 100644
--- a/test/Sema/darwin-align-cast.c
+++ b/test/Sema/darwin-align-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 823551f02e..815e6dd9ca 100644
--- a/test/Sema/decl-invalid.c
+++ b/test/Sema/decl-invalid.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %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 1a8601298e..259b0ddf15 100644
--- a/test/Sema/decl-type-merging.c
+++ b/test/Sema/decl-type-merging.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -std=c99 -verify -pedantic %s
+// RUN: %clang_cc1 -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 e325cc8352..5f3ce40516 100644
--- a/test/Sema/declspec.c
+++ b/test/Sema/declspec.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 5dac99131b..1318601845 100644
--- a/test/Sema/default.c
+++ b/test/Sema/default.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 void f5 (int z) { 
   if (z) 
diff --git a/test/Sema/default1.c b/test/Sema/default1.c
index 6e8a27bf57..631e848df1 100644
--- a/test/Sema/default1.c
+++ b/test/Sema/default1.c
@@ -1,2 +1,2 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 965940e26d..845b28645a 100644
--- a/test/Sema/deref.c
+++ b/test/Sema/deref.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc -fsyntax-only -verify -std=c90 -pedantic %s
+/* RUN: %clang_cc1 -fsyntax-only -verify -std=c90 -pedantic %s
  */
 void
 foo (void)
diff --git a/test/Sema/designated-initializers.c b/test/Sema/designated-initializers.c
index ae951d42a1..9e2dc88b9a 100644
--- a/test/Sema/designated-initializers.c
+++ b/test/Sema/designated-initializers.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -triple x86_64-unknown-unknown %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64-unknown-unknown %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 90ed1456d2..a1e7a18166 100644
--- a/test/Sema/dllimport-dllexport.c
+++ b/test/Sema/dllimport-dllexport.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 31649e0ae9..262cab50a5 100644
--- a/test/Sema/enum.c
+++ b/test/Sema/enum.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -pedantic
+// RUN: %clang_cc1 %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 909acfb266..8f9f795d00 100644
--- a/test/Sema/expr-address-of.c
+++ b/test/Sema/expr-address-of.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 ffe8b696f6..d0883ba202 100644
--- a/test/Sema/expr-comma-c89.c
+++ b/test/Sema/expr-comma-c89.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -std=c99
+// RUN: %clang_cc1 %s -fsyntax-only -verify -std=c99
 // rdar://6095180
 
 struct s { char c[17]; };
diff --git a/test/Sema/expr-comma.c b/test/Sema/expr-comma.c
index 3a05130eae..d3e4020af6 100644
--- a/test/Sema/expr-comma.c
+++ b/test/Sema/expr-comma.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -std=c89
+// RUN: %clang_cc1 %s -fsyntax-only -verify -std=c89
 // rdar://6095180
 
 struct s { char c[17]; };
diff --git a/test/Sema/exprs.c b/test/Sema/exprs.c
index 10fcde6e75..e6cfa5fbe3 100644
--- a/test/Sema/exprs.c
+++ b/test/Sema/exprs.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -pedantic -fsyntax-only
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
 
 // PR1966
 _Complex double test1() {
diff --git a/test/Sema/ext_vector_casts.c b/test/Sema/ext_vector_casts.c
index dbcd1c9b3a..cbda021cd2 100644
--- a/test/Sema/ext_vector_casts.c
+++ b/test/Sema/ext_vector_casts.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 typedef __attribute__(( ext_vector_type(2) )) float float2;
 typedef __attribute__(( ext_vector_type(4) )) int int4;
diff --git a/test/Sema/ext_vector_components.c b/test/Sema/ext_vector_components.c
index 8e42582cc7..7d3d52aa95 100644
--- a/test/Sema/ext_vector_components.c
+++ b/test/Sema/ext_vector_components.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 afe31fb829..e03881cdbc 100644
--- a/test/Sema/flexible-array-init.c
+++ b/test/Sema/flexible-array-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -pedantic -verify %s
+// RUN: %clang_cc1 -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 9888105518..60f971c6df 100644
--- a/test/Sema/floating-point-compare.c
+++ b/test/Sema/floating-point-compare.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -Wfloat-equal -verify %s
+// RUN: %clang_cc1 -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 183a95d0ab..b998f4b07c 100644
--- a/test/Sema/for.c
+++ b/test/Sema/for.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // Check C99 6.8.5p3
 void b1 (void) { for (void (*f) (void);;); }
diff --git a/test/Sema/format-attr-pr4470.c b/test/Sema/format-attr-pr4470.c
index 24eece8878..374d8b3af0 100644
--- a/test/Sema/format-attr-pr4470.c
+++ b/test/Sema/format-attr-pr4470.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -Wformat=2 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wformat=2 %s
 
 #include <stdarg.h>
 int vprintf(const char *, va_list);
diff --git a/test/Sema/format-attribute-printf0.c b/test/Sema/format-attribute-printf0.c
index fa7eafd52f..33e8d40076 100644
--- a/test/Sema/format-attribute-printf0.c
+++ b/test/Sema/format-attribute-printf0.c
@@ -1,4 +1,4 @@
-//RUN: clang-cc -fsyntax-only -verify %s
+//RUN: %clang_cc1 -fsyntax-only -verify %s
 
 #include <stdarg.h>
 
diff --git a/test/Sema/format-attribute.c b/test/Sema/format-attribute.c
index cb82331859..6e1bd0f1ab 100644
--- a/test/Sema/format-attribute.c
+++ b/test/Sema/format-attribute.c
@@ -1,4 +1,4 @@
-//RUN: clang-cc -fsyntax-only -verify %s
+//RUN: %clang_cc1 -fsyntax-only -verify %s
 
 #include <stdarg.h>
 
diff --git a/test/Sema/format-string-percentm.c b/test/Sema/format-string-percentm.c
index f531372fd4..f2e9dd81ba 100644
--- a/test/Sema/format-string-percentm.c
+++ b/test/Sema/format-string-percentm.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s -triple i686-pc-linux-gnu
+// RUN: %clang_cc1 -fsyntax-only -verify %s -triple i686-pc-linux-gnu
 
 int printf(char const*,...);
 void percentm(void) {
diff --git a/test/Sema/format-strings.c b/test/Sema/format-strings.c
index 0a9fccebd7..1ad4bda10a 100644
--- a/test/Sema/format-strings.c
+++ b/test/Sema/format-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -Wformat-nonliteral %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral %s
 
 #include <stdarg.h>
 typedef __typeof(sizeof(int)) size_t;
diff --git a/test/Sema/freemain.c b/test/Sema/freemain.c
index a2364df259..eed644d483 100644
--- a/test/Sema/freemain.c
+++ b/test/Sema/freemain.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -ffreestanding %s
+// RUN: %clang_cc1 -fsyntax-only -verify -ffreestanding %s
 
 // Tests that -ffreestanding disables all special treatment of main().
 
diff --git a/test/Sema/function-pointer-sentinel-attribute.c b/test/Sema/function-pointer-sentinel-attribute.c
index 6d3fb17180..5f17a260b2 100644
--- a/test/Sema/function-pointer-sentinel-attribute.c
+++ b/test/Sema/function-pointer-sentinel-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 void (*e) (int arg, const char * format, ...) __attribute__ ((__sentinel__ (1,1)));
 
diff --git a/test/Sema/function-ptr.c b/test/Sema/function-ptr.c
index 6b410018f4..c1ff8e1d7b 100644
--- a/test/Sema/function-ptr.c
+++ b/test/Sema/function-ptr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -pedantic
+// RUN: %clang_cc1 %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 28593b0678..9544dc9bae 100644
--- a/test/Sema/function-redecl.c
+++ b/test/Sema/function-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // PR3588
 void g0(int, int);
diff --git a/test/Sema/function-sentinel-attr.c b/test/Sema/function-sentinel-attr.c
index b33b4a063c..9bcbec4c0c 100644
--- a/test/Sema/function-sentinel-attr.c
+++ b/test/Sema/function-sentinel-attr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc  -fsyntax-only -verify %s
+// RUN: %clang_cc1  -fsyntax-only -verify %s
 
 #define NULL (void*)0
 
diff --git a/test/Sema/function.c b/test/Sema/function.c
index e7a37f1a2f..9a83519a90 100644
--- a/test/Sema/function.c
+++ b/test/Sema/function.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -pedantic
+// RUN: %clang_cc1 %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/gnu89.c b/test/Sema/gnu89.c
index 4601cbe93f..fc21dcd5cd 100644
--- a/test/Sema/gnu89.c
+++ b/test/Sema/gnu89.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc %s -std=gnu89 -pedantic -fsyntax-only -verify
+// RUN: %clang_cc1 %s -std=gnu89 -pedantic -fsyntax-only -verify
 
 int f(int restrict);
diff --git a/test/Sema/heinous-extensions-off.c b/test/Sema/heinous-extensions-off.c
index 3a9880ce7f..9b80d3496d 100644
--- a/test/Sema/heinous-extensions-off.c
+++ b/test/Sema/heinous-extensions-off.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify
+// RUN: %clang_cc1 %s -verify
 
 int foo() {
         int a;
diff --git a/test/Sema/heinous-extensions-on.c b/test/Sema/heinous-extensions-on.c
index a56f1f6f62..176f4727ef 100644
--- a/test/Sema/heinous-extensions-on.c
+++ b/test/Sema/heinous-extensions-on.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fheinous-gnu-extensions
+// RUN: %clang_cc1 %s -verify -fheinous-gnu-extensions
 
 void foo() {
   int a;
diff --git a/test/Sema/if-empty-body.c b/test/Sema/if-empty-body.c
index 1d1df40bd6..af1e62f6b1 100644
--- a/test/Sema/if-empty-body.c
+++ b/test/Sema/if-empty-body.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 c932bb28dc..3c59df8298 100644
--- a/test/Sema/illegal-types.c
+++ b/test/Sema/illegal-types.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -std=c++98 %s
+// RUN: %clang_cc1 -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 696a2b926c..09ecd23ca1 100644
--- a/test/Sema/implicit-builtin-decl.c
+++ b/test/Sema/implicit-builtin-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 9bd5c05892..505e5221ef 100644
--- a/test/Sema/implicit-builtin-freestanding.c
+++ b/test/Sema/implicit-builtin-freestanding.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -ffreestanding %s
+// RUN: %clang_cc1 -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 fc51312f17..1e520d2ae9 100644
--- a/test/Sema/implicit-builtin-redecl.c
+++ b/test/Sema/implicit-builtin-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // PR3592
 static void* malloc(int);
diff --git a/test/Sema/implicit-cast.c b/test/Sema/implicit-cast.c
index ce34ad6d1c..088b1958d9 100644
--- a/test/Sema/implicit-cast.c
+++ b/test/Sema/implicit-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s
+// RUN: %clang_cc1 -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 8873e76098..fc48895f4e 100644
--- a/test/Sema/implicit-decl.c
+++ b/test/Sema/implicit-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 3b31b99966..6caa090631 100644
--- a/test/Sema/implicit-def.c
+++ b/test/Sema/implicit-def.c
@@ -1,5 +1,5 @@
-/* RUN: clang-cc -fsyntax-only %s -std=c89
- * RUN: not clang-cc -fsyntax-only %s -std=c99 -pedantic-errors
+/* RUN: %clang_cc1 -fsyntax-only %s -std=c89
+ * RUN: not %clang_cc1 -fsyntax-only %s -std=c99 -pedantic-errors
  */
 
 int A() {
diff --git a/test/Sema/implicit-int.c b/test/Sema/implicit-int.c
index 5190bdbf93..1bb9a83853 100644
--- a/test/Sema/implicit-int.c
+++ b/test/Sema/implicit-int.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify -pedantic
+// RUN: %clang_cc1 -fsyntax-only %s -verify -pedantic
 
 foo() { // expected-warning {{type specifier missing, defaults to 'int'}}
   return 0;
diff --git a/test/Sema/incompatible-sign.c b/test/Sema/incompatible-sign.c
index a62f9a8ba7..a1592efc4c 100644
--- a/test/Sema/incompatible-sign.c
+++ b/test/Sema/incompatible-sign.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 15d97683c5..3ef578d59f 100644
--- a/test/Sema/incomplete-call.c
+++ b/test/Sema/incomplete-call.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 6a6ba753f3..753d9c0a3c 100644
--- a/test/Sema/incomplete-decl.c
+++ b/test/Sema/incomplete-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 struct foo; // expected-note 5 {{forward declaration of 'struct foo'}}
 
diff --git a/test/Sema/indirect-goto.c b/test/Sema/indirect-goto.c
index 35fb5e6315..134ccd8a70 100644
--- a/test/Sema/indirect-goto.c
+++ b/test/Sema/indirect-goto.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 struct c {int x;};
 int a(struct c x, long long y) {
diff --git a/test/Sema/init-struct-qualified.c b/test/Sema/init-struct-qualified.c
index 539820ae41..49ec7cc5e0 100644
--- a/test/Sema/init-struct-qualified.c
+++ b/test/Sema/init-struct-qualified.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify < %s
+// RUN: %clang_cc1 -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-vector.c b/test/Sema/init-vector.c
index 691ea97268..f0cf32bd3f 100644
--- a/test/Sema/init-vector.c
+++ b/test/Sema/init-vector.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 typedef float __attribute__((vector_size (16))) v4f_t;
 
diff --git a/test/Sema/init.c b/test/Sema/init.c
index 4ba6867d0b..9ebbce9758 100644
--- a/test/Sema/init.c
+++ b/test/Sema/init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %s -verify -fsyntax-only
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/test/Sema/inline.c b/test/Sema/inline.c
index adcde51363..3c99f24337 100644
--- a/test/Sema/inline.c
+++ b/test/Sema/inline.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // Check that we don't allow illegal uses of inline
 inline int a; // expected-error{{'inline' can only appear on functions}}
diff --git a/test/Sema/int-arith-convert.c b/test/Sema/int-arith-convert.c
index 5bbab7d9af..c56ab3b763 100644
--- a/test/Sema/int-arith-convert.c
+++ b/test/Sema/int-arith-convert.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=i686-linux-gnu -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 8c458008cb..7f471a1526 100644
--- a/test/Sema/invalid-decl.c
+++ b/test/Sema/invalid-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %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 724d0ea368..a215fa7c25 100644
--- a/test/Sema/invalid-init-diag.c
+++ b/test/Sema/invalid-init-diag.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 73e2e446f1..a598d577f0 100644
--- a/test/Sema/invalid-struct-init.c
+++ b/test/Sema/invalid-struct-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 6b033fc3a2..8ae0550dc8 100644
--- a/test/Sema/knr-def-call.c
+++ b/test/Sema/knr-def-call.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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/knr-variadic-def.c b/test/Sema/knr-variadic-def.c
index 070ba071ca..6d5d63208b 100644
--- a/test/Sema/knr-variadic-def.c
+++ b/test/Sema/knr-variadic-def.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s
 // PR4287
 
 #include <stdarg.h>
diff --git a/test/Sema/member-reference.c b/test/Sema/member-reference.c
index b810ccf15b..7bda14303a 100644
--- a/test/Sema/member-reference.c
+++ b/test/Sema/member-reference.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %s -verify -fsyntax-only
 
 struct simple { int i; };
 
diff --git a/test/Sema/merge-decls.c b/test/Sema/merge-decls.c
index f4c25f5114..1a84d33b79 100644
--- a/test/Sema/merge-decls.c
+++ b/test/Sema/merge-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %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 2113949f23..250e322256 100644
--- a/test/Sema/ms-fuzzy-asm.c
+++ b/test/Sema/ms-fuzzy-asm.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fms-extensions
+// RUN: %clang_cc1 %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 54a970f044..6a19921f47 100644
--- a/test/Sema/nested-redef.c
+++ b/test/Sema/nested-redef.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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/offsetof.c b/test/Sema/offsetof.c
index dfae99216f..49d4eb43e4 100644
--- a/test/Sema/offsetof.c
+++ b/test/Sema/offsetof.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 62b3882133..e8dbf3a609 100644
--- a/test/Sema/overloadable-complex.c
+++ b/test/Sema/overloadable-complex.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 0d5db3a984..72d3673c82 100644
--- a/test/Sema/overloadable.c
+++ b/test/Sema/overloadable.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 int var __attribute__((overloadable)); // expected-error{{'overloadable' attribute can only be applied to a function}}
 
diff --git a/test/Sema/parentheses.c b/test/Sema/parentheses.c
index f9f647c9cf..f7a7fbd37d 100644
--- a/test/Sema/parentheses.c
+++ b/test/Sema/parentheses.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -Wparentheses -fsyntax-only -verify %s
-// RUN: clang-cc -Wparentheses -fixit %s -o - | clang-cc -Wparentheses -Werror -
+// RUN: %clang_cc1 -Wparentheses -fsyntax-only -verify %s
+// RUN: %clang_cc1 -Wparentheses -fixit %s -o - | %clang_cc1 -Wparentheses -Werror -
 
 // Test the various warnings under -Wparentheses
 void if_assign(void) {
diff --git a/test/Sema/pointer-addition.c b/test/Sema/pointer-addition.c
index 87d5eaf39c..34f8bbbfcd 100644
--- a/test/Sema/pointer-addition.c
+++ b/test/Sema/pointer-addition.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -pedantic
+// RUN: %clang_cc1 %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-conversion.c b/test/Sema/pointer-conversion.c
index 5f41ff6741..7191bf7c63 100644
--- a/test/Sema/pointer-conversion.c
+++ b/test/Sema/pointer-conversion.c
@@ -1,4 +1,4 @@
-//RUN: clang-cc -fsyntax-only -verify %s
+//RUN: %clang_cc1 -fsyntax-only -verify %s
 
 char * c;
 char const ** c2 = &c; // expected-warning {{initializing, 'char const **' and 'char **' have different qualifiers in nested pointer types}}
diff --git a/test/Sema/pointer-subtract-compat.c b/test/Sema/pointer-subtract-compat.c
index b3be37e7f1..70340c6a4c 100644
--- a/test/Sema/pointer-subtract-compat.c
+++ b/test/Sema/pointer-subtract-compat.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -pedantic
+// RUN: %clang_cc1 %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 25be553978..3e6234c57f 100644
--- a/test/Sema/pragma-pack-2.c
+++ b/test/Sema/pragma-pack-2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i686-apple-darwin9 %s -fsyntax-only -verify
+// RUN: %clang_cc1 -triple i686-apple-darwin9 %s -fsyntax-only -verify
 
 #include <stddef.h>
 
diff --git a/test/Sema/pragma-pack-3.c b/test/Sema/pragma-pack-3.c
index a2d665ea74..d97359e45b 100644
--- a/test/Sema/pragma-pack-3.c
+++ b/test/Sema/pragma-pack-3.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i686-apple-darwin9 %s -fsyntax-only -verify
+// RUN: %clang_cc1 -triple i686-apple-darwin9 %s -fsyntax-only -verify
 
 // Stack: [], Alignment: 8
 
diff --git a/test/Sema/pragma-pack-4.c b/test/Sema/pragma-pack-4.c
index 3ccaf7e96c..b06fc0eaf1 100644
--- a/test/Sema/pragma-pack-4.c
+++ b/test/Sema/pragma-pack-4.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -triple i686-apple-darwin9 %s -fsyntax-only -verify
-// RUN: clang-cc -triple x86_64-apple-darwin9 %s -fsyntax-only -verify
+// RUN: %clang_cc1 -triple i686-apple-darwin9 %s -fsyntax-only -verify
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 %s -fsyntax-only -verify
 
 // rdar://problem/7095436
 #pragma pack(4)
diff --git a/test/Sema/pragma-pack.c b/test/Sema/pragma-pack.c
index 51398fa0a5..e93ce42148 100644
--- a/test/Sema/pragma-pack.c
+++ b/test/Sema/pragma-pack.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i686-apple-darwin9 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 8b94989626..8a051a3ec9 100644
--- a/test/Sema/pragma-unused.c
+++ b/test/Sema/pragma-unused.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 void f1(void) {
   int x, y, z;
diff --git a/test/Sema/predef.c b/test/Sema/predef.c
index 7b3fe5038f..9c1994699d 100644
--- a/test/Sema/predef.c
+++ b/test/Sema/predef.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 c8d17f0078..665d0fa1a8 100644
--- a/test/Sema/predefined-function.c
+++ b/test/Sema/predefined-function.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s
 
 char *funk(int format);
 enum Test {A=-1};
diff --git a/test/Sema/private-extern.c b/test/Sema/private-extern.c
index 5dd37f430e..d3c1265109 100644
--- a/test/Sema/private-extern.c
+++ b/test/Sema/private-extern.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -verify -fsyntax-only %s
+// RUN: %clang_cc1 -verify -fsyntax-only %s
 
 static int g0; // expected-note{{previous definition}}
 int g0; // expected-error{{non-static declaration of 'g0' follows static declaration}}
diff --git a/test/Sema/promote-int-16bit.c b/test/Sema/promote-int-16bit.c
index fbd1215d90..6446720a81 100644
--- a/test/Sema/promote-int-16bit.c
+++ b/test/Sema/promote-int-16bit.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s -triple pic16-unknown-unknown
+// RUN: %clang_cc1 -fsyntax-only -verify %s -triple pic16-unknown-unknown
 
 // Check that unsigned short promotes to unsigned int on targets where
 // sizeof(unsigned short) == sizeof(unsigned int)
diff --git a/test/Sema/rdar6248119.m b/test/Sema/rdar6248119.m
index d4ee305c29..6b120b2847 100644
--- a/test/Sema/rdar6248119.m
+++ b/test/Sema/rdar6248119.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -fsyntax-only %s -verify
+// RUN: %clang_cc1 -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 636f770e3e..9991982a20 100644
--- a/test/Sema/rdr6094103-unordered-compare-promote.c
+++ b/test/Sema/rdr6094103-unordered-compare-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -ast-dump %s 2>&1 | grep ImplicitCastExpr | count 2
+// RUN: %clang_cc1 -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 e7b9f3c8ea..0d665f9a60 100644
--- a/test/Sema/recover-goto.c
+++ b/test/Sema/recover-goto.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify
+// RUN: %clang_cc1 -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 9339bb935f..1092b33ca3 100644
--- a/test/Sema/redefinition.c
+++ b/test/Sema/redefinition.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -verify
 int f(int a) { return 0; } // expected-note {{previous definition is here}}
 int f(int);
 int f(int a) { return 0; } // expected-error {{redefinition of 'f'}}
diff --git a/test/Sema/return-noreturn.c b/test/Sema/return-noreturn.c
index 8868c9ee0a..198ab11c67 100644
--- a/test/Sema/return-noreturn.c
+++ b/test/Sema/return-noreturn.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -fblocks -Wmissing-noreturn
+// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks -Wmissing-noreturn
 
 int j;
 void test1() { // expected-warning {{function could be attribute 'noreturn'}}
diff --git a/test/Sema/return-silent.c b/test/Sema/return-silent.c
index b3b2a56218..eb9641b7f3 100644
--- a/test/Sema/return-silent.c
+++ b/test/Sema/return-silent.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -Wno-return-type -fsyntax-only -verify
+// RUN: %clang_cc1 %s -Wno-return-type -fsyntax-only -verify
 
 int t14() {
   return;
diff --git a/test/Sema/scope-check.c b/test/Sema/scope-check.c
index 76041c4916..4d3f6cbcf2 100644
--- a/test/Sema/scope-check.c
+++ b/test/Sema/scope-check.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -fblocks -std=gnu99 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -fblocks -std=gnu99 %s
 
 int test1(int x) {
   goto L;    // expected-error{{illegal goto into protected scope}}
diff --git a/test/Sema/self-comparison.c b/test/Sema/self-comparison.c
index db56e8bf17..b2b06c209a 100644
--- a/test/Sema/self-comparison.c
+++ b/test/Sema/self-comparison.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 c40f8df29c..4c09273967 100644
--- a/test/Sema/sentinel-attribute.c
+++ b/test/Sema/sentinel-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 int x __attribute__((sentinel)); //expected-warning{{'sentinel' attribute only applies to function, method or block types}}
 
 void f1(int a, ...) __attribute__ ((sentinel));
diff --git a/test/Sema/statements.c b/test/Sema/statements.c
index 8eac052a25..3cd2460e79 100644
--- a/test/Sema/statements.c
+++ b/test/Sema/statements.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -verify
 
 typedef unsigned __uint32_t;
 
diff --git a/test/Sema/static-init.c b/test/Sema/static-init.c
index 510f3ab099..8011943755 100644
--- a/test/Sema/static-init.c
+++ b/test/Sema/static-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-pc-linux-gnu -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -fsyntax-only -verify %s
 
 #include <stdint.h>
 
diff --git a/test/Sema/stdcall-fastcall.c b/test/Sema/stdcall-fastcall.c
index e0db63822f..c45f93e07c 100644
--- a/test/Sema/stdcall-fastcall.c
+++ b/test/Sema/stdcall-fastcall.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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/struct-cast.c b/test/Sema/struct-cast.c
index 063e8e32c0..dc7db130dc 100644
--- a/test/Sema/struct-cast.c
+++ b/test/Sema/struct-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify
+// RUN: %clang_cc1 -fsyntax-only %s -verify
 
 struct S {
  int one;
diff --git a/test/Sema/struct-compat.c b/test/Sema/struct-compat.c
index 35d8fb1aa0..2e112e17da 100644
--- a/test/Sema/struct-compat.c
+++ b/test/Sema/struct-compat.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc %s -fsyntax-only -pedantic -verify
+/* RUN: %clang_cc1 %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 a5a299bf09..f8880530f9 100644
--- a/test/Sema/struct-decl.c
+++ b/test/Sema/struct-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 8250c14d44..60a9febafb 100644
--- a/test/Sema/struct-packed-align.c
+++ b/test/Sema/struct-packed-align.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -verify
 
 // Packed structs.
 struct s {
diff --git a/test/Sema/switch.c b/test/Sema/switch.c
index 3ee371202f..f815ba4627 100644
--- a/test/Sema/switch.c
+++ b/test/Sema/switch.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 void f (int z) { 
   while (z) { 
     default: z--;            // expected-error {{statement not in switch}}
diff --git a/test/Sema/tentative-decls.c b/test/Sema/tentative-decls.c
index c94af1160b..b15537bfa0 100644
--- a/test/Sema/tentative-decls.c
+++ b/test/Sema/tentative-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %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 19847c6d1e..6dcaaa87a9 100644
--- a/test/Sema/text-diag.c
+++ b/test/Sema/text-diag.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s
+// RUN: %clang_cc1 -fsyntax-only %s
 unsigned char *foo = "texto\
 que continua\
 e continua";
diff --git a/test/Sema/thread-specifier.c b/test/Sema/thread-specifier.c
index 8d66e539c8..ed27c7063d 100644
--- a/test/Sema/thread-specifier.c
+++ b/test/Sema/thread-specifier.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i686-pc-linux-gnu -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple i686-pc-linux-gnu -fsyntax-only -verify %s
 
 __thread int t1;
 __thread extern int t2;
diff --git a/test/Sema/transparent-union-pointer.c b/test/Sema/transparent-union-pointer.c
index a58bd42f82..31c93914b8 100644
--- a/test/Sema/transparent-union-pointer.c
+++ b/test/Sema/transparent-union-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %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 003efb1462..ce65095873 100644
--- a/test/Sema/type-spec-struct-union.c
+++ b/test/Sema/type-spec-struct-union.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -pedantic -verify %s
+// RUN: %clang_cc1 -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 f5bdcbb70e..712dad279d 100644
--- a/test/Sema/typecheck-binop.c
+++ b/test/Sema/typecheck-binop.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc %s -fsyntax-only -pedantic -verify
+/* RUN: %clang_cc1 %s -fsyntax-only -pedantic -verify
  */
 struct incomplete; // expected-note{{forward declaration of 'struct incomplete'}}
 
diff --git a/test/Sema/typedef-prototype.c b/test/Sema/typedef-prototype.c
index fc0e05ead2..8372154ce0 100644
--- a/test/Sema/typedef-prototype.c
+++ b/test/Sema/typedef-prototype.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 9a1c488732..025f65cb35 100644
--- a/test/Sema/typedef-redef.c
+++ b/test/Sema/typedef-redef.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 typedef const int x; // expected-note {{previous definition is here}}
 extern x a;
diff --git a/test/Sema/typedef-retain.c b/test/Sema/typedef-retain.c
index ef9ec76f46..0ef15fdec6 100644
--- a/test/Sema/typedef-retain.c
+++ b/test/Sema/typedef-retain.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s -fno-lax-vector-conversions
+// RUN: %clang_cc1 -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 7a9bb4879b..f29896850b 100644
--- a/test/Sema/typedef-variable-type.c
+++ b/test/Sema/typedef-variable-type.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc %s -verify -fsyntax-only -pedantic
+// RUN: %clang_cc1 %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 e7d4b00a4d..1770bf5bd0 100644
--- a/test/Sema/types.c
+++ b/test/Sema/types.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -pedantic -verify -triple=x86_64-apple-darwin9
+// RUN: %clang_cc1 %s -pedantic -verify -triple=x86_64-apple-darwin9
 
 // rdar://6097662
 typedef int (*T)[2];
diff --git a/test/Sema/ucn-cstring.c b/test/Sema/ucn-cstring.c
index fb9a3b604e..f5bf457ed1 100644
--- a/test/Sema/ucn-cstring.c
+++ b/test/Sema/ucn-cstring.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only -pedantic
+// RUN: %clang_cc1 %s -verify -fsyntax-only -pedantic
 
 int printf(const char *, ...);
 
diff --git a/test/Sema/unnamed-bitfield-init.c b/test/Sema/unnamed-bitfield-init.c
index 249f06e07d..f3cc49c34b 100644
--- a/test/Sema/unnamed-bitfield-init.c
+++ b/test/Sema/unnamed-bitfield-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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 522fda42a1..70f3446e53 100644
--- a/test/Sema/unused-expr.c
+++ b/test/Sema/unused-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -fno-math-errno %s
+// RUN: %clang_cc1 -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 40c0bde4e0..5a9ab344ce 100644
--- a/test/Sema/usual-float.c
+++ b/test/Sema/usual-float.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only
+// RUN: %clang_cc1 %s -fsyntax-only
 
 typedef float CGFloat;
 
diff --git a/test/Sema/va_arg_x86_32.c b/test/Sema/va_arg_x86_32.c
index 850d324dbf..e49f0a42cc 100644
--- a/test/Sema/va_arg_x86_32.c
+++ b/test/Sema/va_arg_x86_32.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -triple=i686-pc-linux-gnu %s
+// RUN: %clang_cc1 -fsyntax-only -verify -triple=i686-pc-linux-gnu %s
 
 int a() {
   __builtin_va_arg((char*)0, int); // expected-error {{expression is not assignable}}
diff --git a/test/Sema/va_arg_x86_64.c b/test/Sema/va_arg_x86_64.c
index 61ac97b7d4..9f514c1f59 100644
--- a/test/Sema/va_arg_x86_64.c
+++ b/test/Sema/va_arg_x86_64.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -triple=x86_64-unknown-freebsd7.0 %s
+// RUN: %clang_cc1 -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 129fd17cd5..d4d900d302 100644
--- a/test/Sema/var-redecl.c
+++ b/test/Sema/var-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s
+// RUN: %clang_cc1 -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-x86-64.c b/test/Sema/varargs-x86-64.c
index 7c71c96738..2cfedc1b37 100644
--- a/test/Sema/varargs-x86-64.c
+++ b/test/Sema/varargs-x86-64.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify %s -triple x86_64-apple-darwin9
+// RUN: %clang_cc1 -fsyntax-only -verify %s -triple x86_64-apple-darwin9
 
 // rdar://6726818
 void f1() {
diff --git a/test/Sema/varargs.c b/test/Sema/varargs.c
index e928997dd8..e399f89ae0 100644
--- a/test/Sema/varargs.c
+++ b/test/Sema/varargs.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -fsyntax-only -verify %s
-// RUN: clang-cc -fsyntax-only -verify %s -triple x86_64-apple-darwin9
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s -triple x86_64-apple-darwin9
 
 void f1(int a)
 {
diff --git a/test/Sema/variadic-block.c b/test/Sema/variadic-block.c
index 29f597b006..ba4bb71c97 100644
--- a/test/Sema/variadic-block.c
+++ b/test/Sema/variadic-block.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only -fblocks
+// RUN: %clang_cc1 %s -verify -fsyntax-only -fblocks
 
 #include <stdarg.h>
 
diff --git a/test/Sema/vector-assign.c b/test/Sema/vector-assign.c
index bf9c7f37ca..d074a958fa 100644
--- a/test/Sema/vector-assign.c
+++ b/test/Sema/vector-assign.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only -Wvector-conversions
+// RUN: %clang_cc1 %s -verify -fsyntax-only -Wvector-conversions
 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 8c607aad07..aab0ab4775 100644
--- a/test/Sema/vector-cast.c
+++ b/test/Sema/vector-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only %s -verify -Wvector-conversions
+// RUN: %clang_cc1 -fsyntax-only %s -verify -Wvector-conversions
 
 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 1eec6c57a6..8f81adc05b 100644
--- a/test/Sema/vector-init.c
+++ b/test/Sema/vector-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -verify
 
 //typedef __attribute__(( ext_vector_type(4) ))  float float4;
 typedef float float4 __attribute__((vector_size(16)));
diff --git a/test/Sema/vfprintf-invalid-redecl.c b/test/Sema/vfprintf-invalid-redecl.c
index 02c5061d8c..cbf47a69a9 100644
--- a/test/Sema/vfprintf-invalid-redecl.c
+++ b/test/Sema/vfprintf-invalid-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -verify
 // PR4290
 
 // The following declaration is not compatible with vfprintf(), but make
diff --git a/test/Sema/vfprintf-valid-redecl.c b/test/Sema/vfprintf-valid-redecl.c
index cc8e2c40d3..14fbbc47dd 100644
--- a/test/Sema/vfprintf-valid-redecl.c
+++ b/test/Sema/vfprintf-valid-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -pedantic -verify
+// RUN: %clang_cc1 %s -fsyntax-only -pedantic -verify
 // PR4290
 
 // The following declaration is compatible with vfprintf, so we shouldn't
diff --git a/test/Sema/vla.c b/test/Sema/vla.c
index 70ba08b7eb..7ddd432fbc 100644
--- a/test/Sema/vla.c
+++ b/test/Sema/vla.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only -pedantic
+// RUN: %clang_cc1 %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 6799146a5f..337972fd14 100644
--- a/test/Sema/void_arg.c
+++ b/test/Sema/void_arg.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc -fsyntax-only %s -verify
+/* RUN: %clang_cc1 -fsyntax-only %s -verify
  */
 
 typedef void Void;
diff --git a/test/Sema/warn-char-subscripts.c b/test/Sema/warn-char-subscripts.c
index c6fd78cc1f..374a609e81 100644
--- a/test/Sema/warn-char-subscripts.c
+++ b/test/Sema/warn-char-subscripts.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -Wchar-subscripts -fsyntax-only -verify %s
+// RUN: %clang_cc1 -Wchar-subscripts -fsyntax-only -verify %s
 
 void t1() {
   int array[1] = { 0 };
diff --git a/test/Sema/warn-freestanding-complex.c b/test/Sema/warn-freestanding-complex.c
index a4d3f5be31..14e063f83c 100644
--- a/test/Sema/warn-freestanding-complex.c
+++ b/test/Sema/warn-freestanding-complex.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -ffreestanding -pedantic -verify %s
+// RUN: %clang_cc1 -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/warn-unused-variables.c b/test/Sema/warn-unused-variables.c
index fd225436be..36615061fe 100644
--- a/test/Sema/warn-unused-variables.c
+++ b/test/Sema/warn-unused-variables.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -Wunused-variable -verify %s
+// RUN: %clang_cc1 -fsyntax-only -Wunused-variable -verify %s
 
 struct s0 {
 	unsigned int	i;