summaryrefslogtreecommitdiffstats
path: root/test/CodeGen
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-12-15 20:14:24 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-12-15 20:14:24 +0000
commita5728872c7702ddd09537c95bc3cbd20e1f2fb09 (patch)
tree453d143534b966d459123d279a7f3db4de50b1d5 /test/CodeGen
parent337cba4b3e17b98cfa512dfd12e57f4ccb0859be (diff)
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
Diffstat (limited to 'test/CodeGen')
-rw-r--r--test/CodeGen/2007-11-29-ArraySizeFromInitializer.c2
-rw-r--r--test/CodeGen/2008-02-07-bitfield-bug.c2
-rw-r--r--test/CodeGen/2008-02-08-bitfield-bug.c2
-rw-r--r--test/CodeGen/2008-02-26-inline-asm-bug.c2
-rw-r--r--test/CodeGen/2008-07-17-no-emit-on-error.c4
-rw-r--r--test/CodeGen/2008-07-21-mixed-var-fn-decl.c2
-rw-r--r--test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c2
-rw-r--r--test/CodeGen/2008-07-22-packed-bitfield-access.c2
-rw-r--r--test/CodeGen/2008-07-29-override-alias-decl.c2
-rw-r--r--test/CodeGen/2008-07-30-implicit-initialization.c2
-rw-r--r--test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c2
-rw-r--r--test/CodeGen/2008-07-31-asm-labels.c4
-rw-r--r--test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c2
-rw-r--r--test/CodeGen/2008-08-04-void-pointer-arithmetic.c2
-rw-r--r--test/CodeGen/2008-08-19-cast-of-typedef.c2
-rw-r--r--test/CodeGen/2008-08-25-incompatible-cond-expr.m2
-rw-r--r--test/CodeGen/2008-09-22-bad-switch-type.c2
-rw-r--r--test/CodeGen/2008-12-02-logical-or-fold.c2
-rw-r--r--test/CodeGen/2009-01-21-invalid-debug-info.m2
-rw-r--r--test/CodeGen/2009-03-22-increment-bitfield.c2
-rw-r--r--test/CodeGen/2009-04-23-dbg.c2
-rw-r--r--test/CodeGen/2009-05-22-callingconv.c2
-rw-r--r--test/CodeGen/2009-05-28-const-typedef.c2
-rw-r--r--test/CodeGen/2009-06-01-addrofknr.c2
-rw-r--r--test/CodeGen/2009-06-14-anonymous-union-init.c2
-rw-r--r--test/CodeGen/2009-07-31-DbgDeclare.c2
-rw-r--r--test/CodeGen/2009-08-14-vararray-crash.c2
-rw-r--r--test/CodeGen/OpaqueStruct.c2
-rw-r--r--test/CodeGen/PR2001-bitfield-reload.c2
-rw-r--r--test/CodeGen/PR2413-void-address-cast-error.c2
-rw-r--r--test/CodeGen/PR2643-null-store-to-bitfield.c2
-rw-r--r--test/CodeGen/PR2743-reference-missing-static.c2
-rw-r--r--test/CodeGen/PR3130-cond-constant.c2
-rw-r--r--test/CodeGen/PR3589-freestanding-libcalls.c6
-rw-r--r--test/CodeGen/PR3613-static-decl.c2
-rw-r--r--test/CodeGen/PR3709-int-to-pointer-sign.c2
-rw-r--r--test/CodeGen/PR4611-bitfield-layout.c2
-rw-r--r--test/CodeGen/PR5060-align.c2
-rw-r--r--test/CodeGen/address-space-cast.c2
-rw-r--r--test/CodeGen/address-space-compound-literal.c2
-rw-r--r--test/CodeGen/address-space-field1.c2
-rw-r--r--test/CodeGen/address-space-field2.c2
-rw-r--r--test/CodeGen/address-space-field3.c2
-rw-r--r--test/CodeGen/address-space-field4.c2
-rw-r--r--test/CodeGen/address-space.c10
-rw-r--r--test/CodeGen/alias.c2
-rw-r--r--test/CodeGen/align-local.c2
-rw-r--r--test/CodeGen/alignof.c2
-rw-r--r--test/CodeGen/arm-arguments.c4
-rw-r--r--test/CodeGen/arm_asm_clobber.c2
-rw-r--r--test/CodeGen/array.c2
-rw-r--r--test/CodeGen/asm-2.c2
-rw-r--r--test/CodeGen/asm-inout.c2
-rw-r--r--test/CodeGen/asm.c2
-rw-r--r--test/CodeGen/atomic.c2
-rw-r--r--test/CodeGen/attr-cleanup.c2
-rw-r--r--test/CodeGen/attr-nodebug.c2
-rw-r--r--test/CodeGen/attr-noinline.c2
-rw-r--r--test/CodeGen/attr-used.c2
-rw-r--r--test/CodeGen/attributes.c2
-rw-r--r--test/CodeGen/bitfield-assign.c4
-rw-r--r--test/CodeGen/bitfield-init.c2
-rw-r--r--test/CodeGen/bitfield.c2
-rw-r--r--test/CodeGen/blocks-1.c2
-rw-r--r--test/CodeGen/blocks-2.c6
-rw-r--r--test/CodeGen/blocks-aligned-byref-variable.c4
-rw-r--r--test/CodeGen/blocks-seq.c2
-rw-r--r--test/CodeGen/blocks.c2
-rw-r--r--test/CodeGen/bool-bitfield.c2
-rw-r--r--test/CodeGen/bool-convert.c2
-rw-r--r--test/CodeGen/bool-init.c2
-rw-r--r--test/CodeGen/boolassign.c2
-rw-r--r--test/CodeGen/builtin-attributes.c2
-rw-r--r--test/CodeGen/builtin-count-zeros.c4
-rw-r--r--test/CodeGen/builtin-memfns.c2
-rw-r--r--test/CodeGen/builtin-nanf.c2
-rw-r--r--test/CodeGen/builtin-rename.c2
-rw-r--r--test/CodeGen/builtin-stackaddress.c4
-rw-r--r--test/CodeGen/builtin-unwind-init.c2
-rw-r--r--test/CodeGen/builtinmemcpy.c2
-rw-r--r--test/CodeGen/builtins-x86.c4
-rw-r--r--test/CodeGen/builtins.c2
-rw-r--r--test/CodeGen/builtinshufflevector.c2
-rw-r--r--test/CodeGen/c-strings.c2
-rw-r--r--test/CodeGen/cast.c2
-rw-r--r--test/CodeGen/cfstring.c2
-rw-r--r--test/CodeGen/cfstring2.c2
-rw-r--r--test/CodeGen/cleanup-stack.c2
-rw-r--r--test/CodeGen/complex.c2
-rw-r--r--test/CodeGen/compound-literal.c2
-rw-r--r--test/CodeGen/compound-type.c2
-rw-r--r--test/CodeGen/compound.c2
-rw-r--r--test/CodeGen/conditional-gnu-ext.c2
-rw-r--r--test/CodeGen/conditional.c2
-rw-r--r--test/CodeGen/const-init.c2
-rw-r--r--test/CodeGen/const-label-addr.c2
-rw-r--r--test/CodeGen/constant-comparison.c4
-rw-r--r--test/CodeGen/constructor-attribute.c2
-rw-r--r--test/CodeGen/cxx-condition.cpp2
-rw-r--r--test/CodeGen/cxx-default-arg.cpp2
-rw-r--r--test/CodeGen/cxx-value-init.cpp2
-rw-r--r--test/CodeGen/darwin-string-literals.c4
-rw-r--r--test/CodeGen/debug-info.c2
-rw-r--r--test/CodeGen/decl.c2
-rw-r--r--test/CodeGen/designated-initializers.c2
-rw-r--r--test/CodeGen/dllimport-dllexport.c2
-rw-r--r--test/CodeGen/dostmt.c2
-rw-r--r--test/CodeGen/emit-all-decls.c4
-rw-r--r--test/CodeGen/empty-union-init.c2
-rw-r--r--test/CodeGen/enum.c2
-rw-r--r--test/CodeGen/exprs.c2
-rw-r--r--test/CodeGen/ext-vector-shuffle.c6
-rw-r--r--test/CodeGen/ext-vector.c2
-rw-r--r--test/CodeGen/extern-block-var.c2
-rw-r--r--test/CodeGen/flexible-array-init.c2
-rw-r--r--test/CodeGen/func-decl-cleanup.c2
-rw-r--r--test/CodeGen/func-return-member.c2
-rw-r--r--test/CodeGen/function-attributes.c2
-rw-r--r--test/CodeGen/function-decay.m2
-rw-r--r--test/CodeGen/functions.c2
-rw-r--r--test/CodeGen/global-decls.c2
-rw-r--r--test/CodeGen/global-init.c2
-rw-r--r--test/CodeGen/global-with-initialiser.c2
-rw-r--r--test/CodeGen/globalinit.c2
-rw-r--r--test/CodeGen/incomplete-function-type.c2
-rw-r--r--test/CodeGen/indirect-goto.c2
-rw-r--r--test/CodeGen/init-with-member-expr.c2
-rw-r--r--test/CodeGen/init.c2
-rw-r--r--test/CodeGen/inline2.c4
-rw-r--r--test/CodeGen/int-to-pointer.c2
-rw-r--r--test/CodeGen/kr-func-promote.c2
-rw-r--r--test/CodeGen/kr-style-block.c2
-rw-r--r--test/CodeGen/libcalls.c4
-rw-r--r--test/CodeGen/linkage-redecl.c2
-rw-r--r--test/CodeGen/long-double-x86.c2
-rw-r--r--test/CodeGen/mandel.c2
-rw-r--r--test/CodeGen/mangle.c2
-rw-r--r--test/CodeGen/merge-attrs.c2
-rw-r--r--test/CodeGen/merge-statics.c2
-rw-r--r--test/CodeGen/object-size.c2
-rw-r--r--test/CodeGen/offsetof.c2
-rw-r--r--test/CodeGen/opaque-pointer.c2
-rw-r--r--test/CodeGen/overloadable.c2
-rw-r--r--test/CodeGen/packed-union.c2
-rw-r--r--test/CodeGen/palignr.c2
-rw-r--r--test/CodeGen/parameter-passing.c6
-rw-r--r--test/CodeGen/pascal-string.c2
-rw-r--r--test/CodeGen/pointer-arithmetic.c2
-rw-r--r--test/CodeGen/pointer-cmp-type.c2
-rw-r--r--test/CodeGen/pointer-to-int.c2
-rw-r--r--test/CodeGen/pragma-pack-1.c2
-rw-r--r--test/CodeGen/pragma-pack-2.c4
-rw-r--r--test/CodeGen/pragma-pack-3.c4
-rw-r--r--test/CodeGen/pragma-weak.c2
-rw-r--r--test/CodeGen/predefined-expr.c2
-rw-r--r--test/CodeGen/private-extern.c2
-rw-r--r--test/CodeGen/rdr-6098585-default-after-caserange.c2
-rw-r--r--test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c2
-rw-r--r--test/CodeGen/rdr-6098585-empty-case-range.c2
-rw-r--r--test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c2
-rw-r--r--test/CodeGen/rdr-6098585-unsigned-caserange.c2
-rw-r--r--test/CodeGen/rdr-6732143-dangling-block-reference.m2
-rw-r--r--test/CodeGen/regparm.c2
-rw-r--r--test/CodeGen/shared-string-literals.c2
-rw-r--r--test/CodeGen/sizeof-vla.c2
-rw-r--r--test/CodeGen/stack-protector.c6
-rw-r--r--test/CodeGen/statements.c2
-rw-r--r--test/CodeGen/static-forward-decl-fun.c2
-rw-r--r--test/CodeGen/static-forward-decl.c2
-rw-r--r--test/CodeGen/static-local-union.c2
-rw-r--r--test/CodeGen/static-order.c2
-rw-r--r--test/CodeGen/staticinit.c2
-rw-r--r--test/CodeGen/stdcall-fastcall.c4
-rw-r--r--test/CodeGen/string-literal.c2
-rw-r--r--test/CodeGen/struct-comma.c2
-rw-r--r--test/CodeGen/struct-copy.c2
-rw-r--r--test/CodeGen/struct-init.c2
-rw-r--r--test/CodeGen/struct-passing.c2
-rw-r--r--test/CodeGen/struct-x86-darwin.c2
-rw-r--r--test/CodeGen/struct.c2
-rw-r--r--test/CodeGen/switch.c2
-rw-r--r--test/CodeGen/target-data.c6
-rw-r--r--test/CodeGen/tentative-decls.c2
-rw-r--r--test/CodeGen/thread-specifier.c2
-rw-r--r--test/CodeGen/trapv.c2
-rw-r--r--test/CodeGen/typedef-func.c2
-rw-r--r--test/CodeGen/typedef.c2
-rw-r--r--test/CodeGen/types.c2
-rw-r--r--test/CodeGen/uint128_t.c2
-rw-r--r--test/CodeGen/union-init.c2
-rw-r--r--test/CodeGen/union-init2.c2
-rw-r--r--test/CodeGen/union.c2
-rw-r--r--test/CodeGen/unreachable.c2
-rw-r--r--test/CodeGen/unwind-attr.c4
-rw-r--r--test/CodeGen/var-align.c2
-rw-r--r--test/CodeGen/variable-array.c2
-rw-r--r--test/CodeGen/vector.c2
-rw-r--r--test/CodeGen/vfprintf.c2
-rw-r--r--test/CodeGen/visibility.c6
-rw-r--r--test/CodeGen/vla.c2
-rw-r--r--test/CodeGen/volatile-1.c2
-rw-r--r--test/CodeGen/volatile.c2
-rw-r--r--test/CodeGen/weak-global.c2
-rw-r--r--test/CodeGen/weak-incomplete.c2
-rw-r--r--test/CodeGen/whilestmt.c2
-rw-r--r--test/CodeGen/writable-strings.c2
-rw-r--r--test/CodeGen/x86.c2
-rw-r--r--test/CodeGen/x86_32-arguments.c2
-rw-r--r--test/CodeGen/x86_64-arguments.c2
209 files changed, 244 insertions, 244 deletions
diff --git a/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c b/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
index 3b158241c6..a1ec633f02 100644
--- a/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
+++ b/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
int array[] = {1, 2, 3, 4, 5};
diff --git a/test/CodeGen/2008-02-07-bitfield-bug.c b/test/CodeGen/2008-02-07-bitfield-bug.c
index dc2ebb75d5..73e31e75e9 100644
--- a/test/CodeGen/2008-02-07-bitfield-bug.c
+++ b/test/CodeGen/2008-02-07-bitfield-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
// PR1990
struct test {
diff --git a/test/CodeGen/2008-02-08-bitfield-bug.c b/test/CodeGen/2008-02-08-bitfield-bug.c
index fc69e58ed3..1549b7248b 100644
--- a/test/CodeGen/2008-02-08-bitfield-bug.c
+++ b/test/CodeGen/2008-02-08-bitfield-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
struct test {
unsigned a:1;
diff --git a/test/CodeGen/2008-02-26-inline-asm-bug.c b/test/CodeGen/2008-02-26-inline-asm-bug.c
index a6816f5de8..1103e9ba58 100644
--- a/test/CodeGen/2008-02-26-inline-asm-bug.c
+++ b/test/CodeGen/2008-02-26-inline-asm-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep "\$0,\$1"
+// RUN: %clang_cc1 -emit-llvm < %s | grep "\$0,\$1"
void f() {
int d1, d2;
diff --git a/test/CodeGen/2008-07-17-no-emit-on-error.c b/test/CodeGen/2008-07-17-no-emit-on-error.c
index 6266b504fd..0452325a79 100644
--- a/test/CodeGen/2008-07-17-no-emit-on-error.c
+++ b/test/CodeGen/2008-07-17-no-emit-on-error.c
@@ -1,7 +1,7 @@
// RUN: rm -f %t1.bc
-// RUN: clang-cc -DPASS %s -emit-llvm-bc -o %t1.bc
+// RUN: %clang_cc1 -DPASS %s -emit-llvm-bc -o %t1.bc
// RUN: test -f %t1.bc
-// RUN: not clang-cc %s -emit-llvm-bc -o %t1.bc
+// RUN: not %clang_cc1 %s -emit-llvm-bc -o %t1.bc
// RUN: not test -f %t1.bc
void f() {
diff --git a/test/CodeGen/2008-07-21-mixed-var-fn-decl.c b/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
index 59a3f38849..ac13260439 100644
--- a/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
+++ b/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
int g0, f0();
int f1(), g1;
diff --git a/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c b/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
index 4aa28f8eb4..33bd800456 100644
--- a/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
+++ b/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=i686-apple-darwin9 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple=i686-apple-darwin9 -emit-llvm -o - %s | FileCheck %s
struct et7 {
float lv7[0];
diff --git a/test/CodeGen/2008-07-22-packed-bitfield-access.c b/test/CodeGen/2008-07-22-packed-bitfield-access.c
index 437a4be156..76b942d5ad 100644
--- a/test/CodeGen/2008-07-22-packed-bitfield-access.c
+++ b/test/CodeGen/2008-07-22-packed-bitfield-access.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
int main () {
struct foo {
diff --git a/test/CodeGen/2008-07-29-override-alias-decl.c b/test/CodeGen/2008-07-29-override-alias-decl.c
index 18e8982832..a4bea0e06c 100644
--- a/test/CodeGen/2008-07-29-override-alias-decl.c
+++ b/test/CodeGen/2008-07-29-override-alias-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
int x() { return 1; }
diff --git a/test/CodeGen/2008-07-30-implicit-initialization.c b/test/CodeGen/2008-07-30-implicit-initialization.c
index b225a14e6f..8c719bb63c 100644
--- a/test/CodeGen/2008-07-30-implicit-initialization.c
+++ b/test/CodeGen/2008-07-30-implicit-initialization.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t
// RUN: grep "ret i32" %t | count 2
// RUN: grep "ret i32 0" %t | count 2
// <rdar://problem/6113085>
diff --git a/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c b/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
index 9fce0aedce..546590eba6 100644
--- a/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
+++ b/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
// <rdar://problem/6108358>
/* For posterity, the issue here begins initial "char []" decl for
diff --git a/test/CodeGen/2008-07-31-asm-labels.c b/test/CodeGen/2008-07-31-asm-labels.c
index d2dcc04bf5..130ad6ba46 100644
--- a/test/CodeGen/2008-07-31-asm-labels.c
+++ b/test/CodeGen/2008-07-31-asm-labels.c
@@ -1,9 +1,9 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep "@pipe()" %t | count 0
// RUN: grep '_thisIsNotAPipe' %t | count 3
// RUN: grep 'g0' %t | count 0
// RUN: grep '_renamed' %t | count 2
-// RUN: clang-cc -DUSE_DEF -emit-llvm -o %t %s
+// RUN: %clang_cc1 -DUSE_DEF -emit-llvm -o %t %s
// RUN: grep "@pipe()" %t | count 0
// RUN: grep '_thisIsNotAPipe' %t | count 3
// <rdr://6116729>
diff --git a/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c b/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
index 0ce4ba66ca..de062631f9 100644
--- a/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
+++ b/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis | grep "ret i32 1" | count 3
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis | grep "ret i32 1" | count 3
// <rdr://6115726>
int f0() {
diff --git a/test/CodeGen/2008-08-04-void-pointer-arithmetic.c b/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
index bd4d8f8c18..dbfc107da5 100644
--- a/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
+++ b/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
// <rdar://problem/6122967>
int f0(void *a, void *b) {
diff --git a/test/CodeGen/2008-08-19-cast-of-typedef.c b/test/CodeGen/2008-08-19-cast-of-typedef.c
index 3435384a58..740f48a8ba 100644
--- a/test/CodeGen/2008-08-19-cast-of-typedef.c
+++ b/test/CodeGen/2008-08-19-cast-of-typedef.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
typedef short T[4];
struct s {
diff --git a/test/CodeGen/2008-08-25-incompatible-cond-expr.m b/test/CodeGen/2008-08-25-incompatible-cond-expr.m
index fa9b1970f7..f285cca094 100644
--- a/test/CodeGen/2008-08-25-incompatible-cond-expr.m
+++ b/test/CodeGen/2008-08-25-incompatible-cond-expr.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
@protocol P0
@end
diff --git a/test/CodeGen/2008-09-22-bad-switch-type.c b/test/CodeGen/2008-09-22-bad-switch-type.c
index 2526dd9289..853e6bd174 100644
--- a/test/CodeGen/2008-09-22-bad-switch-type.c
+++ b/test/CodeGen/2008-09-22-bad-switch-type.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// PR2817
void f0(void) {
diff --git a/test/CodeGen/2008-12-02-logical-or-fold.c b/test/CodeGen/2008-12-02-logical-or-fold.c
index d54bf287d2..167ad299ce 100644
--- a/test/CodeGen/2008-12-02-logical-or-fold.c
+++ b/test/CodeGen/2008-12-02-logical-or-fold.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | grep "store i32 1"
+// RUN: %clang_cc1 -emit-llvm -o - %s | grep "store i32 1"
// PR3150
int a() {return 1||1;}
diff --git a/test/CodeGen/2009-01-21-invalid-debug-info.m b/test/CodeGen/2009-01-21-invalid-debug-info.m
index 1c1028b4ea..af912e2dc5 100644
--- a/test/CodeGen/2009-01-21-invalid-debug-info.m
+++ b/test/CodeGen/2009-01-21-invalid-debug-info.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -S -g -o %t.s %s
+// RUN: %clang_cc1 -S -g -o %t.s %s
// FIXME: This test case can be removed at some point (since it will
// no longer effectively test anything). The reason it was causing
diff --git a/test/CodeGen/2009-03-22-increment-bitfield.c b/test/CodeGen/2009-03-22-increment-bitfield.c
index f0aaafda60..407aea2b77 100644
--- a/test/CodeGen/2009-03-22-increment-bitfield.c
+++ b/test/CodeGen/2009-03-22-increment-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -O1 < %s | grep "ret i32 0"
+// RUN: %clang_cc1 -emit-llvm -O1 < %s | grep "ret i32 0"
int a(void) {
return ++(struct x {unsigned x : 2;}){3}.x;
diff --git a/test/CodeGen/2009-04-23-dbg.c b/test/CodeGen/2009-04-23-dbg.c
index c6b179126e..6a8bf01ba8 100644
--- a/test/CodeGen/2009-04-23-dbg.c
+++ b/test/CodeGen/2009-04-23-dbg.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -g -o %t %s -emit-llvm-bc && llc %t -o %t.s
+// RUN: %clang_cc1 -g -o %t %s -emit-llvm-bc && llc %t -o %t.s
# 1 "a.c"
# 1 "a.c" 1
# 1 "<built-in>" 1
diff --git a/test/CodeGen/2009-05-22-callingconv.c b/test/CodeGen/2009-05-22-callingconv.c
index 8afc656843..3e616d9bea 100644
--- a/test/CodeGen/2009-05-22-callingconv.c
+++ b/test/CodeGen/2009-05-22-callingconv.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -triple i386-unknown-unknown | grep call | grep x86_stdcallcc
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple i386-unknown-unknown | grep call | grep x86_stdcallcc
void abort(void) __attribute__((__noreturn__));
typedef void re_string_t;
typedef void re_dfa_t;
diff --git a/test/CodeGen/2009-05-28-const-typedef.c b/test/CodeGen/2009-05-28-const-typedef.c
index e46e83b947..3464fde685 100644
--- a/test/CodeGen/2009-05-28-const-typedef.c
+++ b/test/CodeGen/2009-05-28-const-typedef.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o -
+// RUN: %clang_cc1 -emit-llvm %s -o -
// PR4281
typedef struct {
diff --git a/test/CodeGen/2009-06-01-addrofknr.c b/test/CodeGen/2009-06-01-addrofknr.c
index d51a4a47b4..17d6fdf5d8 100644
--- a/test/CodeGen/2009-06-01-addrofknr.c
+++ b/test/CodeGen/2009-06-01-addrofknr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -o %t -emit-llvm -verify
+// RUN: %clang_cc1 %s -o %t -emit-llvm -verify
// PR4289
struct funcptr {
diff --git a/test/CodeGen/2009-06-14-anonymous-union-init.c b/test/CodeGen/2009-06-14-anonymous-union-init.c
index 8d1831a4f3..8ccd7bc4ec 100644
--- a/test/CodeGen/2009-06-14-anonymous-union-init.c
+++ b/test/CodeGen/2009-06-14-anonymous-union-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep "zeroinitializer, i16 16877"
+// RUN: %clang_cc1 -emit-llvm < %s | grep "zeroinitializer, i16 16877"
// PR4390
struct sysfs_dirent {
union { struct sysfs_elem_dir {} s_dir; };
diff --git a/test/CodeGen/2009-07-31-DbgDeclare.c b/test/CodeGen/2009-07-31-DbgDeclare.c
index da49afedbc..3ccb2630a4 100644
--- a/test/CodeGen/2009-07-31-DbgDeclare.c
+++ b/test/CodeGen/2009-07-31-DbgDeclare.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -S -g -o %t.s %s
+// RUN: %clang_cc1 -S -g -o %t.s %s
void foo() {
int i = 0;
i = 42;
diff --git a/test/CodeGen/2009-08-14-vararray-crash.c b/test/CodeGen/2009-08-14-vararray-crash.c
index 40e071bd19..7f489bcff1 100644
--- a/test/CodeGen/2009-08-14-vararray-crash.c
+++ b/test/CodeGen/2009-08-14-vararray-crash.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s
+// RUN: %clang_cc1 -emit-llvm < %s
void sum1(int rb) {
typedef unsigned char imgrow[rb];
diff --git a/test/CodeGen/OpaqueStruct.c b/test/CodeGen/OpaqueStruct.c
index b994c30002..fe96126c05 100644
--- a/test/CodeGen/OpaqueStruct.c
+++ b/test/CodeGen/OpaqueStruct.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
typedef struct a b;
b* x;
diff --git a/test/CodeGen/PR2001-bitfield-reload.c b/test/CodeGen/PR2001-bitfield-reload.c
index 4dec65fd54..d05aef3579 100644
--- a/test/CodeGen/PR2001-bitfield-reload.c
+++ b/test/CodeGen/PR2001-bitfield-reload.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -O3 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -O3 -emit-llvm -o - %s | FileCheck %s
// PR2001
/* Test that the result of the assignment properly uses the value *in
diff --git a/test/CodeGen/PR2413-void-address-cast-error.c b/test/CodeGen/PR2413-void-address-cast-error.c
index 95a4c6d80f..3920dfdec2 100644
--- a/test/CodeGen/PR2413-void-address-cast-error.c
+++ b/test/CodeGen/PR2413-void-address-cast-error.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o -
+// RUN: %clang_cc1 -emit-llvm %s -o -
void f()
{
void *addr;
diff --git a/test/CodeGen/PR2643-null-store-to-bitfield.c b/test/CodeGen/PR2643-null-store-to-bitfield.c
index 6a5b0e92f6..d6c2f36aa5 100644
--- a/test/CodeGen/PR2643-null-store-to-bitfield.c
+++ b/test/CodeGen/PR2643-null-store-to-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
// PR2643
void foo() {
diff --git a/test/CodeGen/PR2743-reference-missing-static.c b/test/CodeGen/PR2743-reference-missing-static.c
index e152c52585..f32d6c5f14 100644
--- a/test/CodeGen/PR2743-reference-missing-static.c
+++ b/test/CodeGen/PR2743-reference-missing-static.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// PR2743
// <rdr://6094512>
diff --git a/test/CodeGen/PR3130-cond-constant.c b/test/CodeGen/PR3130-cond-constant.c
index e488eeb37f..dbec6509bd 100644
--- a/test/CodeGen/PR3130-cond-constant.c
+++ b/test/CodeGen/PR3130-cond-constant.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -emit-llvm %s -o -
+// RUN: %clang_cc1 -emit-llvm %s -o -
int a = 2.0 ? 1 : 2;
diff --git a/test/CodeGen/PR3589-freestanding-libcalls.c b/test/CodeGen/PR3589-freestanding-libcalls.c
index 1460813718..8b8282fb80 100644
--- a/test/CodeGen/PR3589-freestanding-libcalls.c
+++ b/test/CodeGen/PR3589-freestanding-libcalls.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -emit-llvm %s -o - | grep 'declare i32 @printf' | count 1
-// RUN: clang-cc -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 1
-// RUN: clang-cc -ffreestanding -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 0
+// RUN: %clang_cc1 -emit-llvm %s -o - | grep 'declare i32 @printf' | count 1
+// RUN: %clang_cc1 -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 1
+// RUN: %clang_cc1 -ffreestanding -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 0
int printf(const char *, ...);
diff --git a/test/CodeGen/PR3613-static-decl.c b/test/CodeGen/PR3613-static-decl.c
index a9dc744589..7f6d979492 100644
--- a/test/CodeGen/PR3613-static-decl.c
+++ b/test/CodeGen/PR3613-static-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm -o %t %s
// RUN: grep '@g0 = internal global %.truct.s0 { i32 3 }' %t | count 1
struct s0 {
diff --git a/test/CodeGen/PR3709-int-to-pointer-sign.c b/test/CodeGen/PR3709-int-to-pointer-sign.c
index 24c42f649b..f77737e0f7 100644
--- a/test/CodeGen/PR3709-int-to-pointer-sign.c
+++ b/test/CodeGen/PR3709-int-to-pointer-sign.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -O1 -triple=x86_64-gnu-linux | grep "i64 -1"
+// RUN: %clang_cc1 -emit-llvm %s -o - -O1 -triple=x86_64-gnu-linux | grep "i64 -1"
// PR3709
long long a() { return (long long)(int*)-1;}
diff --git a/test/CodeGen/PR4611-bitfield-layout.c b/test/CodeGen/PR4611-bitfield-layout.c
index bc514bf4df..3975ed0c13 100644
--- a/test/CodeGen/PR4611-bitfield-layout.c
+++ b/test/CodeGen/PR4611-bitfield-layout.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o %t
// RUN: grep "struct.object_entry = type { i8, \[2 x i8\], i8 }" %t
struct object_entry {
diff --git a/test/CodeGen/PR5060-align.c b/test/CodeGen/PR5060-align.c
index 5d864084b0..efd8520553 100644
--- a/test/CodeGen/PR5060-align.c
+++ b/test/CodeGen/PR5060-align.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -verify | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -verify | FileCheck %s
// CHECK: @foo.p = internal global i8 0, align 32
char *foo(void) {
diff --git a/test/CodeGen/address-space-cast.c b/test/CodeGen/address-space-cast.c
index 2fba5ecd7d..076c2f16fe 100644
--- a/test/CodeGen/address-space-cast.c
+++ b/test/CodeGen/address-space-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s
+// RUN: %clang_cc1 -emit-llvm < %s
volatile unsigned char* const __attribute__((address_space(1))) serial_ctrl = 0x02;
diff --git a/test/CodeGen/address-space-compound-literal.c b/test/CodeGen/address-space-compound-literal.c
index 79d19ed6b6..37d9c7bc58 100644
--- a/test/CodeGen/address-space-compound-literal.c
+++ b/test/CodeGen/address-space-compound-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep "internal addrspace(1) global i32 1"
+// RUN: %clang_cc1 -emit-llvm < %s | grep "internal addrspace(1) global i32 1"
typedef int a __attribute__((address_space(1)));
a* x = &(a){1};
diff --git a/test/CodeGen/address-space-field1.c b/test/CodeGen/address-space-field1.c
index b041cf55d0..61d88f9e75 100644
--- a/test/CodeGen/address-space-field1.c
+++ b/test/CodeGen/address-space-field1.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm < %s -o - | FileCheck %s
// CHECK:%struct.S = type { i32, i32 }
// CHECK:define void @test_addrspace(%struct.S addrspace(1)* %p1, %struct.S addrspace(2)* %p2) nounwind
// CHECK: [[p1addr:%.*]] = alloca %struct.S addrspace(1)* ; <%struct.S addrspace(1)**> [#uses=3]
diff --git a/test/CodeGen/address-space-field2.c b/test/CodeGen/address-space-field2.c
index 5576e55b63..198fd22a3a 100644
--- a/test/CodeGen/address-space-field2.c
+++ b/test/CodeGen/address-space-field2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
// CHECK: addrspace(1)
// CHECK: addrspace(2)
// CHECK: addrspace(1)
diff --git a/test/CodeGen/address-space-field3.c b/test/CodeGen/address-space-field3.c
index 567757fe66..090f4a104b 100644
--- a/test/CodeGen/address-space-field3.c
+++ b/test/CodeGen/address-space-field3.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
// CHECK: addrspace(1)
// CHECK: addrspace(2)
// CHECK: addrspace(1)
diff --git a/test/CodeGen/address-space-field4.c b/test/CodeGen/address-space-field4.c
index 31df018206..a1906c0c00 100644
--- a/test/CodeGen/address-space-field4.c
+++ b/test/CodeGen/address-space-field4.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
// CHECK: addrspace(2)
// CHECK: addrspace(3)
// CHECK: addrspace(1)
diff --git a/test/CodeGen/address-space.c b/test/CodeGen/address-space.c
index 8536f16153..5b58919557 100644
--- a/test/CodeGen/address-space.c
+++ b/test/CodeGen/address-space.c
@@ -1,8 +1,8 @@
-// RUN: clang-cc -emit-llvm < %s | grep '@foo.*global.*addrspace(1)'
-// RUN: clang-cc -emit-llvm < %s | grep '@ban.*global.*addrspace(1)'
-// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(1)' | count 2
-// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(2).. @A'
-// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(2).. @B'
+// RUN: %clang_cc1 -emit-llvm < %s | grep '@foo.*global.*addrspace(1)'
+// RUN: %clang_cc1 -emit-llvm < %s | grep '@ban.*global.*addrspace(1)'
+// RUN: %clang_cc1 -emit-llvm < %s | grep 'load.*addrspace(1)' | count 2
+// RUN: %clang_cc1 -emit-llvm < %s | grep 'load.*addrspace(2).. @A'
+// RUN: %clang_cc1 -emit-llvm < %s | grep 'load.*addrspace(2).. @B'
int foo __attribute__((address_space(1)));
int ban[10] __attribute__((address_space(1)));
diff --git a/test/CodeGen/alias.c b/test/CodeGen/alias.c
index f8836e6f60..f2e87a5daf 100644
--- a/test/CodeGen/alias.c
+++ b/test/CodeGen/alias.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o %t %s
// RUN: grep '@g0 = common global i32 0' %t
// RUN: grep '@f1 = alias void ()\* @f0' %t
// RUN: grep '@g1 = alias i32\* @g0' %t
diff --git a/test/CodeGen/align-local.c b/test/CodeGen/align-local.c
index afbe1d5dd0..b839ee14a1 100644
--- a/test/CodeGen/align-local.c
+++ b/test/CodeGen/align-local.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep "align 16" | count 2
+// RUN: %clang_cc1 -emit-llvm < %s | grep "align 16" | count 2
typedef struct __attribute((aligned(16))) {int x[4];} ff;
diff --git a/test/CodeGen/alignof.c b/test/CodeGen/alignof.c
index 71c275018e..64d0c08356 100644
--- a/test/CodeGen/alignof.c
+++ b/test/CodeGen/alignof.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -O1 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -O1 -emit-llvm -o %t %s
// RUN: grep 'ret i32 4' %t
enum e0 { E0 };
diff --git a/test/CodeGen/arm-arguments.c b/test/CodeGen/arm-arguments.c
index 945c1f2e66..fb61b0f784 100644
--- a/test/CodeGen/arm-arguments.c
+++ b/test/CodeGen/arm-arguments.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -triple armv7-apple-darwin9 -target-abi apcs-gnu -emit-llvm -w -o - %s | FileCheck -check-prefix=APCS-GNU %s
-// RUN: clang-cc -triple armv7-apple-darwin9 -target-abi aapcs -emit-llvm -w -o - %s | FileCheck -check-prefix=AAPCS %s
+// RUN: %clang_cc1 -triple armv7-apple-darwin9 -target-abi apcs-gnu -emit-llvm -w -o - %s | FileCheck -check-prefix=APCS-GNU %s
+// RUN: %clang_cc1 -triple armv7-apple-darwin9 -target-abi aapcs -emit-llvm -w -o - %s | FileCheck -check-prefix=AAPCS %s
// APCS-GNU: define arm_apcscc signext i8 @f0()
// AAPCS: define arm_aapcscc signext i8 @f0()
diff --git a/test/CodeGen/arm_asm_clobber.c b/test/CodeGen/arm_asm_clobber.c
index 05eb2e211f..a7ca0b5332 100644
--- a/test/CodeGen/arm_asm_clobber.c
+++ b/test/CodeGen/arm_asm_clobber.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple armv6-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple armv6-unknown-unknown -emit-llvm -o %t %s
void test0(void) {
asm volatile("mov r0, r0" :: );
diff --git a/test/CodeGen/array.c b/test/CodeGen/array.c
index 294dabfbbb..0b401ea819 100644
--- a/test/CodeGen/array.c
+++ b/test/CodeGen/array.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
void f() {
int a[2];
diff --git a/test/CodeGen/asm-2.c b/test/CodeGen/asm-2.c
index 72b23b1505..9d73608a4c 100644
--- a/test/CodeGen/asm-2.c
+++ b/test/CodeGen/asm-2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t -triple i386-pc-linux-gnu -O2
+// RUN: %clang_cc1 -emit-llvm %s -o %t -triple i386-pc-linux-gnu -O2
// RUN: not grep "load" %t
// <rdar://problem/6841383>
diff --git a/test/CodeGen/asm-inout.c b/test/CodeGen/asm-inout.c
index 8ddd2acaf8..4076609271 100644
--- a/test/CodeGen/asm-inout.c
+++ b/test/CodeGen/asm-inout.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm %s -o %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm %s -o %t
// RUN: grep "load i8\*\*\* %p.addr" %t | count 1
// XFAIL: *
diff --git a/test/CodeGen/asm.c b/test/CodeGen/asm.c
index 41951b8ac2..df593d79fa 100644
--- a/test/CodeGen/asm.c
+++ b/test/CodeGen/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm %s -o %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm %s -o %t
void t1(int len) {
__asm__ volatile("" : "=&r"(len), "+&r"(len));
}
diff --git a/test/CodeGen/atomic.c b/test/CodeGen/atomic.c
index 355f7b8323..ff304f57f0 100644
--- a/test/CodeGen/atomic.c
+++ b/test/CodeGen/atomic.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -triple=i686-apple-darwin9 > %t1
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-apple-darwin9 > %t1
// RUN: grep @llvm.atomic.load.add.i32 %t1 | count 3
// RUN: grep @llvm.atomic.load.sub.i8 %t1 | count 2
// RUN: grep @llvm.atomic.load.min.i32 %t1
diff --git a/test/CodeGen/attr-cleanup.c b/test/CodeGen/attr-cleanup.c
index 9105ededa2..7c2053d7ac 100644
--- a/test/CodeGen/attr-cleanup.c
+++ b/test/CodeGen/attr-cleanup.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
// <rdar://problem/6827047>
void f(void* arg);
diff --git a/test/CodeGen/attr-nodebug.c b/test/CodeGen/attr-nodebug.c
index e0c813399f..66caa2b38f 100644
--- a/test/CodeGen/attr-nodebug.c
+++ b/test/CodeGen/attr-nodebug.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -g -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -emit-llvm -o %t %s
// RUN: not grep 'call void @llvm.dbg.func.start' %t
void t1() __attribute__((nodebug));
diff --git a/test/CodeGen/attr-noinline.c b/test/CodeGen/attr-noinline.c
index 719d6eb88f..dbca71ff5f 100644
--- a/test/CodeGen/attr-noinline.c
+++ b/test/CodeGen/attr-noinline.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -g -emit-llvm -o %t %s
+// RUN: %clang_cc1 -g -emit-llvm -o %t %s
// RUN: grep 'noinline' %t
void t1() __attribute__((noinline));
diff --git a/test/CodeGen/attr-used.c b/test/CodeGen/attr-used.c
index 5537ec2f4c..bc92b9435b 100644
--- a/test/CodeGen/attr-used.c
+++ b/test/CodeGen/attr-used.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep '@llvm.used = .*@g0' %t
// RUN: grep '@llvm.used = .*@f0' %t
// RUN: grep '@llvm.used = .*@f1.l0' %t
diff --git a/test/CodeGen/attributes.c b/test/CodeGen/attributes.c
index 29672c2ecb..68bc73daec 100644
--- a/test/CodeGen/attributes.c
+++ b/test/CodeGen/attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -triple i386-linux-gnu -o %t %s
+// RUN: %clang_cc1 -emit-llvm -triple i386-linux-gnu -o %t %s
// RUN: FileCheck --input-file=%t %s
// CHECK: @t5 = weak global i32 2
diff --git a/test/CodeGen/bitfield-assign.c b/test/CodeGen/bitfield-assign.c
index 575a9fb766..b8ab61339c 100644
--- a/test/CodeGen/bitfield-assign.c
+++ b/test/CodeGen/bitfield-assign.c
@@ -4,12 +4,12 @@
/* Check that we get one load for each simple assign and two for the
compound assign (load the old value before the add then load again
to store back). Also check that our g0 pattern is good. */
-// RUN: clang-cc -triple i386-unknown-unknown -O0 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -O0 -emit-llvm -o %t %s
// RUN: grep 'load ' %t | count 5
// RUN: grep "@g0" %t | count 4
// Check that we got the right value.
-// RUN: clang-cc -triple i386-unknown-unknown -O3 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -O3 -emit-llvm -o %t %s
// RUN: grep 'load ' %t | count 0
// RUN: grep "@g0" %t | count 0
diff --git a/test/CodeGen/bitfield-init.c b/test/CodeGen/bitfield-init.c
index 7459614a12..bee4e7d3a0 100644
--- a/test/CodeGen/bitfield-init.c
+++ b/test/CodeGen/bitfield-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
typedef struct { unsigned int i: 1; } c;
const c d = { 1 };
diff --git a/test/CodeGen/bitfield.c b/test/CodeGen/bitfield.c
index 9cd79d3d58..dea5e43e0f 100644
--- a/test/CodeGen/bitfield.c
+++ b/test/CodeGen/bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o %t -O3
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o %t -O3
// RUN: grep "ret i32" %t | count 4
// RUN: grep "ret i32 1" %t | count 4
diff --git a/test/CodeGen/blocks-1.c b/test/CodeGen/blocks-1.c
index ae5a74aab6..71b4de8bef 100644
--- a/test/CodeGen/blocks-1.c
+++ b/test/CodeGen/blocks-1.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t -fblocks
+// RUN: %clang_cc1 %s -emit-llvm -o %t -fblocks
// RUN: grep "_Block_object_dispose" %t | count 17
// RUN: grep "__copy_helper_block_" %t | count 16
// RUN: grep "__destroy_helper_block_" %t | count 16
diff --git a/test/CodeGen/blocks-2.c b/test/CodeGen/blocks-2.c
index c22e882f1b..4e574dafec 100644
--- a/test/CodeGen/blocks-2.c
+++ b/test/CodeGen/blocks-2.c
@@ -1,8 +1,8 @@
-// RUN: clang-cc -g %s -emit-llvm -o %t -fblocks
+// RUN: %clang_cc1 -g %s -emit-llvm -o %t -fblocks
// RUN: grep "func.start" %t | count 4
-// RUN: clang-cc -g %s -triple i386-unknown-unknown -emit-llvm -o %t -fblocks -fblock-introspection
+// RUN: %clang_cc1 -g %s -triple i386-unknown-unknown -emit-llvm -o %t -fblocks -fblock-introspection
// RUN: grep "v8@?0i4" %t | count 1
-// RUN: clang-cc -g %s -triple i386-unknown-unknown -emit-llvm -o %t -fblocks
+// RUN: %clang_cc1 -g %s -triple i386-unknown-unknown -emit-llvm -o %t -fblocks
// RUN: grep "v8@?0i4" %t | count 0
// 1 declaration, 1 bar, 1 test_block_dbg and 1 for the block.
// XFAIL: *
diff --git a/test/CodeGen/blocks-aligned-byref-variable.c b/test/CodeGen/blocks-aligned-byref-variable.c
index 61522fd2da..79ac41dcd5 100644
--- a/test/CodeGen/blocks-aligned-byref-variable.c
+++ b/test/CodeGen/blocks-aligned-byref-variable.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -emit-llvm -o - -triple x86_64-apple-darwin10
-// RUN: clang-cc -emit-llvm -o - -triple i386-apple-darwin10
+// RUN: %clang_cc1 -emit-llvm -o - -triple x86_64-apple-darwin10
+// RUN: %clang_cc1 -emit-llvm -o - -triple i386-apple-darwin10
typedef int __attribute__((aligned(32))) ai;
void f() {
diff --git a/test/CodeGen/blocks-seq.c b/test/CodeGen/blocks-seq.c
index 4006b715f4..3557b48053 100644
--- a/test/CodeGen/blocks-seq.c
+++ b/test/CodeGen/blocks-seq.c
@@ -1,7 +1,7 @@
// FIXME: We forcibly strip the names so that the test doesn't vary between
// builds with and without asserts. We need a better solution for this.
-// RUN: clang-cc -fblocks -triple x86_64-apple-darwin10 -emit-llvm-bc -o - %s | opt -strip | llvm-dis > %t
+// RUN: %clang_cc1 -fblocks -triple x86_64-apple-darwin10 -emit-llvm-bc -o - %s | opt -strip | llvm-dis > %t
// RUN: grep '%6 = call i32 (...)\* @rhs()' %t | count 1
// RUN: grep '%7 = getelementptr inbounds %0\* %1, i32 0, i32 1' %t | count 1
// RUN: grep '%8 = load %0\*\* %7' %t | count 1
diff --git a/test/CodeGen/blocks.c b/test/CodeGen/blocks.c
index eddf25c74a..0ef10c14e0 100644
--- a/test/CodeGen/blocks.c
+++ b/test/CodeGen/blocks.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o %t -fblocks
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o %t -fblocks
void (^f)(void) = ^{};
// rdar://6768379
diff --git a/test/CodeGen/bool-bitfield.c b/test/CodeGen/bool-bitfield.c
index 50990a47c2..cb2d1dbd02 100644
--- a/test/CodeGen/bool-bitfield.c
+++ b/test/CodeGen/bool-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
// From GCC PR19331
struct SysParams
diff --git a/test/CodeGen/bool-convert.c b/test/CodeGen/bool-convert.c
index 4df81bb82d..8bde837ed3 100644
--- a/test/CodeGen/bool-convert.c
+++ b/test/CodeGen/bool-convert.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep i1 | count 1
+// RUN: %clang_cc1 -emit-llvm < %s | grep i1 | count 1
// All of these should uses the memory representation of _Bool
struct teststruct1 {_Bool a, b;} test1;
_Bool* test2;
diff --git a/test/CodeGen/bool-init.c b/test/CodeGen/bool-init.c
index 7d331ed07e..1a8f127b86 100644
--- a/test/CodeGen/bool-init.c
+++ b/test/CodeGen/bool-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep i1 | count 1
+// RUN: %clang_cc1 -emit-llvm < %s | grep i1 | count 1
// Check that the type of this global isn't i1
_Bool test = &test;
diff --git a/test/CodeGen/boolassign.c b/test/CodeGen/boolassign.c
index 73aab8db7c..8c563194e0 100644
--- a/test/CodeGen/boolassign.c
+++ b/test/CodeGen/boolassign.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
int testBoolAssign(void) {
int ss;
diff --git a/test/CodeGen/builtin-attributes.c b/test/CodeGen/builtin-attributes.c
index 184e9676ed..944aac3f52 100644
--- a/test/CodeGen/builtin-attributes.c
+++ b/test/CodeGen/builtin-attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple arm-unknown-unknown -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple arm-unknown-unknown -emit-llvm -o - %s | FileCheck %s
// CHECK: declare arm_aapcscc i32 @printf(i8*, ...)
void f0() {
diff --git a/test/CodeGen/builtin-count-zeros.c b/test/CodeGen/builtin-count-zeros.c
index ff08bd1083..5a0be2fb86 100644
--- a/test/CodeGen/builtin-count-zeros.c
+++ b/test/CodeGen/builtin-count-zeros.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | grep 'cttz' | count 2
-// RUN: clang-cc -emit-llvm %s -o - | grep 'ctlz' | count 2
+// RUN: %clang_cc1 -emit-llvm %s -o - | grep 'cttz' | count 2
+// RUN: %clang_cc1 -emit-llvm %s -o - | grep 'ctlz' | count 2
int a(int a) {return __builtin_ctz(a) + __builtin_clz(a);}
diff --git a/test/CodeGen/builtin-memfns.c b/test/CodeGen/builtin-memfns.c
index f1d092502d..a7b716b931 100644
--- a/test/CodeGen/builtin-memfns.c
+++ b/test/CodeGen/builtin-memfns.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o %t %s
// RUN: grep '@llvm.memset.i32' %t
// RUN: grep '@llvm.memcpy.i32' %t
// RUN: grep '@llvm.memmove.i32' %t
diff --git a/test/CodeGen/builtin-nanf.c b/test/CodeGen/builtin-nanf.c
index 8f7d2a1e44..ae37c9dc80 100644
--- a/test/CodeGen/builtin-nanf.c
+++ b/test/CodeGen/builtin-nanf.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin9 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-llvm -o %t %s
// RUN: grep 'float 0x7FF8000000000000, float 0x7FF8000000000000, float 0x7FF8000020000000, float 0x7FF8000000000000, float 0x7FF80001E0000000, float 0x7FF8001E00000000, float 0x7FF801E000000000, float 0x7FF81E0000000000, float 0x7FF9E00000000000, float 0x7FFFFFFFE0000000' %t
float n[] = {
diff --git a/test/CodeGen/builtin-rename.c b/test/CodeGen/builtin-rename.c
index d0b5c2472d..0b71d88806 100644
--- a/test/CodeGen/builtin-rename.c
+++ b/test/CodeGen/builtin-rename.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | grep 'declare.*printf' | count 1
+// RUN: %clang_cc1 %s -emit-llvm -o - | grep 'declare.*printf' | count 1
// PR3612
int printf(const char *, ...);
diff --git a/test/CodeGen/builtin-stackaddress.c b/test/CodeGen/builtin-stackaddress.c
index d8e58c4f6b..f13b90eb9e 100644
--- a/test/CodeGen/builtin-stackaddress.c
+++ b/test/CodeGen/builtin-stackaddress.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -emit-llvm < %s | grep "llvm.returnaddress"
-// RUN: clang-cc -emit-llvm < %s | grep "llvm.frameaddress"
+// RUN: %clang_cc1 -emit-llvm < %s | grep "llvm.returnaddress"
+// RUN: %clang_cc1 -emit-llvm < %s | grep "llvm.frameaddress"
void* a(unsigned x) {
return __builtin_return_address(0);
}
diff --git a/test/CodeGen/builtin-unwind-init.c b/test/CodeGen/builtin-unwind-init.c
index 56872f7434..6fa77667bd 100644
--- a/test/CodeGen/builtin-unwind-init.c
+++ b/test/CodeGen/builtin-unwind-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm < %s -o - | FileCheck %s
void a() { __builtin_unwind_init(); }
diff --git a/test/CodeGen/builtinmemcpy.c b/test/CodeGen/builtinmemcpy.c
index d1fdebbe82..93253c5a8a 100644
--- a/test/CodeGen/builtinmemcpy.c
+++ b/test/CodeGen/builtinmemcpy.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -emit-llvm < %s -o - | grep "llvm.memcpy"
+// RUN: %clang_cc1 -emit-llvm < %s -o - | grep "llvm.memcpy"
char* x(char* a, char* b) {return __builtin_memcpy(a, b, 4);}
diff --git a/test/CodeGen/builtins-x86.c b/test/CodeGen/builtins-x86.c
index c82ecde1ff..2eadd7f884 100644
--- a/test/CodeGen/builtins-x86.c
+++ b/test/CodeGen/builtins-x86.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -DUSE_64 -triple x86_64-unknown-unknown -emit-llvm -o %t %s
-// RUN: clang-cc -DUSE_ALL -triple x86_64-unknown-unknown -fsyntax-only -o %t %s
+// RUN: %clang_cc1 -DUSE_64 -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -DUSE_ALL -triple x86_64-unknown-unknown -fsyntax-only -o %t %s
#ifdef USE_ALL
#define USE_3DNOW
diff --git a/test/CodeGen/builtins.c b/test/CodeGen/builtins.c
index 11bcc14249..4fa4785755 100644
--- a/test/CodeGen/builtins.c
+++ b/test/CodeGen/builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: not grep __builtin %t
int printf(const char *, ...);
diff --git a/test/CodeGen/builtinshufflevector.c b/test/CodeGen/builtinshufflevector.c
index 9a3ae61028..f365844c6d 100644
--- a/test/CodeGen/builtinshufflevector.c
+++ b/test/CodeGen/builtinshufflevector.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep 'shufflevector' | count 1
+// RUN: %clang_cc1 -emit-llvm < %s | grep 'shufflevector' | count 1
typedef int v4si __attribute__ ((vector_size (16)));
v4si a(v4si x, v4si y) {return __builtin_shufflevector(x, y, 3, 2, 5, 7);}
diff --git a/test/CodeGen/c-strings.c b/test/CodeGen/c-strings.c
index 2cf4036cb6..4fbeb7b87e 100644
--- a/test/CodeGen/c-strings.c
+++ b/test/CodeGen/c-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep "hello" %t | count 3
// RUN: grep 'c"hello\\00"' %t | count 2
// RUN: grep 'c"hello\\00\\00\\00"' %t | count 1
diff --git a/test/CodeGen/cast.c b/test/CodeGen/cast.c
index 6fb2b116d4..5f340c5bb6 100644
--- a/test/CodeGen/cast.c
+++ b/test/CodeGen/cast.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
extern void go(const void *p);
float v[2] = { 0.0, 1.0 };
diff --git a/test/CodeGen/cfstring.c b/test/CodeGen/cfstring.c
index a78dfdaf65..1f0977f039 100644
--- a/test/CodeGen/cfstring.c
+++ b/test/CodeGen/cfstring.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
#define CFSTR __builtin___CFStringMakeConstantString
void f() {
diff --git a/test/CodeGen/cfstring2.c b/test/CodeGen/cfstring2.c
index ceefeb9e83..c760f5dcf5 100644
--- a/test/CodeGen/cfstring2.c
+++ b/test/CodeGen/cfstring2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
typedef const struct __CFString * CFStringRef;
diff --git a/test/CodeGen/cleanup-stack.c b/test/CodeGen/cleanup-stack.c
index 3954d85de2..72a1a6c751 100644
--- a/test/CodeGen/cleanup-stack.c
+++ b/test/CodeGen/cleanup-stack.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -O3 -emit-llvm %s -o %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -O3 -emit-llvm %s -o %t
// RUN: grep "ret i32 9" %t
struct s0 {
diff --git a/test/CodeGen/complex.c b/test/CodeGen/complex.c
index 6a0d3d628c..8d9c68d074 100644
--- a/test/CodeGen/complex.c
+++ b/test/CodeGen/complex.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s
+// RUN: %clang_cc1 -emit-llvm < %s
int main(void)
{
diff --git a/test/CodeGen/compound-literal.c b/test/CodeGen/compound-literal.c
index ef0436744d..4b995dbfef 100644
--- a/test/CodeGen/compound-literal.c
+++ b/test/CodeGen/compound-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc < %s -emit-llvm
+// RUN: %clang_cc1 < %s -emit-llvm
int* a = &(int){1};
struct s {int a, b, c;} * b = &(struct s) {1, 2, 3};
diff --git a/test/CodeGen/compound-type.c b/test/CodeGen/compound-type.c
index 47eb3a6e57..63ba69460c 100644
--- a/test/CodeGen/compound-type.c
+++ b/test/CodeGen/compound-type.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc < %s -emit-llvm -triple i686-pc-linux-gnu > %t
+// RUN: %clang_cc1 < %s -emit-llvm -triple i686-pc-linux-gnu > %t
// RUN: grep "div i32" %t
// RUN: grep "shl i32" %t
diff --git a/test/CodeGen/compound.c b/test/CodeGen/compound.c
index c546007053..960b2e8b04 100644
--- a/test/CodeGen/compound.c
+++ b/test/CodeGen/compound.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc < %s -emit-llvm
+// RUN: %clang_cc1 < %s -emit-llvm
int A;
long long B;
int C;
diff --git a/test/CodeGen/conditional-gnu-ext.c b/test/CodeGen/conditional-gnu-ext.c
index 1483d8af85..f4ac81bf59 100644
--- a/test/CodeGen/conditional-gnu-ext.c
+++ b/test/CodeGen/conditional-gnu-ext.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
// PR1824
int foo(int x, short y) {
diff --git a/test/CodeGen/conditional.c b/test/CodeGen/conditional.c
index f55d59071a..d079aafd78 100644
--- a/test/CodeGen/conditional.c
+++ b/test/CodeGen/conditional.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
float test1(int cond, float a, float b) {
return cond ? a : b;
diff --git a/test/CodeGen/const-init.c b/test/CodeGen/const-init.c
index 5f196ca5a4..c7a53be02c 100644
--- a/test/CodeGen/const-init.c
+++ b/test/CodeGen/const-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-pc-linux-gnu -ffreestanding -verify -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -ffreestanding -verify -emit-llvm -o - %s | FileCheck %s
#include <stdint.h>
diff --git a/test/CodeGen/const-label-addr.c b/test/CodeGen/const-label-addr.c
index f8c35c6767..9d99f88c8a 100644
--- a/test/CodeGen/const-label-addr.c
+++ b/test/CodeGen/const-label-addr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
int a() {
A:;static void* a = &&A;
}
diff --git a/test/CodeGen/constant-comparison.c b/test/CodeGen/constant-comparison.c
index 3089ae48e6..371cb179f9 100644
--- a/test/CodeGen/constant-comparison.c
+++ b/test/CodeGen/constant-comparison.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -emit-llvm %s -o - 2>&1 | not grep warning
-// RUN: clang-cc -emit-llvm %s -o - | grep @b | count 1
+// RUN: %clang_cc1 -emit-llvm %s -o - 2>&1 | not grep warning
+// RUN: %clang_cc1 -emit-llvm %s -o - | grep @b | count 1
int a, b;
int *c1 = 1 < 2 ? &a : &b;
diff --git a/test/CodeGen/constructor-attribute.c b/test/CodeGen/constructor-attribute.c
index b715201dc5..a1f0e604d4 100644
--- a/test/CodeGen/constructor-attribute.c
+++ b/test/CodeGen/constructor-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep -e "global_ctors.*@A" %t
// RUN: grep -e "global_dtors.*@B" %t
// RUN: grep -e "global_ctors.*@C" %t
diff --git a/test/CodeGen/cxx-condition.cpp b/test/CodeGen/cxx-condition.cpp
index 330a17a10a..5aa0c5e294 100644
--- a/test/CodeGen/cxx-condition.cpp
+++ b/test/CodeGen/cxx-condition.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
void f() {
int a;
diff --git a/test/CodeGen/cxx-default-arg.cpp b/test/CodeGen/cxx-default-arg.cpp
index 8391b9ccae..25b7c10ad1 100644
--- a/test/CodeGen/cxx-default-arg.cpp
+++ b/test/CodeGen/cxx-default-arg.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
// Note: define CLANG_GENERATE_KNOWN_GOOD and compile to generate code
// that makes all of the defaulted arguments explicit. The resulting
diff --git a/test/CodeGen/cxx-value-init.cpp b/test/CodeGen/cxx-value-init.cpp
index e23869879f..6e4cc0388e 100644
--- a/test/CodeGen/cxx-value-init.cpp
+++ b/test/CodeGen/cxx-value-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
enum E {};
int v1 = E();
diff --git a/test/CodeGen/darwin-string-literals.c b/test/CodeGen/darwin-string-literals.c
index 427e9c2e1b..b665321730 100644
--- a/test/CodeGen/darwin-string-literals.c
+++ b/test/CodeGen/darwin-string-literals.c
@@ -1,10 +1,10 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix LSB %s
+// RUN: %clang_cc1 -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix LSB %s
// CHECK-LSB: @.str = private constant [8 x i8] c"string0\00"
// CHECK-LSB: @.str1 = private constant [8 x i8] c"string1\00"
// CHECK-LSB: @.str2 = internal constant [36 x i8] c"h\00e\00l\00l\00o\00 \00\92! \00\03& \00\90! \00w\00o\00r\00l\00d\00\00\00", section "__TEXT,__ustring", align 2
-// RUN: clang-cc -triple powerpc-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix MSB %s
+// RUN: %clang_cc1 -triple powerpc-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix MSB %s
// CHECK-MSB: @.str = private constant [8 x i8] c"string0\00"
// CHECK-MSB: @.str1 = private constant [8 x i8] c"string1\00"
diff --git a/test/CodeGen/debug-info.c b/test/CodeGen/debug-info.c
index d7a54d6439..a84d0b2c6a 100644
--- a/test/CodeGen/debug-info.c
+++ b/test/CodeGen/debug-info.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -o %t -emit-llvm -g %s
+// RUN: %clang_cc1 -o %t -emit-llvm -g %s
// RUN: FileCheck --input-file=%t %s
// PR3023
diff --git a/test/CodeGen/decl.c b/test/CodeGen/decl.c
index f7a001e47c..6d068134b5 100644
--- a/test/CodeGen/decl.c
+++ b/test/CodeGen/decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm < %s | FileCheck %s
// CHECK: @test1.x = internal constant [12 x i32] [i32 1
// CHECK: @test2.x = internal constant [13 x i32] [i32 1,
diff --git a/test/CodeGen/designated-initializers.c b/test/CodeGen/designated-initializers.c
index cc88cef0dc..652238f06d 100644
--- a/test/CodeGen/designated-initializers.c
+++ b/test/CodeGen/designated-initializers.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o %t
// RUN: grep "{ i8\* null, i32 1024 }" %t
// RUN: grep "i32 0, i32 22" %t
diff --git a/test/CodeGen/dllimport-dllexport.c b/test/CodeGen/dllimport-dllexport.c
index 6e259058b7..c7c2420ea7 100644
--- a/test/CodeGen/dllimport-dllexport.c
+++ b/test/CodeGen/dllimport-dllexport.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s -o %t
+// RUN: %clang_cc1 -emit-llvm < %s -o %t
// RUN: grep 'dllexport' %t | count 1
// RUN: not grep 'dllimport' %t
diff --git a/test/CodeGen/dostmt.c b/test/CodeGen/dostmt.c
index 4fb3dcdee9..1a2e02a78e 100644
--- a/test/CodeGen/dostmt.c
+++ b/test/CodeGen/dostmt.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
int bar();
int test0() {
diff --git a/test/CodeGen/emit-all-decls.c b/test/CodeGen/emit-all-decls.c
index 3e7927d8ef..deeb573a38 100644
--- a/test/CodeGen/emit-all-decls.c
+++ b/test/CodeGen/emit-all-decls.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: not grep "@foo" %t
-// RUN: clang-cc -femit-all-decls -emit-llvm -o %t %s
+// RUN: %clang_cc1 -femit-all-decls -emit-llvm -o %t %s
// RUN: grep "@foo" %t
static void foo() {
diff --git a/test/CodeGen/empty-union-init.c b/test/CodeGen/empty-union-init.c
index 8448b3ded7..a58354b772 100644
--- a/test/CodeGen/empty-union-init.c
+++ b/test/CodeGen/empty-union-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s -o -
+// RUN: %clang_cc1 -emit-llvm < %s -o -
// PR2419
struct Mem {
diff --git a/test/CodeGen/enum.c b/test/CodeGen/enum.c
index 172d308c2b..771fc6b182 100644
--- a/test/CodeGen/enum.c
+++ b/test/CodeGen/enum.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis | grep 'ret i32 6'
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis | grep 'ret i32 6'
static enum { foo, bar = 1U } z;
diff --git a/test/CodeGen/exprs.c b/test/CodeGen/exprs.c
index c1a5995dfc..d82cbf48d3 100644
--- a/test/CodeGen/exprs.c
+++ b/test/CodeGen/exprs.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
// PR1895
// sizeof function
diff --git a/test/CodeGen/ext-vector-shuffle.c b/test/CodeGen/ext-vector-shuffle.c
index 88f8c242e8..1d147a3b3e 100644
--- a/test/CodeGen/ext-vector-shuffle.c
+++ b/test/CodeGen/ext-vector-shuffle.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc %s -x cl -emit-llvm -o - | not grep 'extractelement'
-// RUN: clang-cc %s -x cl -emit-llvm -o - | not grep 'insertelement'
-// RUN: clang-cc %s -x cl -emit-llvm -o - | grep 'shufflevector'
+// RUN: %clang_cc1 %s -x cl -emit-llvm -o - | not grep 'extractelement'
+// RUN: %clang_cc1 %s -x cl -emit-llvm -o - | not grep 'insertelement'
+// RUN: %clang_cc1 %s -x cl -emit-llvm -o - | grep 'shufflevector'
typedef __attribute__(( ext_vector_type(2) )) float float2;
typedef __attribute__(( ext_vector_type(4) )) float float4;
diff --git a/test/CodeGen/ext-vector.c b/test/CodeGen/ext-vector.c
index 6a246db635..e322f77bde 100644
--- a/test/CodeGen/ext-vector.c
+++ b/test/CodeGen/ext-vector.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
typedef __attribute__(( ext_vector_type(4) )) float float4;
typedef __attribute__(( ext_vector_type(2) )) float float2;
diff --git a/test/CodeGen/extern-block-var.c b/test/CodeGen/extern-block-var.c
index e8de3e7f11..329f109568 100644
--- a/test/CodeGen/extern-block-var.c
+++ b/test/CodeGen/extern-block-var.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
int f() {
extern int a;
diff --git a/test/CodeGen/flexible-array-init.c b/test/CodeGen/flexible-array-init.c
index bf8f057c2a..36323502a4 100644
--- a/test/CodeGen/flexible-array-init.c
+++ b/test/CodeGen/flexible-array-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm -o - %s | FileCheck %s
struct { int x; int y[]; } a = { 1, 7, 11 };
// CHECK: @a = global %0 { i32 1, [2 x i32] [i32 7, i32 11] }
diff --git a/test/CodeGen/func-decl-cleanup.c b/test/CodeGen/func-decl-cleanup.c
index 4808e12fdf..0af8b69402 100644
--- a/test/CodeGen/func-decl-cleanup.c
+++ b/test/CodeGen/func-decl-cleanup.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
// PR2360
diff --git a/test/CodeGen/func-return-member.c b/test/CodeGen/func-return-member.c
index 68a48fc104..8c55a9671c 100644
--- a/test/CodeGen/func-return-member.c
+++ b/test/CodeGen/func-return-member.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
struct frk { float _Complex c; int x; };
struct faz { struct frk f; };
diff --git a/test/CodeGen/function-attributes.c b/test/CodeGen/function-attributes.c
index b09b28b8d9..8ddaa28eed 100644
--- a/test/CodeGen/function-attributes.c
+++ b/test/CodeGen/function-attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -Os -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm -Os -o - %s | FileCheck %s
// CHECK: define signext i8 @f0(i32 %x) nounwind
// CHECK: define zeroext i8 @f1(i32 %x) nounwind
// CHECK: define void @f2(i8 signext %x) nounwind
diff --git a/test/CodeGen/function-decay.m b/test/CodeGen/function-decay.m
index 4b8e3602d4..161f9079b2 100644
--- a/test/CodeGen/function-decay.m
+++ b/test/CodeGen/function-decay.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
@interface I0 @end
@implementation I0
diff --git a/test/CodeGen/functions.c b/test/CodeGen/functions.c
index 1c53db4119..cb9a4ef81f 100644
--- a/test/CodeGen/functions.c
+++ b/test/CodeGen/functions.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
int g();
diff --git a/test/CodeGen/global-decls.c b/test/CodeGen/global-decls.c
index c7a70fa237..89e899f5ba 100644
--- a/test/CodeGen/global-decls.c
+++ b/test/CodeGen/global-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o %t %s
// RUN: grep '@g0_ext = extern_weak global i32' %t
extern int g0_ext __attribute__((weak));
diff --git a/test/CodeGen/global-init.c b/test/CodeGen/global-init.c
index 2368422f3a..e166fb4465 100644
--- a/test/CodeGen/global-init.c
+++ b/test/CodeGen/global-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - -triple i386-linux-gnu %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - -triple i386-linux-gnu %s | FileCheck %s
// This checks that the global won't be marked as common.
// (It shouldn't because it's being initialized).
diff --git a/test/CodeGen/global-with-initialiser.c b/test/CodeGen/global-with-initialiser.c
index d253782f66..27d209e0ad 100644
--- a/test/CodeGen/global-with-initialiser.c
+++ b/test/CodeGen/global-with-initialiser.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
const int globalInt = 1;
int globalIntWithFloat = 1.5f;
diff --git a/test/CodeGen/globalinit.c b/test/CodeGen/globalinit.c
index b3d0cb54d1..e07a419418 100644
--- a/test/CodeGen/globalinit.c
+++ b/test/CodeGen/globalinit.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
int A[10] = { 1,2,3,4,5 };
diff --git a/test/CodeGen/incomplete-function-type.c b/test/CodeGen/incomplete-function-type.c
index c760e04a08..0ba6633b4a 100644
--- a/test/CodeGen/incomplete-function-type.c
+++ b/test/CodeGen/incomplete-function-type.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
// CHECK: ModuleID
// CHECK-NOT: opaque
// CHECK: define void @f0
diff --git a/test/CodeGen/indirect-goto.c b/test/CodeGen/indirect-goto.c
index 6804f5739b..9fd8cfacec 100644
--- a/test/CodeGen/indirect-goto.c
+++ b/test/CodeGen/indirect-goto.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts -S | grep "ret i32 2520"
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts -S | grep "ret i32 2520"
static int foo(unsigned i) {
void *addrs[] = { &&L1, &&L2, &&L3, &&L4, &&L5 };
diff --git a/test/CodeGen/init-with-member-expr.c b/test/CodeGen/init-with-member-expr.c
index 197a9ab4e3..fdc8c149e5 100644
--- a/test/CodeGen/init-with-member-expr.c
+++ b/test/CodeGen/init-with-member-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc < %s -emit-llvm
+// RUN: %clang_cc1 < %s -emit-llvm
struct test {
int a;
};
diff --git a/test/CodeGen/init.c b/test/CodeGen/init.c
index b0537ae5b0..f6b3536157 100644
--- a/test/CodeGen/init.c
+++ b/test/CodeGen/init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm %s -o %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm %s -o %t
void f1() {
// Scalars in braces.
diff --git a/test/CodeGen/inline2.c b/test/CodeGen/inline2.c
index 304d616857..737b58fa44 100644
--- a/test/CodeGen/inline2.c
+++ b/test/CodeGen/inline2.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -std=gnu89 -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix GNU89 %s
-// RUN: clang-cc -std=c99 -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix C99 %s
+// RUN: %clang_cc1 -std=gnu89 -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix GNU89 %s
+// RUN: %clang_cc1 -std=c99 -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix C99 %s
// CHECK-GNU89: define i32 @f0()
// CHECK-C99: define i32 @f0()
diff --git a/test/CodeGen/int-to-pointer.c b/test/CodeGen/int-to-pointer.c
index 7cefc3902e..242a8a6942 100644
--- a/test/CodeGen/int-to-pointer.c
+++ b/test/CodeGen/int-to-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
void *test(int i)
{
diff --git a/test/CodeGen/kr-func-promote.c b/test/CodeGen/kr-func-promote.c
index d4c3851909..fcdbac3ee4 100644
--- a/test/CodeGen/kr-func-promote.c
+++ b/test/CodeGen/kr-func-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 @a(i32)"
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 @a(i32)"
int a();
int a(x) short x; {return x;}
diff --git a/test/CodeGen/kr-style-block.c b/test/CodeGen/kr-style-block.c
index ac788dc9ab..09efb37927 100644
--- a/test/CodeGen/kr-style-block.c
+++ b/test/CodeGen/kr-style-block.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t -fblocks
+// RUN: %clang_cc1 -emit-llvm %s -o %t -fblocks
void foo (void(^)());
diff --git a/test/CodeGen/libcalls.c b/test/CodeGen/libcalls.c
index 32fc59f27f..fe12f4a08a 100644
--- a/test/CodeGen/libcalls.c
+++ b/test/CodeGen/libcalls.c
@@ -1,7 +1,7 @@
-// RUN: clang-cc -emit-llvm -o %t %s -triple i386-unknown-unknown
+// RUN: %clang_cc1 -emit-llvm -o %t %s -triple i386-unknown-unknown
// RUN: grep "declare " %t | count 6
// RUN: grep "declare " %t | grep "@llvm." | count 1
-// RUN: clang-cc -fno-math-errno -emit-llvm -o %t %s -triple i386-unknown-unknown
+// RUN: %clang_cc1 -fno-math-errno -emit-llvm -o %t %s -triple i386-unknown-unknown
// RUN: grep "declare " %t | count 6
// RUN: grep "declare " %t | grep -v "@llvm." | count 0
diff --git a/test/CodeGen/linkage-redecl.c b/test/CodeGen/linkage-redecl.c
index b015ca8547..09b51f02c1 100644
--- a/test/CodeGen/linkage-redecl.c
+++ b/test/CodeGen/linkage-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - |grep internal
+// RUN: %clang_cc1 -emit-llvm %s -o - |grep internal
// C99 6.2.2p3
// PR3425
diff --git a/test/CodeGen/long-double-x86.c b/test/CodeGen/long-double-x86.c
index b01ce0b93e..f040207e73 100644
--- a/test/CodeGen/long-double-x86.c
+++ b/test/CodeGen/long-double-x86.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep x86_fp80
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep x86_fp80
long double x = 0;
int checksize[sizeof(x) == 16 ? 1 : -1];
diff --git a/test/CodeGen/mandel.c b/test/CodeGen/mandel.c
index 9d7956c56d..8ecf8f2337 100644
--- a/test/CodeGen/mandel.c
+++ b/test/CodeGen/mandel.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
/* Sparc is not C99-compliant */
#if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
diff --git a/test/CodeGen/mangle.c b/test/CodeGen/mangle.c
index 6f42f6f649..a087b42ad2 100644
--- a/test/CodeGen/mangle.c
+++ b/test/CodeGen/mangle.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o - %s | FileCheck %s
// CHECK: @"\01foo"
diff --git a/test/CodeGen/merge-attrs.c b/test/CodeGen/merge-attrs.c
index 1aab47a3a3..474b17225a 100644
--- a/test/CodeGen/merge-attrs.c
+++ b/test/CodeGen/merge-attrs.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
void *malloc(__SIZE_TYPE__ size) __attribute__ ((__nothrow__));
diff --git a/test/CodeGen/merge-statics.c b/test/CodeGen/merge-statics.c
index c442669e64..6716935c4d 100644
--- a/test/CodeGen/merge-statics.c
+++ b/test/CodeGen/merge-statics.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc < %s -emit-llvm | grep internal | count 1
+// RUN: %clang_cc1 < %s -emit-llvm | grep internal | count 1
// The two decls for 'a' should merge into one llvm GlobalVariable.
diff --git a/test/CodeGen/object-size.c b/test/CodeGen/object-size.c
index 45747de6c9..3f89e4c3d8 100644
--- a/test/CodeGen/object-size.c
+++ b/test/CodeGen/object-size.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -emit-llvm %s -o - | FileCheck %s
#define strcpy(dest, src) \
((__builtin_object_size(dest, 0) != -1ULL) \
diff --git a/test/CodeGen/offsetof.c b/test/CodeGen/offsetof.c
index b0f5727a92..c279e2282e 100644
--- a/test/CodeGen/offsetof.c
+++ b/test/CodeGen/offsetof.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
// PR2910
struct sockaddr_un {
diff --git a/test/CodeGen/opaque-pointer.c b/test/CodeGen/opaque-pointer.c
index 7f78b91fb1..d658db111d 100644
--- a/test/CodeGen/opaque-pointer.c
+++ b/test/CodeGen/opaque-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
struct test;
typedef void (*my_func) (struct test *);
diff --git a/test/CodeGen/overloadable.c b/test/CodeGen/overloadable.c
index 4b58c82546..1ed72b19c4 100644
--- a/test/CodeGen/overloadable.c
+++ b/test/CodeGen/overloadable.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | grep _Z1fPA10_1X
+// RUN: %clang_cc1 -emit-llvm %s -o - | grep _Z1fPA10_1X
int __attribute__((overloadable)) f(int x) { return x; }
float __attribute__((overloadable)) f(float x) { return x; }
double __attribute__((overloadable)) f(double x) { return x; }
diff --git a/test/CodeGen/packed-union.c b/test/CodeGen/packed-union.c
index 41dc94c7a4..0aeed008b7 100644
--- a/test/CodeGen/packed-union.c
+++ b/test/CodeGen/packed-union.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -emit-llvm %s -o %t
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-llvm %s -o %t
// RUN: grep "struct._attrs = type <{ i32, i8 }>" %t
typedef struct _attrs {
diff --git a/test/CodeGen/palignr.c b/test/CodeGen/palignr.c
index 41e48bd285..68efb41450 100644
--- a/test/CodeGen/palignr.c
+++ b/test/CodeGen/palignr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=i686-apple-darwin -target-feature +ssse3 -O1 -S -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=i686-apple-darwin -target-feature +ssse3 -O1 -S -o - | FileCheck %s
#define _mm_alignr_epi8(a, b, n) (__builtin_ia32_palignr128((a), (b), (n)))
#define _mm_alignr_pi8(a, b, n) (__builtin_ia32_palignr((a), (b), (n*8)))
diff --git a/test/CodeGen/parameter-passing.c b/test/CodeGen/parameter-passing.c
index 966223a39f..e48815b966 100644
--- a/test/CodeGen/parameter-passing.c
+++ b/test/CodeGen/parameter-passing.c
@@ -5,13 +5,13 @@
// We also check _Bool and empty structures, as these can have annoying
// corner cases.
-// RUN: clang-cc %s -triple i386-unknown-unknown -O3 -emit-llvm -o %t
+// RUN: %clang_cc1 %s -triple i386-unknown-unknown -O3 -emit-llvm -o %t
// RUN: not grep '@g0' %t
-// RUN: clang-cc %s -triple x86_64-unknown-unknown -O3 -emit-llvm -o %t
+// RUN: %clang_cc1 %s -triple x86_64-unknown-unknown -O3 -emit-llvm -o %t
// RUN: not grep '@g0' %t
-// RUN: clang-cc %s -triple powerpc-unknown-unknown -O3 -emit-llvm -o %t
+// RUN: %clang_cc1 %s -triple powerpc-unknown-unknown -O3 -emit-llvm -o %t
// RUN: not grep '@g0' %t
typedef _Bool BoolTy;
diff --git a/test/CodeGen/pascal-string.c b/test/CodeGen/pascal-string.c
index fcd807cde7..0a9ee67ea0 100644
--- a/test/CodeGen/pascal-string.c
+++ b/test/CodeGen/pascal-string.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s -fpascal-strings | grep "05Hello"
+// RUN: %clang_cc1 -emit-llvm -o - %s -fpascal-strings | grep "05Hello"
unsigned char * Foo( void )
{
diff --git a/test/CodeGen/pointer-arithmetic.c b/test/CodeGen/pointer-arithmetic.c
index 5049875dd3..33465e0aa1 100644
--- a/test/CodeGen/pointer-arithmetic.c
+++ b/test/CodeGen/pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -S %s -o -
+// RUN: %clang_cc1 -S %s -o -
typedef int Int;
diff --git a/test/CodeGen/pointer-cmp-type.c b/test/CodeGen/pointer-cmp-type.c
index d88c0911ba..59b271235c 100644
--- a/test/CodeGen/pointer-cmp-type.c
+++ b/test/CodeGen/pointer-cmp-type.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -emit-llvm %s -o - | grep "icmp ult"
+// RUN: %clang_cc1 -emit-llvm %s -o - | grep "icmp ult"
int a(char* a, char* b) {return a<b;}
diff --git a/test/CodeGen/pointer-to-int.c b/test/CodeGen/pointer-to-int.c
index e40bd91d8f..30a6db280d 100644
--- a/test/CodeGen/pointer-to-int.c
+++ b/test/CodeGen/pointer-to-int.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o -
+// RUN: %clang_cc1 -emit-llvm %s -o -
int test(void* i)
{
diff --git a/test/CodeGen/pragma-pack-1.c b/test/CodeGen/pragma-pack-1.c
index bcfcd5ac3a..f5d301639e 100644
--- a/test/CodeGen/pragma-pack-1.c
+++ b/test/CodeGen/pragma-pack-1.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o -
+// RUN: %clang_cc1 -emit-llvm -o -
// PR4610
#pragma pack(4)
diff --git a/test/CodeGen/pragma-pack-2.c b/test/CodeGen/pragma-pack-2.c
index bfc5dc943c..bfb34d7c68 100644
--- a/test/CodeGen/pragma-pack-2.c
+++ b/test/CodeGen/pragma-pack-2.c
@@ -1,8 +1,8 @@
-// RUN: clang-cc -triple i386-apple-darwin9 %s -emit-llvm -o - | FileCheck -check-prefix X32 %s
+// RUN: %clang_cc1 -triple i386-apple-darwin9 %s -emit-llvm -o - | FileCheck -check-prefix X32 %s
// CHECK-X32: %struct.s0 = type { i64, i64, i32, [12 x i32] }
// CHECK-X32: %struct.s1 = type { [15 x i32], %struct.s0 }
-// RUN: clang-cc -triple x86_64-apple-darwin9 %s -emit-llvm -o - | FileCheck -check-prefix X64 %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 %s -emit-llvm -o - | FileCheck -check-prefix X64 %s
// CHECK-X64: %struct.s0 = type <{ i64, i64, i32, [12 x i32] }>
// CHECK-X64: %struct.s1 = type <{ [15 x i32], %struct.s0 }>
diff --git a/test/CodeGen/pragma-pack-3.c b/test/CodeGen/pragma-pack-3.c
index 56a6be3874..676f0d77eb 100644
--- a/test/CodeGen/pragma-pack-3.c
+++ b/test/CodeGen/pragma-pack-3.c
@@ -1,8 +1,8 @@
-// RUN: clang-cc -triple i386-apple-darwin9 %s -emit-llvm -o - | FileCheck -check-prefix X32 %s
+// RUN: %clang_cc1 -triple i386-apple-darwin9 %s -emit-llvm -o - | FileCheck -check-prefix X32 %s
// CHECK-X32: %struct.menu = type <{ i8*, i8, i8 }>
// CHECK-X32: %union.command = type <{ i8*, [2 x i8] }>
-// RUN: clang-cc -triple x86_64-apple-darwin9 %s -emit-llvm -o - | FileCheck -check-prefix X64 %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 %s -emit-llvm -o - | FileCheck -check-prefix X64 %s
// CHECK-X64: %struct.menu = type <{ i8*, i8, i8 }>
// CHECK-X64: %union.command = type <{ i8*, [2 x i8] }>
diff --git a/test/CodeGen/pragma-weak.c b/test/CodeGen/pragma-weak.c
index 497039a8f4..5c2866e3d3 100644
--- a/test/CodeGen/pragma-weak.c
+++ b/test/CodeGen/pragma-weak.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -verify | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -verify | FileCheck %s
// CHECK: @weakvar = weak global
// CHECK: @__weakvar_alias = common global
diff --git a/test/CodeGen/predefined-expr.c b/test/CodeGen/predefined-expr.c
index 1a5dcb4fc6..9be5754114 100644
--- a/test/CodeGen/predefined-expr.c
+++ b/test/CodeGen/predefined-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// CHECK: @__func__.plainFunction = private constant [14 x i8] c"plainFunction\00"
// CHECK: @__PRETTY_FUNCTION__.plainFunction = private constant [21 x i8] c"void plainFunction()\00"
diff --git a/test/CodeGen/private-extern.c b/test/CodeGen/private-extern.c
index a9bb28bfad..2d34d54321 100644
--- a/test/CodeGen/private-extern.c
+++ b/test/CodeGen/private-extern.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep '@g0 = external hidden constant i32' %t
// RUN: grep '@g1 = hidden constant i32 1' %t
diff --git a/test/CodeGen/rdr-6098585-default-after-caserange.c b/test/CodeGen/rdr-6098585-default-after-caserange.c
index 2c58548744..3a89aa39a0 100644
--- a/test/CodeGen/rdr-6098585-default-after-caserange.c
+++ b/test/CodeGen/rdr-6098585-default-after-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
// RUN: grep "ret i32" %t | count 1
// RUN: grep "ret i32 10" %t | count 1
diff --git a/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c b/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
index 257a9d7f8a..ba41b519fc 100644
--- a/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
+++ b/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
// RUN: grep "ret i32 10" %t
// Ensure that this doesn't compile to infinite loop in g() due to
diff --git a/test/CodeGen/rdr-6098585-empty-case-range.c b/test/CodeGen/rdr-6098585-empty-case-range.c
index 2dd1eaac9d..1cf77ac6aa 100644
--- a/test/CodeGen/rdr-6098585-empty-case-range.c
+++ b/test/CodeGen/rdr-6098585-empty-case-range.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
// RUN: grep "ret i32" %t | count 2
// RUN: grep "ret i32 3" %t | count 2
diff --git a/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c b/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
index c12cf82ba0..48a6cc2285 100644
--- a/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
+++ b/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
// RUN: grep "ret i32 %" %t
// Make sure return is not constant (if empty range is skipped or miscompiled)
diff --git a/test/CodeGen/rdr-6098585-unsigned-caserange.c b/test/CodeGen/rdr-6098585-unsigned-caserange.c
index a2b85d9895..6f577df188 100644
--- a/test/CodeGen/rdr-6098585-unsigned-caserange.c
+++ b/test/CodeGen/rdr-6098585-unsigned-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t
// RUN: grep "ret i32" %t | count 1
// RUN: grep "ret i32 3" %t | count 1
diff --git a/test/CodeGen/rdr-6732143-dangling-block-reference.m b/test/CodeGen/rdr-6732143-dangling-block-reference.m
index 90641dd083..b4d21a3f8f 100644
--- a/test/CodeGen/rdr-6732143-dangling-block-reference.m
+++ b/test/CodeGen/rdr-6732143-dangling-block-reference.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -triple x86_64-apple-darwin9 -emit-llvm %s -o -
+// RUN: %clang_cc1 -triple x86_64-apple-darwin9 -emit-llvm %s -o -
void f0(id x) {
@synchronized (x) {
diff --git a/test/CodeGen/regparm.c b/test/CodeGen/regparm.c
index 28dfae7f62..ac3797547d 100644
--- a/test/CodeGen/regparm.c
+++ b/test/CodeGen/regparm.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep inreg | count 2
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o - | grep inreg | count 2
#define FASTCALL __attribute__((regparm(2)))
diff --git a/test/CodeGen/shared-string-literals.c b/test/CodeGen/shared-string-literals.c
index a05975b4ae..00636b0f55 100644
--- a/test/CodeGen/shared-string-literals.c
+++ b/test/CodeGen/shared-string-literals.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
char *globalString = "abc";
char *globalStringArray[5] = { "123", "abc" };
diff --git a/test/CodeGen/sizeof-vla.c b/test/CodeGen/sizeof-vla.c
index af5088553e..b0c514fd01 100644
--- a/test/CodeGen/sizeof-vla.c
+++ b/test/CodeGen/sizeof-vla.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o %t %s
// PR3442
diff --git a/test/CodeGen/stack-protector.c b/test/CodeGen/stack-protector.c
index 57635976d0..eb4cea2117 100644
--- a/test/CodeGen/stack-protector.c
+++ b/test/CodeGen/stack-protector.c
@@ -1,8 +1,8 @@
-// RUN: clang-cc -emit-llvm -o - %s -stack-protector 0 | FileCheck -check-prefix=NOSSP %s
+// RUN: %clang_cc1 -emit-llvm -o - %s -stack-protector 0 | FileCheck -check-prefix=NOSSP %s
// NOSSP: define void @test1(i8* %msg) nounwind {
-// RUN: clang-cc -emit-llvm -o - %s -stack-protector 1 | FileCheck -check-prefix=WITHSSP %s
+// RUN: %clang_cc1 -emit-llvm -o - %s -stack-protector 1 | FileCheck -check-prefix=WITHSSP %s
// WITHSSP: define void @test1(i8* %msg) nounwind ssp {
-// RUN: clang-cc -emit-llvm -o - %s -stack-protector 2 | FileCheck -check-prefix=SSPREQ %s
+// RUN: %clang_cc1 -emit-llvm -o - %s -stack-protector 2 | FileCheck -check-prefix=SSPREQ %s
// SSPREQ: define void @test1(i8* %msg) nounwind sspreq {
int printf(const char * _Format, ...);
diff --git a/test/CodeGen/statements.c b/test/CodeGen/statements.c
index 45bbd9ac02..e3835f062a 100644
--- a/test/CodeGen/statements.c
+++ b/test/CodeGen/statements.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc < %s -emit-llvm
+// RUN: %clang_cc1 < %s -emit-llvm
void test1(int x) {
switch (x) {
diff --git a/test/CodeGen/static-forward-decl-fun.c b/test/CodeGen/static-forward-decl-fun.c
index a945df3d3b..e33ee621b3 100644
--- a/test/CodeGen/static-forward-decl-fun.c
+++ b/test/CodeGen/static-forward-decl-fun.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
static int staticfun(void);
int (*staticuse1)(void) = staticfun;
diff --git a/test/CodeGen/static-forward-decl.c b/test/CodeGen/static-forward-decl.c
index f12c22fb41..0d35061279 100644
--- a/test/CodeGen/static-forward-decl.c
+++ b/test/CodeGen/static-forward-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep "global i32 10"
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep "global i32 10"
static int i;
int*j=&i;
diff --git a/test/CodeGen/static-local-union.c b/test/CodeGen/static-local-union.c
index f276b200eb..bd32519e43 100644
--- a/test/CodeGen/static-local-union.c
+++ b/test/CodeGen/static-local-union.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s
+// RUN: %clang_cc1 -emit-llvm < %s
int a() {static union{int a;} r[2] = {1,2};return r[1].a;}
diff --git a/test/CodeGen/static-order.c b/test/CodeGen/static-order.c
index 58340b6913..e7f9814261 100644
--- a/test/CodeGen/static-order.c
+++ b/test/CodeGen/static-order.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
// CHECK: ModuleID
// CHECK-NOT: zeroinitializer
// CHECK: define i8* @f
diff --git a/test/CodeGen/staticinit.c b/test/CodeGen/staticinit.c
index 8b87ccd6b9..cd1f059e57 100644
--- a/test/CodeGen/staticinit.c
+++ b/test/CodeGen/staticinit.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o %t %s
// RUN: grep "g.b = internal global i8. getelementptr" %t
struct AStruct {
diff --git a/test/CodeGen/stdcall-fastcall.c b/test/CodeGen/stdcall-fastcall.c
index 11b652178c..838ccfb48c 100644
--- a/test/CodeGen/stdcall-fastcall.c
+++ b/test/CodeGen/stdcall-fastcall.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -emit-llvm < %s | grep 'fastcallcc' | count 4
-// RUN: clang-cc -emit-llvm < %s | grep 'stdcallcc' | count 4
+// RUN: %clang_cc1 -emit-llvm < %s | grep 'fastcallcc' | count 4
+// RUN: %clang_cc1 -emit-llvm < %s | grep 'stdcallcc' | count 4
void __attribute__((fastcall)) f1(void);
void __attribute__((stdcall)) f2(void);
diff --git a/test/CodeGen/string-literal.c b/test/CodeGen/string-literal.c
index a4011938c1..22a81e7185 100644
--- a/test/CodeGen/string-literal.c
+++ b/test/CodeGen/string-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o -
+// RUN: %clang_cc1 -emit-llvm %s -o -
int main() {
char a[10] = "abc";
diff --git a/test/CodeGen/struct-comma.c b/test/CodeGen/struct-comma.c
index d7f50da131..e5b5151438 100644
--- a/test/CodeGen/struct-comma.c
+++ b/test/CodeGen/struct-comma.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
struct S {int a, b;} x;
void a(struct S* b) {*b = (r(), x);}
diff --git a/test/CodeGen/struct-copy.c b/test/CodeGen/struct-copy.c
index 62c29aba6c..6f3b6643f0 100644
--- a/test/CodeGen/struct-copy.c
+++ b/test/CodeGen/struct-copy.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | grep 'call.*llvm.memcpy'
+// RUN: %clang_cc1 -emit-llvm %s -o - | grep 'call.*llvm.memcpy'
struct x { int a[100]; };
diff --git a/test/CodeGen/struct-init.c b/test/CodeGen/struct-init.c
index cb84fef4d1..88b57a2647 100644
--- a/test/CodeGen/struct-init.c
+++ b/test/CodeGen/struct-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
typedef struct _zend_ini_entry zend_ini_entry;
struct _zend_ini_entry {
diff --git a/test/CodeGen/struct-passing.c b/test/CodeGen/struct-passing.c
index 772077a596..b351d8148e 100644
--- a/test/CodeGen/struct-passing.c
+++ b/test/CodeGen/struct-passing.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-pc-linux-gnu -emit-llvm -o %t %s
// RUN: grep 'declare i32 @f0() readnone$' %t
// RUN: grep 'declare i32 @f1() readonly$' %t
// RUN: grep 'declare void @f2(.* noalias sret)$' %t
diff --git a/test/CodeGen/struct-x86-darwin.c b/test/CodeGen/struct-x86-darwin.c
index e7822f073d..afdcb8a39a 100644
--- a/test/CodeGen/struct-x86-darwin.c
+++ b/test/CodeGen/struct-x86-darwin.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc < %s -emit-llvm > %t1 -triple=i686-apple-darwin9
+// RUN: %clang_cc1 < %s -emit-llvm > %t1 -triple=i686-apple-darwin9
// RUN: grep "STest1 = type { i32, \[4 x i16\], double }" %t1
// RUN: grep "STest2 = type { i16, i16, i32, i32 }" %t1
// RUN: grep "STest3 = type { i8, i16, i32 }" %t1
diff --git a/test/CodeGen/struct.c b/test/CodeGen/struct.c
index d1e58a2445..25477a052e 100644
--- a/test/CodeGen/struct.c
+++ b/test/CodeGen/struct.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o -
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s -emit-llvm -o -
struct {
int x;
diff --git a/test/CodeGen/switch.c b/test/CodeGen/switch.c
index 96118f6e6f..519ccbac01 100644
--- a/test/CodeGen/switch.c
+++ b/test/CodeGen/switch.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -O3 %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -O3 %s -emit-llvm -o - | FileCheck %s
int foo(int i) {
int j = 0;
diff --git a/test/CodeGen/target-data.c b/test/CodeGen/target-data.c
index 26775f9811..8139a4efc5 100644
--- a/test/CodeGen/target-data.c
+++ b/test/CodeGen/target-data.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple i686-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i686-unknown-unknown -emit-llvm -o %t %s
// RUN: grep 'target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32"' %t
-// RUN: clang-cc -triple i686-apple-darwin9 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i686-apple-darwin9 -emit-llvm -o %t %s
// RUN: grep 'target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32"' %t
-// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o %t %s
// RUN: grep 'target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"' %t
diff --git a/test/CodeGen/tentative-decls.c b/test/CodeGen/tentative-decls.c
index b72c5850ac..d88c346d7c 100644
--- a/test/CodeGen/tentative-decls.c
+++ b/test/CodeGen/tentative-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep '@r = common global \[1 x .*\] zeroinitializer' %t
diff --git a/test/CodeGen/thread-specifier.c b/test/CodeGen/thread-specifier.c
index 456f7a6d97..b1e1ed8464 100644
--- a/test/CodeGen/thread-specifier.c
+++ b/test/CodeGen/thread-specifier.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i686-pc-linux-gnu -emit-llvm -o - %s | grep thread_local | count 4
+// RUN: %clang_cc1 -triple i686-pc-linux-gnu -emit-llvm -o - %s | grep thread_local | count 4
__thread int a;
extern __thread int b;
diff --git a/test/CodeGen/trapv.c b/test/CodeGen/trapv.c
index 6045ed908d..d10d6176bf 100644
--- a/test/CodeGen/trapv.c
+++ b/test/CodeGen/trapv.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -ftrapv %s -emit-llvm -o %t
+// RUN: %clang_cc1 -ftrapv %s -emit-llvm -o %t
// RUN: grep "__overflow_handler" %t | count 2
unsigned int ui, uj, uk;
diff --git a/test/CodeGen/typedef-func.c b/test/CodeGen/typedef-func.c
index a64426ddb2..bc08b359d7 100644
--- a/test/CodeGen/typedef-func.c
+++ b/test/CodeGen/typedef-func.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s
+// RUN: %clang_cc1 -emit-llvm < %s
// PR2414
struct mad_frame{};
diff --git a/test/CodeGen/typedef.c b/test/CodeGen/typedef.c
index 3bdd52f6c5..4af9d819f0 100644
--- a/test/CodeGen/typedef.c
+++ b/test/CodeGen/typedef.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o -
+// RUN: %clang_cc1 -emit-llvm %s -o -
typedef struct { int i; } Value;
typedef Value *PValue;
diff --git a/test/CodeGen/types.c b/test/CodeGen/types.c
index 75cb851c25..55b806c93a 100644
--- a/test/CodeGen/types.c
+++ b/test/CodeGen/types.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm <%s
+// RUN: %clang_cc1 -emit-llvm <%s
struct FileName {
struct FileName *next;
diff --git a/test/CodeGen/uint128_t.c b/test/CodeGen/uint128_t.c
index b3bf727962..92cb5faba4 100644
--- a/test/CodeGen/uint128_t.c
+++ b/test/CodeGen/uint128_t.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -triple=x86_64-apple-darwin9
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-apple-darwin9
typedef unsigned long long uint64_t;
extern uint64_t numer;
diff --git a/test/CodeGen/union-init.c b/test/CodeGen/union-init.c
index f4e9e9a08f..60906b533d 100644
--- a/test/CodeGen/union-init.c
+++ b/test/CodeGen/union-init.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s -o -
+// RUN: %clang_cc1 -emit-llvm < %s -o -
// A nice and complicated initialization example with unions from Python
typedef int Py_ssize_t;
diff --git a/test/CodeGen/union-init2.c b/test/CodeGen/union-init2.c
index e782425cf2..ac469cd4b5 100644
--- a/test/CodeGen/union-init2.c
+++ b/test/CodeGen/union-init2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple i686-pc-linux-gnu | grep "bitcast (%0\* @r to %union.x\*), \[4 x i8\] undef"
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple i686-pc-linux-gnu | grep "bitcast (%0\* @r to %union.x\*), \[4 x i8\] undef"
// Make sure we generate something sane instead of a ptrtoint
union x {long long b;union x* a;} r = {.a = &r};
diff --git a/test/CodeGen/union.c b/test/CodeGen/union.c
index 4884690f3f..b40a405597 100644
--- a/test/CodeGen/union.c
+++ b/test/CodeGen/union.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
union u_tag {
int a;
diff --git a/test/CodeGen/unreachable.c b/test/CodeGen/unreachable.c
index 3f39a27def..5e9fa6a545 100644
--- a/test/CodeGen/unreachable.c
+++ b/test/CodeGen/unreachable.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep '@unreachable' %t | count 0
extern void abort() __attribute__((noreturn));
diff --git a/test/CodeGen/unwind-attr.c b/test/CodeGen/unwind-attr.c
index 1148ba1031..ee3199d274 100644
--- a/test/CodeGen/unwind-attr.c
+++ b/test/CodeGen/unwind-attr.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -fexceptions -emit-llvm -o - %s | grep "@foo()" | not grep nounwind
-// RUN: clang-cc -emit-llvm -o - %s | grep "@foo()" | grep nounwind
+// RUN: %clang_cc1 -fexceptions -emit-llvm -o - %s | grep "@foo()" | not grep nounwind
+// RUN: %clang_cc1 -emit-llvm -o - %s | grep "@foo()" | grep nounwind
int foo(void) {
return 0;
diff --git a/test/CodeGen/var-align.c b/test/CodeGen/var-align.c
index b0b62ae264..fefd35ab63 100644
--- a/test/CodeGen/var-align.c
+++ b/test/CodeGen/var-align.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | grep "align 16" | count 2
+// RUN: %clang_cc1 -emit-llvm %s -o - | grep "align 16" | count 2
__attribute((aligned(16))) float a[128];
union {int a[4]; __attribute((aligned(16))) float b[4];} u;
diff --git a/test/CodeGen/variable-array.c b/test/CodeGen/variable-array.c
index f5621c289d..80ca78d5cf 100644
--- a/test/CodeGen/variable-array.c
+++ b/test/CodeGen/variable-array.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep puts | count 4
+// RUN: %clang_cc1 -emit-llvm < %s | grep puts | count 4
// PR3248
int a(int x)
diff --git a/test/CodeGen/vector.c b/test/CodeGen/vector.c
index 21a03d0593..21d63ec144 100644
--- a/test/CodeGen/vector.c
+++ b/test/CodeGen/vector.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -mcpu pentium4 -g -emit-llvm %s -o -
+// RUN: %clang_cc1 -triple i386-apple-darwin9 -mcpu pentium4 -g -emit-llvm %s -o -
typedef short __v4hi __attribute__ ((__vector_size__ (8)));
void test1() {
diff --git a/test/CodeGen/vfprintf.c b/test/CodeGen/vfprintf.c
index 89261c7469..7c583b5885 100644
--- a/test/CodeGen/vfprintf.c
+++ b/test/CodeGen/vfprintf.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only %s
+// RUN: %clang_cc1 -emit-llvm-only %s
typedef struct _IO_FILE FILE;
int vfprintf(FILE*restrict,const char*restrict, __builtin_va_list);
diff --git a/test/CodeGen/visibility.c b/test/CodeGen/visibility.c
index c19004a5a2..8f81c8f3a9 100644
--- a/test/CodeGen/visibility.c
+++ b/test/CodeGen/visibility.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-unknown-unknown -fvisibility default -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -fvisibility default -emit-llvm -o %t %s
// RUN: grep '@g_com = common global i32 0' %t
// RUN: grep '@g_def = global i32 0' %t
// RUN: grep '@g_ext = external global i32' %t
@@ -6,7 +6,7 @@
// RUN: grep 'declare void @f_ext()' %t
// RUN: grep 'define internal void @f_deferred()' %t
// RUN: grep 'define i32 @f_def()' %t
-// RUN: clang-cc -triple i386-unknown-unknown -fvisibility protected -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -fvisibility protected -emit-llvm -o %t %s
// RUN: grep '@g_com = common protected global i32 0' %t
// RUN: grep '@g_def = protected global i32 0' %t
// RUN: grep '@g_ext = external global i32' %t
@@ -14,7 +14,7 @@
// RUN: grep 'declare void @f_ext()' %t
// RUN: grep 'define internal void @f_deferred()' %t
// RUN: grep 'define protected i32 @f_def()' %t
-// RUN: clang-cc -triple i386-unknown-unknown -fvisibility hidden -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown -fvisibility hidden -emit-llvm -o %t %s
// RUN: grep '@g_com = common hidden global i32 0' %t
// RUN: grep '@g_def = hidden global i32 0' %t
// RUN: grep '@g_ext = external global i32' %t
diff --git a/test/CodeGen/vla.c b/test/CodeGen/vla.c
index 844e49e72c..0c53900384 100644
--- a/test/CodeGen/vla.c
+++ b/test/CodeGen/vla.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
int b(char* x);
diff --git a/test/CodeGen/volatile-1.c b/test/CodeGen/volatile-1.c
index 3203326ece..e0c672b41e 100644
--- a/test/CodeGen/volatile-1.c
+++ b/test/CodeGen/volatile-1.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -Wno-unused-value -emit-llvm < %s -o %t
+// RUN: %clang_cc1 -Wno-unused-value -emit-llvm < %s -o %t
// RUN: grep volatile %t | count 145
// RUN: grep memcpy %t | count 4
diff --git a/test/CodeGen/volatile.c b/test/CodeGen/volatile.c
index a0cc891ccd..db87a37515 100644
--- a/test/CodeGen/volatile.c
+++ b/test/CodeGen/volatile.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s -o %t
+// RUN: %clang_cc1 -emit-llvm < %s -o %t
// RUN: grep volatile %t | count 29
// RUN: grep memcpy %t | count 7
diff --git a/test/CodeGen/weak-global.c b/test/CodeGen/weak-global.c
index d4ee52f489..f972cea912 100644
--- a/test/CodeGen/weak-global.c
+++ b/test/CodeGen/weak-global.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -emit-llvm < %s | grep common
+// RUN: %clang_cc1 -emit-llvm < %s | grep common
int i;
diff --git a/test/CodeGen/weak-incomplete.c b/test/CodeGen/weak-incomplete.c
index a15dbac03c..af91ae7eb5 100644
--- a/test/CodeGen/weak-incomplete.c
+++ b/test/CodeGen/weak-incomplete.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm < %s | grep 'extern_weak' | count 1
+// RUN: %clang_cc1 -emit-llvm < %s | grep 'extern_weak' | count 1
struct S;
void __attribute__((weak)) foo1(struct S);
diff --git a/test/CodeGen/whilestmt.c b/test/CodeGen/whilestmt.c
index 95e18f4d21..3973b2860d 100644
--- a/test/CodeGen/whilestmt.c
+++ b/test/CodeGen/whilestmt.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
int bar();
int foo() {
diff --git a/test/CodeGen/writable-strings.c b/test/CodeGen/writable-strings.c
index c8b70d5f05..693fa5ea24 100644
--- a/test/CodeGen/writable-strings.c
+++ b/test/CodeGen/writable-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - -fwritable-strings %s
+// RUN: %clang_cc1 -emit-llvm -o - -fwritable-strings %s
int main() {
char *str = "abc";
diff --git a/test/CodeGen/x86.c b/test/CodeGen/x86.c
index 0420a4cd97..e97d537d33 100644
--- a/test/CodeGen/x86.c
+++ b/test/CodeGen/x86.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1
+// RUN: %clang_cc1 %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1
// RUN: grep "ax" %t1
// RUN: grep "bx" %t1
// RUN: grep "cx" %t1
diff --git a/test/CodeGen/x86_32-arguments.c b/test/CodeGen/x86_32-arguments.c
index 33f635c31a..eb98e1a228 100644
--- a/test/CodeGen/x86_32-arguments.c
+++ b/test/CodeGen/x86_32-arguments.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fblocks -triple i386-apple-darwin9 -emit-llvm -o %t %s
+// RUN: %clang_cc1 -fblocks -triple i386-apple-darwin9 -emit-llvm -o %t %s
// RUN: grep 'define signext i8 @f0()' %t
// RUN: grep 'define signext i16 @f1()' %t
// RUN: grep 'define i32 @f2()' %t
diff --git a/test/CodeGen/x86_64-arguments.c b/test/CodeGen/x86_64-arguments.c
index 1a848ead35..d6b9b29360 100644
--- a/test/CodeGen/x86_64-arguments.c
+++ b/test/CodeGen/x86_64-arguments.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o %t %s
// RUN: grep 'define signext i8 @f0()' %t
// RUN: grep 'define signext i16 @f1()' %t
// RUN: grep 'define i32 @f2()' %t