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
diff --git a/test/PCH/asm.c b/test/PCH/asm.c
index 61665d6..99bc14d 100644
--- a/test/PCH/asm.c
+++ b/test/PCH/asm.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -triple i386-unknown-unknown -include %S/asm.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -include %S/asm.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -triple i386-unknown-unknown -emit-pch -o %t %S/asm.h
-// RUN: clang-cc -triple i386-unknown-unknown -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-pch -o %t %S/asm.h
+// RUN: %clang_cc1 -triple i386-unknown-unknown -include-pch %t -fsyntax-only -verify %s 
 
 
 void call_f(void) { f(); }
diff --git a/test/PCH/attrs.c b/test/PCH/attrs.c
index f381f23..c971193 100644
--- a/test/PCH/attrs.c
+++ b/test/PCH/attrs.c
@@ -1,8 +1,8 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/attrs.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/attrs.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/attrs.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/attrs.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 // expected-note{{previous overload}}
 double f(double); // expected-error{{overloadable}}
diff --git a/test/PCH/blocks.c b/test/PCH/blocks.c
index ccecd36..e749886 100644
--- a/test/PCH/blocks.c
+++ b/test/PCH/blocks.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -fblocks -include %S/blocks.h -fsyntax-only -emit-llvm -o - %s
+// RUN: %clang_cc1 -fblocks -include %S/blocks.h -fsyntax-only -emit-llvm -o - %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -fblocks -o %t %S/blocks.h
-// RUN: clang-cc -fblocks -include-pch %t -fsyntax-only -emit-llvm -o - %s 
+// RUN: %clang_cc1 -emit-pch -fblocks -o %t %S/blocks.h
+// RUN: %clang_cc1 -fblocks -include-pch %t -fsyntax-only -emit-llvm -o - %s 
 
 int do_add(int x, int y) { return add(x, y); }
 
diff --git a/test/PCH/builtins.c b/test/PCH/builtins.c
index 796b9dc..eed2224 100644
--- a/test/PCH/builtins.c
+++ b/test/PCH/builtins.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/builtins.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/builtins.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/builtins.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/builtins.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 void hello() {
   printf("Hello, World!");
diff --git a/test/PCH/cxx-method.cpp b/test/PCH/cxx-method.cpp
index 144406e..37dabcc 100644
--- a/test/PCH/cxx-method.cpp
+++ b/test/PCH/cxx-method.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-pch %s -o %t
+// RUN: %clang_cc1 -emit-pch %s -o %t
 
 struct S {
   void m(int x);
diff --git a/test/PCH/enum.c b/test/PCH/enum.c
index 607de59..10ceb7c 100644
--- a/test/PCH/enum.c
+++ b/test/PCH/enum.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/enum.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/enum.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/enum.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/enum.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 int i = Red;
 
diff --git a/test/PCH/exprs.c b/test/PCH/exprs.c
index 6cd1ee7..2b588a2 100644
--- a/test/PCH/exprs.c
+++ b/test/PCH/exprs.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -fblocks -include %S/exprs.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fblocks -include %S/exprs.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -fblocks -o %t %S/exprs.h
-// RUN: clang-cc -fblocks -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -fblocks -o %t %S/exprs.h
+// RUN: %clang_cc1 -fblocks -include-pch %t -fsyntax-only -verify %s 
 
 int integer;
 long long_integer;
diff --git a/test/PCH/ext_vector.c b/test/PCH/ext_vector.c
index 314dbfc..bd129ea 100644
--- a/test/PCH/ext_vector.c
+++ b/test/PCH/ext_vector.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/ext_vector.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/ext_vector.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/ext_vector.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/ext_vector.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 int test(float4 f4) {
   return f4.xy; // expected-error{{float2}}
diff --git a/test/PCH/external-defs.c b/test/PCH/external-defs.c
index 447124c..5097859 100644
--- a/test/PCH/external-defs.c
+++ b/test/PCH/external-defs.c
@@ -1,6 +1,6 @@
 // Test with pch.
-// RUN: clang-cc -triple x86_64-apple-darwin9 -emit-pch -o %t.pch %S/external-defs.h
-// RUN: clang-cc -triple x86_64-apple-darwin9 -include-pch %t.pch -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-pch -o %t.pch %S/external-defs.h
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -include-pch %t.pch -emit-llvm -o %t %s
 
 // RUN: grep "@x = common global i32 0" %t | count 1
 // RUN: grep "@z" %t | count 0
diff --git a/test/PCH/functions.c b/test/PCH/functions.c
index 2121b9a..fd0c376 100644
--- a/test/PCH/functions.c
+++ b/test/PCH/functions.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/functions.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/functions.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/functions.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/functions.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 int f0(int x0, int y0, ...) { return x0 + y0; }
 
diff --git a/test/PCH/fuzzy-pch.c b/test/PCH/fuzzy-pch.c
index b29638b..5675753 100644
--- a/test/PCH/fuzzy-pch.c
+++ b/test/PCH/fuzzy-pch.c
@@ -1,8 +1,8 @@
 // Test with pch.
-// RUN: clang-cc -emit-pch -DFOO -o %t %S/variables.h
-// RUN: clang-cc -DBAR=int -include-pch %t -fsyntax-only -pedantic %s
-// RUN: clang-cc -DFOO -DBAR=int -include-pch %t -Werror %s
-// RUN: not clang-cc -DFOO -DBAR=int -DX=5 -include-pch %t -Werror %s 
+// RUN: %clang_cc1 -emit-pch -DFOO -o %t %S/variables.h
+// RUN: %clang_cc1 -DBAR=int -include-pch %t -fsyntax-only -pedantic %s
+// RUN: %clang_cc1 -DFOO -DBAR=int -include-pch %t -Werror %s
+// RUN: not %clang_cc1 -DFOO -DBAR=int -DX=5 -include-pch %t -Werror %s 
 
 BAR bar = 17;
 
diff --git a/test/PCH/line-directive.c b/test/PCH/line-directive.c
index 9eed4f4..4710c40 100644
--- a/test/PCH/line-directive.c
+++ b/test/PCH/line-directive.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/line-directive.h -fsyntax-only %s 2>&1|grep "25:5"
+// RUN: %clang_cc1 -include %S/line-directive.h -fsyntax-only %s 2>&1|grep "25:5"
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/line-directive.h
-// RUN: clang-cc -include-pch %t -fsyntax-only %s 2>&1|grep "25:5"  
+// RUN: %clang_cc1 -emit-pch -o %t %S/line-directive.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only %s 2>&1|grep "25:5"  
 
 double x; // expected-error{{redefinition of 'x' with a different type}}
 
diff --git a/test/PCH/method_pool.m b/test/PCH/method_pool.m
index 17e2420..ee53784 100644
--- a/test/PCH/method_pool.m
+++ b/test/PCH/method_pool.m
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang -cc1 -include %S/method_pool.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/method_pool.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang -cc1 -x objective-c -emit-pch -o %t %S/method_pool.h
-// RUN: clang -cc1 -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -x objective-c -emit-pch -o %t %S/method_pool.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 int message_id(id x) {
    return [x instMethod:17]; // expected-warning{{multiple methods}}
diff --git a/test/PCH/multiple_decls.c b/test/PCH/multiple_decls.c
index 2702cd6..e2cc552 100644
--- a/test/PCH/multiple_decls.c
+++ b/test/PCH/multiple_decls.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/multiple_decls.h -fsyntax-only -ast-print -o - %s
+// RUN: %clang_cc1 -include %S/multiple_decls.h -fsyntax-only -ast-print -o - %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/multiple_decls.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -ast-print -o - %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/multiple_decls.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -ast-print -o - %s 
 
 void f0(char c) {
   wide(c);
diff --git a/test/PCH/nonvisible-external-defs.c b/test/PCH/nonvisible-external-defs.c
index a786749..49392ca 100644
--- a/test/PCH/nonvisible-external-defs.c
+++ b/test/PCH/nonvisible-external-defs.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/nonvisible-external-defs.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/nonvisible-external-defs.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/nonvisible-external-defs.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/nonvisible-external-defs.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 int g(int, float); // expected-error{{conflicting types}}
 
diff --git a/test/PCH/objc_exprs.m b/test/PCH/objc_exprs.m
index 0c12b8e..c37968b 100644
--- a/test/PCH/objc_exprs.m
+++ b/test/PCH/objc_exprs.m
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang -cc1 -fblocks -include %S/objc_exprs.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fblocks -include %S/objc_exprs.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang -cc1 -x objective-c-header -emit-pch -fblocks -o %t %S/objc_exprs.h
-// RUN: clang -cc1 -fblocks -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -x objective-c-header -emit-pch -fblocks -o %t %S/objc_exprs.h
+// RUN: %clang_cc1 -fblocks -include-pch %t -fsyntax-only -verify %s 
 
 // Expressions
 int *A1 = (objc_string)0;   // expected-warning {{aka 'id'}}
diff --git a/test/PCH/objc_import.m b/test/PCH/objc_import.m
index c109f40..277c6dd 100644
--- a/test/PCH/objc_import.m
+++ b/test/PCH/objc_import.m
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang -cc1 -include %S/objc_import.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/objc_import.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang -cc1 -x objective-c -emit-pch -o %t %S/objc_import.h
-// RUN: clang -cc1 -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -x objective-c -emit-pch -o %t %S/objc_import.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 #import "objc_import.h"
 
diff --git a/test/PCH/objc_methods.m b/test/PCH/objc_methods.m
index a60ffad..e90a463 100644
--- a/test/PCH/objc_methods.m
+++ b/test/PCH/objc_methods.m
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang -cc1 -include %S/objc_methods.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/objc_methods.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang -cc1 -x objective-c -emit-pch -o %t %S/objc_methods.h
-// RUN: clang -cc1 -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -x objective-c -emit-pch -o %t %S/objc_methods.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 void func() {
  TestPCH *xx;
diff --git a/test/PCH/objc_property.m b/test/PCH/objc_property.m
index 17c3a72..b51cd90 100644
--- a/test/PCH/objc_property.m
+++ b/test/PCH/objc_property.m
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang -cc1 -include %S/objc_property.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/objc_property.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang -cc1 -x objective-c -emit-pch -o %t %S/objc_property.h
-// RUN: clang -cc1 -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -x objective-c -emit-pch -o %t %S/objc_property.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 void func() {
  TestProperties *xx = [TestProperties alloc];
diff --git a/test/PCH/preprocess.c b/test/PCH/preprocess.c
index 7a6c2c5..8bf841f 100644
--- a/test/PCH/preprocess.c
+++ b/test/PCH/preprocess.c
@@ -1,8 +1,8 @@
 // Check that -E mode is invariant when using an implicit PCH.
 
-// RUN: clang-cc -include %S/preprocess.h -E -o %t.orig %s
-// RUN: clang-cc -emit-pch -o %t %S/preprocess.h
-// RUN: clang-cc -include-pch %t -E -o %t.from_pch %s
+// RUN: %clang_cc1 -include %S/preprocess.h -E -o %t.orig %s
+// RUN: %clang_cc1 -emit-pch -o %t %S/preprocess.h
+// RUN: %clang_cc1 -include-pch %t -E -o %t.from_pch %s
 // RUN: diff %t.orig %t.from_pch
 
 a_typedef a_value;
diff --git a/test/PCH/reloc.c b/test/PCH/reloc.c
index ba8e70d..fd78feb 100644
--- a/test/PCH/reloc.c
+++ b/test/PCH/reloc.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -emit-pch -o %t -relocatable-pch -isysroot %S/libroot %S/libroot/usr/include/reloc.h
-// RUN: clang-cc -include-pch %t -isysroot %S/libroot %s -verify
-// RUN: not clang-cc -include-pch %t %s
+// RUN: %clang_cc1 -emit-pch -o %t -relocatable-pch -isysroot %S/libroot %S/libroot/usr/include/reloc.h
+// RUN: %clang_cc1 -include-pch %t -isysroot %S/libroot %s -verify
+// RUN: not %clang_cc1 -include-pch %t %s
 
 #include <reloc.h>
 
diff --git a/test/PCH/source-manager-stack.c b/test/PCH/source-manager-stack.c
index 72084d9..cc85556 100644
--- a/test/PCH/source-manager-stack.c
+++ b/test/PCH/source-manager-stack.c
@@ -2,9 +2,9 @@
 // when using PCH.
 
 // RUN: echo 'int x;' > %t.prefix.h
-// RUN: not clang-cc -fsyntax-only -include %t.prefix.h %s 2> %t.diags.no_pch.txt
-// RUN: clang-cc -emit-pch -o %t.prefix.pch %t.prefix.h
-// RUN: not clang-cc -fsyntax-only -include-pch %t.prefix.pch %s 2> %t.diags.pch.txt
+// RUN: not %clang_cc1 -fsyntax-only -include %t.prefix.h %s 2> %t.diags.no_pch.txt
+// RUN: %clang_cc1 -emit-pch -o %t.prefix.pch %t.prefix.h
+// RUN: not %clang_cc1 -fsyntax-only -include-pch %t.prefix.pch %s 2> %t.diags.pch.txt
 // RUN: diff %t.diags.no_pch.txt %t.diags.pch.txt
 // XFAIL: *
 // PR5662
diff --git a/test/PCH/stmts.c b/test/PCH/stmts.c
index 69c7ec7..6def453 100644
--- a/test/PCH/stmts.c
+++ b/test/PCH/stmts.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/stmts.h -fsyntax-only -emit-llvm -o - %s
+// RUN: %clang_cc1 -include %S/stmts.h -fsyntax-only -emit-llvm -o - %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/stmts.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -emit-llvm -o - %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/stmts.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -emit-llvm -o - %s 
 
 void g0(void) { f0(5); }
 int g1(int x) { return f1(x); }
diff --git a/test/PCH/struct.c b/test/PCH/struct.c
index 6595a2f..3e9d188 100644
--- a/test/PCH/struct.c
+++ b/test/PCH/struct.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/struct.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/struct.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/struct.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/struct.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 struct Point *p1;
 
diff --git a/test/PCH/tentative-defs.c b/test/PCH/tentative-defs.c
index 5b85fcc..0072818 100644
--- a/test/PCH/tentative-defs.c
+++ b/test/PCH/tentative-defs.c
@@ -1,6 +1,6 @@
 // Test with pch.
-// RUN: clang-cc -triple x86_64-apple-darwin9 -emit-pch -o %t.pch %S/tentative-defs.h
-// RUN: clang-cc -triple x86_64-apple-darwin9 -include-pch %t.pch -verify -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-pch -o %t.pch %S/tentative-defs.h
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -include-pch %t.pch -verify -emit-llvm -o %t %s
 
 // RUN: grep "@variable = common global i32 0" %t | count 1
 // RUN: grep "@incomplete_array = common global .*1 x i32" %t | count 1
diff --git a/test/PCH/types.c b/test/PCH/types.c
index a7efaef..1ebc01b 100644
--- a/test/PCH/types.c
+++ b/test/PCH/types.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -fblocks -include %S/types.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fblocks -include %S/types.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -fblocks -o %t %S/types.h
-// RUN: clang-cc -fblocks -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -fblocks -o %t %S/types.h
+// RUN: %clang_cc1 -fblocks -include-pch %t -fsyntax-only -verify %s 
 
 typedef int INT;
 INT int_value;
diff --git a/test/PCH/va_arg.c b/test/PCH/va_arg.c
index 6f7ccf4..1fb2a83 100644
--- a/test/PCH/va_arg.c
+++ b/test/PCH/va_arg.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -triple=x86_64-unknown-freebsd7.0 -include %S/va_arg.h %s -emit-llvm -o -
+// RUN: %clang_cc1 -triple=x86_64-unknown-freebsd7.0 -include %S/va_arg.h %s -emit-llvm -o -
 
 // Test with pch.
-// RUN: clang-cc -triple=x86_64-unknown-freebsd7.0 -emit-pch -o %t %S/va_arg.h
-// RUN: clang-cc -triple=x86_64-unknown-freebsd7.0 -include-pch %t %s -emit-llvm -o -
+// RUN: %clang_cc1 -triple=x86_64-unknown-freebsd7.0 -emit-pch -o %t %S/va_arg.h
+// RUN: %clang_cc1 -triple=x86_64-unknown-freebsd7.0 -include-pch %t %s -emit-llvm -o -
 
 char *g0(char** argv, int argc) { return argv[argc]; }
 
diff --git a/test/PCH/variables.c b/test/PCH/variables.c
index f79b684..58fd8ae 100644
--- a/test/PCH/variables.c
+++ b/test/PCH/variables.c
@@ -1,9 +1,9 @@
 // Test this without pch.
-// RUN: clang-cc -include %S/variables.h -fsyntax-only -verify %s
+// RUN: %clang_cc1 -include %S/variables.h -fsyntax-only -verify %s
 
 // Test with pch.
-// RUN: clang-cc -emit-pch -o %t %S/variables.h
-// RUN: clang-cc -include-pch %t -fsyntax-only -verify %s 
+// RUN: %clang_cc1 -emit-pch -o %t %S/variables.h
+// RUN: %clang_cc1 -include-pch %t -fsyntax-only -verify %s 
 
 int *ip2 = &x;
 float *fp = &ip; // expected-warning{{incompatible pointer types}}
diff --git a/test/PCH/variables.h b/test/PCH/variables.h
index 70aec65..c937429 100644
--- a/test/PCH/variables.h
+++ b/test/PCH/variables.h
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-pch -o variables.h.pch variables.h
+// RUN: %clang_cc1 -emit-pch -o variables.h.pch variables.h
 // Do not mess with the whitespace in this file. It's important.