summaryrefslogtreecommitdiffstats
path: root/clang/test/CodeGenCXX
diff options
context:
space:
mode:
Diffstat (limited to 'clang/test/CodeGenCXX')
-rw-r--r--clang/test/CodeGenCXX/PR4827-cast.cpp2
-rw-r--r--clang/test/CodeGenCXX/PR4890-debug-info-dtor.cpp2
-rw-r--r--clang/test/CodeGenCXX/PR4983-constructor-conversion.cpp2
-rw-r--r--clang/test/CodeGenCXX/PR5050-constructor-conversion.cpp4
-rw-r--r--clang/test/CodeGenCXX/PR5093-static-member-function.cpp2
-rw-r--r--clang/test/CodeGenCXX/__null.cpp2
-rw-r--r--clang/test/CodeGenCXX/address-of-fntemplate.cpp2
-rw-r--r--clang/test/CodeGenCXX/anonymous-namespaces.cpp2
-rw-r--r--clang/test/CodeGenCXX/anonymous-union-member-initializer.cpp2
-rw-r--r--clang/test/CodeGenCXX/array-construction.cpp4
-rw-r--r--clang/test/CodeGenCXX/array-operator-delete-call.cpp4
-rw-r--r--clang/test/CodeGenCXX/array-pointer-decay.cpp2
-rw-r--r--clang/test/CodeGenCXX/array-value-initialize.cpp2
-rw-r--r--clang/test/CodeGenCXX/assign-operator.cpp2
-rw-r--r--clang/test/CodeGenCXX/attr.cpp2
-rw-r--r--clang/test/CodeGenCXX/call-arg-zero-temp.cpp4
-rw-r--r--clang/test/CodeGenCXX/cast-conversion.cpp4
-rw-r--r--clang/test/CodeGenCXX/casts.cpp2
-rw-r--r--clang/test/CodeGenCXX/class-layout.cpp2
-rw-r--r--clang/test/CodeGenCXX/condition.cpp2
-rw-r--r--clang/test/CodeGenCXX/conditional-expr-lvalue.cpp2
-rw-r--r--clang/test/CodeGenCXX/conditional-temporaries.cpp2
-rw-r--r--clang/test/CodeGenCXX/const-global-linkage.cpp2
-rw-r--r--clang/test/CodeGenCXX/const-init.cpp2
-rw-r--r--clang/test/CodeGenCXX/constructor-conversion.cpp4
-rw-r--r--clang/test/CodeGenCXX/constructor-default-arg.cpp4
-rw-r--r--clang/test/CodeGenCXX/constructor-for-array-members.cpp4
-rw-r--r--clang/test/CodeGenCXX/constructor-init-reference.cpp2
-rw-r--r--clang/test/CodeGenCXX/constructor-init.cpp2
-rw-r--r--clang/test/CodeGenCXX/constructor-template.cpp4
-rw-r--r--clang/test/CodeGenCXX/conversion-function.cpp4
-rw-r--r--clang/test/CodeGenCXX/conversion-operator-base.cpp2
-rw-r--r--clang/test/CodeGenCXX/convert-to-fptr.cpp4
-rw-r--r--clang/test/CodeGenCXX/copy-assign-synthesis-1.cpp4
-rw-r--r--clang/test/CodeGenCXX/copy-assign-synthesis-2.cpp2
-rw-r--r--clang/test/CodeGenCXX/copy-assign-synthesis-3.cpp2
-rw-r--r--clang/test/CodeGenCXX/copy-assign-synthesis.cpp2
-rw-r--r--clang/test/CodeGenCXX/copy-constructor-elim.cpp2
-rw-r--r--clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp2
-rw-r--r--clang/test/CodeGenCXX/copy-constructor-synthesis.cpp4
-rw-r--r--clang/test/CodeGenCXX/debug-info.cpp2
-rw-r--r--clang/test/CodeGenCXX/decl-ref-init.cpp4
-rw-r--r--clang/test/CodeGenCXX/default-arg-temps.cpp2
-rw-r--r--clang/test/CodeGenCXX/default-arguments.cpp2
-rw-r--r--clang/test/CodeGenCXX/default-constructor-default-argument.cpp2
-rw-r--r--clang/test/CodeGenCXX/default-constructor-for-members.cpp4
-rw-r--r--clang/test/CodeGenCXX/default-constructor-template-member.cpp2
-rw-r--r--clang/test/CodeGenCXX/default-destructor-synthesis.cpp4
-rw-r--r--clang/test/CodeGenCXX/delete-two-arg.cpp2
-rw-r--r--clang/test/CodeGenCXX/delete.cpp2
-rw-r--r--clang/test/CodeGenCXX/derived-to-base-conv.cpp4
-rw-r--r--clang/test/CodeGenCXX/derived-to-base.cpp2
-rw-r--r--clang/test/CodeGenCXX/destructor-calls.cpp2
-rw-r--r--clang/test/CodeGenCXX/destructors.cpp2
-rw-r--r--clang/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp2
-rw-r--r--clang/test/CodeGenCXX/dyncast.cpp2
-rw-r--r--clang/test/CodeGenCXX/eh.cpp2
-rw-r--r--clang/test/CodeGenCXX/elide-call-reference.cpp2
-rw-r--r--clang/test/CodeGenCXX/empty-union.cpp2
-rw-r--r--clang/test/CodeGenCXX/enum.cpp2
-rw-r--r--clang/test/CodeGenCXX/eval-recursive-constant.cpp2
-rw-r--r--clang/test/CodeGenCXX/exceptions.cpp2
-rw-r--r--clang/test/CodeGenCXX/explicit-instantiation.cpp2
-rw-r--r--clang/test/CodeGenCXX/expr.cpp2
-rw-r--r--clang/test/CodeGenCXX/extern-c.cpp2
-rw-r--r--clang/test/CodeGenCXX/function-template-explicit-specialization.cpp2
-rw-r--r--clang/test/CodeGenCXX/function-template-specialization.cpp2
-rw-r--r--clang/test/CodeGenCXX/global-array-destruction.cpp2
-rw-r--r--clang/test/CodeGenCXX/global-init.cpp2
-rw-r--r--clang/test/CodeGenCXX/global-llvm-constant.cpp2
-rw-r--r--clang/test/CodeGenCXX/implicit-instantiation-1.cpp2
-rw-r--r--clang/test/CodeGenCXX/init-incomplete-type.cpp2
-rw-r--r--clang/test/CodeGenCXX/inline-functions.cpp2
-rw-r--r--clang/test/CodeGenCXX/instantiate-init-list.cpp2
-rw-r--r--clang/test/CodeGenCXX/key-function-vtable.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle-extern-local.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle-extreme.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle-subst-std.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle-subst.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle-system-header.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle-template.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle-unnamed.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-call-parens.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-expressions.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-function-pointers.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-functions.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-init-struct.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-init-union.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-pointer-cast.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-pointer-type-convert.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-pointers-zero-init.cpp2
-rw-r--r--clang/test/CodeGenCXX/member-templates.cpp2
-rw-r--r--clang/test/CodeGenCXX/namespace-aliases.cpp2
-rw-r--r--clang/test/CodeGenCXX/nested-base-member-access.cpp2
-rw-r--r--clang/test/CodeGenCXX/new-operator-phi.cpp2
-rw-r--r--clang/test/CodeGenCXX/new-with-default-arg.cpp2
-rw-r--r--clang/test/CodeGenCXX/new.cpp2
-rw-r--r--clang/test/CodeGenCXX/nullptr.cpp2
-rw-r--r--clang/test/CodeGenCXX/overload-binop-implicitconvert.cpp2
-rw-r--r--clang/test/CodeGenCXX/predefined-expr-sizeof.cpp2
-rw-r--r--clang/test/CodeGenCXX/predefined-expr.cpp2
-rw-r--r--clang/test/CodeGenCXX/ptr-to-datamember.cpp2
-rw-r--r--clang/test/CodeGenCXX/ptr-to-member-function.cpp4
-rw-r--r--clang/test/CodeGenCXX/reference-field.cpp2
-rw-r--r--clang/test/CodeGenCXX/reference-init.cpp2
-rw-r--r--clang/test/CodeGenCXX/references.cpp2
-rw-r--r--clang/test/CodeGenCXX/reinterpret-cast.cpp4
-rw-r--r--clang/test/CodeGenCXX/rtti-linkage.cpp2
-rw-r--r--clang/test/CodeGenCXX/rtti.cpp4
-rw-r--r--clang/test/CodeGenCXX/static-assert.cpp2
-rw-r--r--clang/test/CodeGenCXX/static-data-member.cpp2
-rw-r--r--clang/test/CodeGenCXX/static-init-1.cpp2
-rw-r--r--clang/test/CodeGenCXX/static-init-2.cpp2
-rw-r--r--clang/test/CodeGenCXX/static-init.cpp2
-rw-r--r--clang/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp2
-rw-r--r--clang/test/CodeGenCXX/temp-order.cpp2
-rw-r--r--clang/test/CodeGenCXX/template-anonymous-union-member-initializer.cpp2
-rw-r--r--clang/test/CodeGenCXX/template-linkage.cpp2
-rw-r--r--clang/test/CodeGenCXX/temporaries.cpp4
-rw-r--r--clang/test/CodeGenCXX/throw-expressions.cpp2
-rw-r--r--clang/test/CodeGenCXX/trivial-constructor-init.cpp4
-rw-r--r--clang/test/CodeGenCXX/unary-type-trait.cpp2
-rw-r--r--clang/test/CodeGenCXX/vararg-conversion-ctor.cpp2
-rw-r--r--clang/test/CodeGenCXX/virt-call-offsets.cpp2
-rw-r--r--clang/test/CodeGenCXX/virt-canonical-decl.cpp2
-rw-r--r--clang/test/CodeGenCXX/virt-dtor-gen.cpp2
-rw-r--r--clang/test/CodeGenCXX/virt-dtor-key.cpp2
-rw-r--r--clang/test/CodeGenCXX/virt-template-vtable.cpp2
-rw-r--r--clang/test/CodeGenCXX/virt-thunk-reference.cpp2
-rw-r--r--clang/test/CodeGenCXX/virt.cpp4
-rw-r--r--clang/test/CodeGenCXX/virtual-base-cast.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-base-destructor-call.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-bases.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-destructor-calls.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-destructor-synthesis.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-function-calls.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-functions-incomplete-types.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-inherited-destructor.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-operator-call.cpp2
-rw-r--r--clang/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp2
-rw-r--r--clang/test/CodeGenCXX/vtable-cast-crash.cpp2
-rw-r--r--clang/test/CodeGenCXX/vtable-key-function.cpp2
-rw-r--r--clang/test/CodeGenCXX/vtable-linkage.cpp2
-rw-r--r--clang/test/CodeGenCXX/x86_64-arguments.cpp2
146 files changed, 169 insertions, 169 deletions
diff --git a/clang/test/CodeGenCXX/PR4827-cast.cpp b/clang/test/CodeGenCXX/PR4827-cast.cpp
index 958798d77f6..34a840cbdf5 100644
--- a/clang/test/CodeGenCXX/PR4827-cast.cpp
+++ b/clang/test/CodeGenCXX/PR4827-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
struct A;
struct B;
extern A *f();
diff --git a/clang/test/CodeGenCXX/PR4890-debug-info-dtor.cpp b/clang/test/CodeGenCXX/PR4890-debug-info-dtor.cpp
index a0d3a8ddac2..bcaf1b96274 100644
--- a/clang/test/CodeGenCXX/PR4890-debug-info-dtor.cpp
+++ b/clang/test/CodeGenCXX/PR4890-debug-info-dtor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -g %s
+// RUN: %clang_cc1 -emit-llvm-only -g %s
struct X {
~X();
};
diff --git a/clang/test/CodeGenCXX/PR4983-constructor-conversion.cpp b/clang/test/CodeGenCXX/PR4983-constructor-conversion.cpp
index 31eae2e791f..797a1baa49e 100644
--- a/clang/test/CodeGenCXX/PR4983-constructor-conversion.cpp
+++ b/clang/test/CodeGenCXX/PR4983-constructor-conversion.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only %s
+// RUN: %clang_cc1 -emit-llvm-only %s
struct A {
A(const char *s){}
diff --git a/clang/test/CodeGenCXX/PR5050-constructor-conversion.cpp b/clang/test/CodeGenCXX/PR5050-constructor-conversion.cpp
index c0b53d5f6e5..aa7165a1667 100644
--- a/clang/test/CodeGenCXX/PR5050-constructor-conversion.cpp
+++ b/clang/test/CodeGenCXX/PR5050-constructor-conversion.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
struct A { A(const A&, int i1 = 1); };
diff --git a/clang/test/CodeGenCXX/PR5093-static-member-function.cpp b/clang/test/CodeGenCXX/PR5093-static-member-function.cpp
index a27b08f6ada..ceab8528e8b 100644
--- a/clang/test/CodeGenCXX/PR5093-static-member-function.cpp
+++ b/clang/test/CodeGenCXX/PR5093-static-member-function.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
struct a {
static void f();
};
diff --git a/clang/test/CodeGenCXX/__null.cpp b/clang/test/CodeGenCXX/__null.cpp
index 476b0ad083b..8a177978839 100644
--- a/clang/test/CodeGenCXX/__null.cpp
+++ b/clang/test/CodeGenCXX/__null.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
int* a = __null;
int b = __null;
diff --git a/clang/test/CodeGenCXX/address-of-fntemplate.cpp b/clang/test/CodeGenCXX/address-of-fntemplate.cpp
index 1f0c8f38630..c5fa89d86d4 100644
--- a/clang/test/CodeGenCXX/address-of-fntemplate.cpp
+++ b/clang/test/CodeGenCXX/address-of-fntemplate.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
template <typename T> void f(T) {}
template <typename T> void f() { }
diff --git a/clang/test/CodeGenCXX/anonymous-namespaces.cpp b/clang/test/CodeGenCXX/anonymous-namespaces.cpp
index dcfd518d684..7689c941e10 100644
--- a/clang/test/CodeGenCXX/anonymous-namespaces.cpp
+++ b/clang/test/CodeGenCXX/anonymous-namespaces.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
namespace {
// CHECK: @_ZN12_GLOBAL__N_11aE = internal global i32 0
diff --git a/clang/test/CodeGenCXX/anonymous-union-member-initializer.cpp b/clang/test/CodeGenCXX/anonymous-union-member-initializer.cpp
index 2030f4053c9..ea3eafc9955 100644
--- a/clang/test/CodeGenCXX/anonymous-union-member-initializer.cpp
+++ b/clang/test/CodeGenCXX/anonymous-union-member-initializer.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
struct A {
union {
diff --git a/clang/test/CodeGenCXX/array-construction.cpp b/clang/test/CodeGenCXX/array-construction.cpp
index 2f82872d6c9..12975fe4f07 100644
--- a/clang/test/CodeGenCXX/array-construction.cpp
+++ b/clang/test/CodeGenCXX/array-construction.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/array-operator-delete-call.cpp b/clang/test/CodeGenCXX/array-operator-delete-call.cpp
index c23d33632a3..bef514a7be3 100644
--- a/clang/test/CodeGenCXX/array-operator-delete-call.cpp
+++ b/clang/test/CodeGenCXX/array-operator-delete-call.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/array-pointer-decay.cpp b/clang/test/CodeGenCXX/array-pointer-decay.cpp
index 5751b67b749..3fe6b72a541 100644
--- a/clang/test/CodeGenCXX/array-pointer-decay.cpp
+++ b/clang/test/CodeGenCXX/array-pointer-decay.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
void f(const char*);
diff --git a/clang/test/CodeGenCXX/array-value-initialize.cpp b/clang/test/CodeGenCXX/array-value-initialize.cpp
index f041bc584b1..5fe6c2022d8 100644
--- a/clang/test/CodeGenCXX/array-value-initialize.cpp
+++ b/clang/test/CodeGenCXX/array-value-initialize.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
// PR5463
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/assign-operator.cpp b/clang/test/CodeGenCXX/assign-operator.cpp
index 3e0be451943..cb8867f2f6a 100644
--- a/clang/test/CodeGenCXX/assign-operator.cpp
+++ b/clang/test/CodeGenCXX/assign-operator.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only -verify
+// RUN: %clang_cc1 %s -emit-llvm-only -verify
class x {
int operator=(int);
diff --git a/clang/test/CodeGenCXX/attr.cpp b/clang/test/CodeGenCXX/attr.cpp
index 695e9e72f1a..8fd86414862 100644
--- a/clang/test/CodeGenCXX/attr.cpp
+++ b/clang/test/CodeGenCXX/attr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -O0 -S %s -o %t.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -O0 -S %s -o %t.s
// RUN: FileCheck --input-file=%t.s %s
int foo() __attribute__((aligned(1024)));
diff --git a/clang/test/CodeGenCXX/call-arg-zero-temp.cpp b/clang/test/CodeGenCXX/call-arg-zero-temp.cpp
index e066927ad70..7d99533fec5 100644
--- a/clang/test/CodeGenCXX/call-arg-zero-temp.cpp
+++ b/clang/test/CodeGenCXX/call-arg-zero-temp.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
diff --git a/clang/test/CodeGenCXX/cast-conversion.cpp b/clang/test/CodeGenCXX/cast-conversion.cpp
index fa8487ac66b..ae43f19ee3b 100644
--- a/clang/test/CodeGenCXX/cast-conversion.cpp
+++ b/clang/test/CodeGenCXX/cast-conversion.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
struct A {
diff --git a/clang/test/CodeGenCXX/casts.cpp b/clang/test/CodeGenCXX/casts.cpp
index 045f2d4fe03..91ae6af19e0 100644
--- a/clang/test/CodeGenCXX/casts.cpp
+++ b/clang/test/CodeGenCXX/casts.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
// PR5248
namespace PR5248 {
diff --git a/clang/test/CodeGenCXX/class-layout.cpp b/clang/test/CodeGenCXX/class-layout.cpp
index d4fc627082d..e1ff37f1800 100644
--- a/clang/test/CodeGenCXX/class-layout.cpp
+++ b/clang/test/CodeGenCXX/class-layout.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// An extra byte shoudl be allocated for an empty class.
// CHECK: %struct.A = type { i8 }
diff --git a/clang/test/CodeGenCXX/condition.cpp b/clang/test/CodeGenCXX/condition.cpp
index a6b74efff38..eca07d866bf 100644
--- a/clang/test/CodeGenCXX/condition.cpp
+++ b/clang/test/CodeGenCXX/condition.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s
void *f();
template <typename T> T* g() {
diff --git a/clang/test/CodeGenCXX/conditional-expr-lvalue.cpp b/clang/test/CodeGenCXX/conditional-expr-lvalue.cpp
index 7b3233a5bed..a0843c40f07 100644
--- a/clang/test/CodeGenCXX/conditional-expr-lvalue.cpp
+++ b/clang/test/CodeGenCXX/conditional-expr-lvalue.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only %s
+// RUN: %clang_cc1 -emit-llvm-only %s
void f(bool flag) {
int a = 1;
int b = 2;
diff --git a/clang/test/CodeGenCXX/conditional-temporaries.cpp b/clang/test/CodeGenCXX/conditional-temporaries.cpp
index f6c466a9313..0eac10b43cf 100644
--- a/clang/test/CodeGenCXX/conditional-temporaries.cpp
+++ b/clang/test/CodeGenCXX/conditional-temporaries.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
struct I {
int i;
diff --git a/clang/test/CodeGenCXX/const-global-linkage.cpp b/clang/test/CodeGenCXX/const-global-linkage.cpp
index f12c569d942..f88bc808a7c 100644
--- a/clang/test/CodeGenCXX/const-global-linkage.cpp
+++ b/clang/test/CodeGenCXX/const-global-linkage.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
const int x = 10;
const int y = 20;
diff --git a/clang/test/CodeGenCXX/const-init.cpp b/clang/test/CodeGenCXX/const-init.cpp
index 42da6346daf..874b5f64e2b 100644
--- a/clang/test/CodeGenCXX/const-init.cpp
+++ b/clang/test/CodeGenCXX/const-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -verify -triple x86_64-apple-darwin -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin -emit-llvm -o - %s | FileCheck %s
// CHECK: @a = global i32 10
int a = 10;
diff --git a/clang/test/CodeGenCXX/constructor-conversion.cpp b/clang/test/CodeGenCXX/constructor-conversion.cpp
index dcc9535315a..b680bca181f 100644
--- a/clang/test/CodeGenCXX/constructor-conversion.cpp
+++ b/clang/test/CodeGenCXX/constructor-conversion.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/constructor-default-arg.cpp b/clang/test/CodeGenCXX/constructor-default-arg.cpp
index c494149d111..bf3106d065b 100644
--- a/clang/test/CodeGenCXX/constructor-default-arg.cpp
+++ b/clang/test/CodeGenCXX/constructor-default-arg.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/constructor-for-array-members.cpp b/clang/test/CodeGenCXX/constructor-for-array-members.cpp
index 5160a897548..3f16ba1ec81 100644
--- a/clang/test/CodeGenCXX/constructor-for-array-members.cpp
+++ b/clang/test/CodeGenCXX/constructor-for-array-members.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/constructor-init-reference.cpp b/clang/test/CodeGenCXX/constructor-init-reference.cpp
index 040441fde0f..c2f41e1f0cb 100644
--- a/clang/test/CodeGenCXX/constructor-init-reference.cpp
+++ b/clang/test/CodeGenCXX/constructor-init-reference.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | grep "store i32\* @x, i32\*\*"
+// RUN: %clang_cc1 -emit-llvm -o - %s | grep "store i32\* @x, i32\*\*"
int x;
class A {
diff --git a/clang/test/CodeGenCXX/constructor-init.cpp b/clang/test/CodeGenCXX/constructor-init.cpp
index 1b025126a34..ae6014fc664 100644
--- a/clang/test/CodeGenCXX/constructor-init.cpp
+++ b/clang/test/CodeGenCXX/constructor-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/constructor-template.cpp b/clang/test/CodeGenCXX/constructor-template.cpp
index 1142aac30e2..a3576fdc72f 100644
--- a/clang/test/CodeGenCXX/constructor-template.cpp
+++ b/clang/test/CodeGenCXX/constructor-template.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
// PR4826
diff --git a/clang/test/CodeGenCXX/conversion-function.cpp b/clang/test/CodeGenCXX/conversion-function.cpp
index c93587675ba..9ba94a90268 100644
--- a/clang/test/CodeGenCXX/conversion-function.cpp
+++ b/clang/test/CodeGenCXX/conversion-function.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/conversion-operator-base.cpp b/clang/test/CodeGenCXX/conversion-operator-base.cpp
index 49796d08a87..8fbeadf1491 100644
--- a/clang/test/CodeGenCXX/conversion-operator-base.cpp
+++ b/clang/test/CodeGenCXX/conversion-operator-base.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only %s -verify
+// RUN: %clang_cc1 -emit-llvm-only %s -verify
// PR5730
struct A { operator int(); float y; };
diff --git a/clang/test/CodeGenCXX/convert-to-fptr.cpp b/clang/test/CodeGenCXX/convert-to-fptr.cpp
index 7cc8c08444a..2812b0e002d 100644
--- a/clang/test/CodeGenCXX/convert-to-fptr.cpp
+++ b/clang/test/CodeGenCXX/convert-to-fptr.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/copy-assign-synthesis-1.cpp b/clang/test/CodeGenCXX/copy-assign-synthesis-1.cpp
index 14fbe30703d..eb761c27367 100644
--- a/clang/test/CodeGenCXX/copy-assign-synthesis-1.cpp
+++ b/clang/test/CodeGenCXX/copy-assign-synthesis-1.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/copy-assign-synthesis-2.cpp b/clang/test/CodeGenCXX/copy-assign-synthesis-2.cpp
index 60d52f57de9..c25e0467fad 100644
--- a/clang/test/CodeGenCXX/copy-assign-synthesis-2.cpp
+++ b/clang/test/CodeGenCXX/copy-assign-synthesis-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
struct A {};
A& (A::*x)(const A&) = &A::operator=;
// CHECK: define linkonce_odr %struct.A* @_ZN1AaSERKS_
diff --git a/clang/test/CodeGenCXX/copy-assign-synthesis-3.cpp b/clang/test/CodeGenCXX/copy-assign-synthesis-3.cpp
index 3dab0f2a81b..0c876d02ec5 100644
--- a/clang/test/CodeGenCXX/copy-assign-synthesis-3.cpp
+++ b/clang/test/CodeGenCXX/copy-assign-synthesis-3.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
struct A {
A& operator=(const A&);
diff --git a/clang/test/CodeGenCXX/copy-assign-synthesis.cpp b/clang/test/CodeGenCXX/copy-assign-synthesis.cpp
index 65a84f414a9..e9fc0c337c1 100644
--- a/clang/test/CodeGenCXX/copy-assign-synthesis.cpp
+++ b/clang/test/CodeGenCXX/copy-assign-synthesis.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep "_ZN1XaSERK1X" %t | count 0
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/copy-constructor-elim.cpp b/clang/test/CodeGenCXX/copy-constructor-elim.cpp
index 953effe77af..c883584fe02 100644
--- a/clang/test/CodeGenCXX/copy-constructor-elim.cpp
+++ b/clang/test/CodeGenCXX/copy-constructor-elim.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
// RUN: grep "_ZN1CC1ERK1C" %t | count 0
// RUN: grep "_ZN1SC1ERK1S" %t | count 0
diff --git a/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp b/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp
index b4add46db85..2f7c79b9030 100644
--- a/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp
+++ b/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
struct A { virtual void a(); };
A x(A& y) { return y; }
diff --git a/clang/test/CodeGenCXX/copy-constructor-synthesis.cpp b/clang/test/CodeGenCXX/copy-constructor-synthesis.cpp
index 2e950eb9e9b..ae8eefa7fe4 100644
--- a/clang/test/CodeGenCXX/copy-constructor-synthesis.cpp
+++ b/clang/test/CodeGenCXX/copy-constructor-synthesis.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/debug-info.cpp b/clang/test/CodeGenCXX/debug-info.cpp
index c5e3c79b0aa..705491e3a9b 100644
--- a/clang/test/CodeGenCXX/debug-info.cpp
+++ b/clang/test/CodeGenCXX/debug-info.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -g
+// RUN: %clang_cc1 -emit-llvm-only -g
template<typename T> struct Identity {
typedef T Type;
};
diff --git a/clang/test/CodeGenCXX/decl-ref-init.cpp b/clang/test/CodeGenCXX/decl-ref-init.cpp
index fd93b7b21e0..50ac49d8d2e 100644
--- a/clang/test/CodeGenCXX/decl-ref-init.cpp
+++ b/clang/test/CodeGenCXX/decl-ref-init.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
struct A {};
diff --git a/clang/test/CodeGenCXX/default-arg-temps.cpp b/clang/test/CodeGenCXX/default-arg-temps.cpp
index 0ec5b582c95..e523eb0cfd2 100644
--- a/clang/test/CodeGenCXX/default-arg-temps.cpp
+++ b/clang/test/CodeGenCXX/default-arg-temps.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t -triple=x86_64-apple-darwin9
+// RUN: %clang_cc1 -emit-llvm %s -o %t -triple=x86_64-apple-darwin9
struct T {
T();
diff --git a/clang/test/CodeGenCXX/default-arguments.cpp b/clang/test/CodeGenCXX/default-arguments.cpp
index 71d4baa4756..282e5d0d504 100644
--- a/clang/test/CodeGenCXX/default-arguments.cpp
+++ b/clang/test/CodeGenCXX/default-arguments.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
// PR5484
namespace PR5484 {
diff --git a/clang/test/CodeGenCXX/default-constructor-default-argument.cpp b/clang/test/CodeGenCXX/default-constructor-default-argument.cpp
index f53732e471f..971757d241b 100644
--- a/clang/test/CodeGenCXX/default-constructor-default-argument.cpp
+++ b/clang/test/CodeGenCXX/default-constructor-default-argument.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// Check that call to constructor for struct A is generated correctly.
struct A { A(int x = 2); };
diff --git a/clang/test/CodeGenCXX/default-constructor-for-members.cpp b/clang/test/CodeGenCXX/default-constructor-for-members.cpp
index d972d63d3cb..cbd119bd224 100644
--- a/clang/test/CodeGenCXX/default-constructor-for-members.cpp
+++ b/clang/test/CodeGenCXX/default-constructor-for-members.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/default-constructor-template-member.cpp b/clang/test/CodeGenCXX/default-constructor-template-member.cpp
index e0a17e0e4f7..e74fb6da69a 100644
--- a/clang/test/CodeGenCXX/default-constructor-template-member.cpp
+++ b/clang/test/CodeGenCXX/default-constructor-template-member.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
template <class T> struct A { A(); };
struct B { A<int> x; };
diff --git a/clang/test/CodeGenCXX/default-destructor-synthesis.cpp b/clang/test/CodeGenCXX/default-destructor-synthesis.cpp
index fef9c03d7ac..0c937bf8a6e 100644
--- a/clang/test/CodeGenCXX/default-destructor-synthesis.cpp
+++ b/clang/test/CodeGenCXX/default-destructor-synthesis.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -O0 -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -O0 -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -O0 -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -O0 -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 -input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/delete-two-arg.cpp b/clang/test/CodeGenCXX/delete-two-arg.cpp
index a5b18ba06fc..d6bdb098844 100644
--- a/clang/test/CodeGenCXX/delete-two-arg.cpp
+++ b/clang/test/CodeGenCXX/delete-two-arg.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i686-pc-linux-gnu %s -o - -emit-llvm -verify | FileCheck %s
+// RUN: %clang_cc1 -triple i686-pc-linux-gnu %s -o - -emit-llvm -verify | FileCheck %s
struct A { void operator delete(void*,__typeof(sizeof(int))); int x; };
void a(A* x) { delete x; }
diff --git a/clang/test/CodeGenCXX/delete.cpp b/clang/test/CodeGenCXX/delete.cpp
index 78c83cf0df6..7cc264f5c5f 100644
--- a/clang/test/CodeGenCXX/delete.cpp
+++ b/clang/test/CodeGenCXX/delete.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
void t1(int *a) {
delete a;
diff --git a/clang/test/CodeGenCXX/derived-to-base-conv.cpp b/clang/test/CodeGenCXX/derived-to-base-conv.cpp
index 70948b0ff93..0a29d45e723 100644
--- a/clang/test/CodeGenCXX/derived-to-base-conv.cpp
+++ b/clang/test/CodeGenCXX/derived-to-base-conv.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/derived-to-base.cpp b/clang/test/CodeGenCXX/derived-to-base.cpp
index 63492d604d1..45728b7c012 100644
--- a/clang/test/CodeGenCXX/derived-to-base.cpp
+++ b/clang/test/CodeGenCXX/derived-to-base.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o -
+// RUN: %clang_cc1 -emit-llvm %s -o -
struct A {
void f();
diff --git a/clang/test/CodeGenCXX/destructor-calls.cpp b/clang/test/CodeGenCXX/destructor-calls.cpp
index 3f0288b85c1..4da46a4358a 100644
--- a/clang/test/CodeGenCXX/destructor-calls.cpp
+++ b/clang/test/CodeGenCXX/destructor-calls.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/destructors.cpp b/clang/test/CodeGenCXX/destructors.cpp
index a196c13f8f4..0a7e1e5505e 100644
--- a/clang/test/CodeGenCXX/destructors.cpp
+++ b/clang/test/CodeGenCXX/destructors.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o -
+// RUN: %clang_cc1 %s -emit-llvm -o -
struct A {
int a;
diff --git a/clang/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp b/clang/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp
index cbf55ad6133..74795b5dfb0 100644
--- a/clang/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp
+++ b/clang/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
struct A {
virtual void f();
diff --git a/clang/test/CodeGenCXX/dyncast.cpp b/clang/test/CodeGenCXX/dyncast.cpp
index 0f78fb0deb6..50887b10007 100644
--- a/clang/test/CodeGenCXX/dyncast.cpp
+++ b/clang/test/CodeGenCXX/dyncast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -I%S -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -I%S -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t.ll
// RUN: FileCheck -check-prefix LL --input-file=%t.ll %s
#include <typeinfo>
diff --git a/clang/test/CodeGenCXX/eh.cpp b/clang/test/CodeGenCXX/eh.cpp
index 5570fb44c24..dd798f4ca32 100644
--- a/clang/test/CodeGenCXX/eh.cpp
+++ b/clang/test/CodeGenCXX/eh.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t.ll
// RUN: FileCheck --input-file=%t.ll %s
struct test1_D {
diff --git a/clang/test/CodeGenCXX/elide-call-reference.cpp b/clang/test/CodeGenCXX/elide-call-reference.cpp
index 863e69c9cc0..c82eee70c84 100644
--- a/clang/test/CodeGenCXX/elide-call-reference.cpp
+++ b/clang/test/CodeGenCXX/elide-call-reference.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// PR5695
struct A { A(const A&); ~A(); };
diff --git a/clang/test/CodeGenCXX/empty-union.cpp b/clang/test/CodeGenCXX/empty-union.cpp
index fdd97415a20..118a0d29b47 100644
--- a/clang/test/CodeGenCXX/empty-union.cpp
+++ b/clang/test/CodeGenCXX/empty-union.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
union sigval { };
diff --git a/clang/test/CodeGenCXX/enum.cpp b/clang/test/CodeGenCXX/enum.cpp
index 6ce04a3a532..cfcd264bd34 100644
--- a/clang/test/CodeGenCXX/enum.cpp
+++ b/clang/test/CodeGenCXX/enum.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
enum A { a } __attribute((packed));
int func(A x) { return x==a; }
diff --git a/clang/test/CodeGenCXX/eval-recursive-constant.cpp b/clang/test/CodeGenCXX/eval-recursive-constant.cpp
index b60070fa1f4..608c95d828e 100644
--- a/clang/test/CodeGenCXX/eval-recursive-constant.cpp
+++ b/clang/test/CodeGenCXX/eval-recursive-constant.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only
+// RUN: %clang_cc1 %s -emit-llvm-only
extern const int a,b;
const int a=b,b=a;
diff --git a/clang/test/CodeGenCXX/exceptions.cpp b/clang/test/CodeGenCXX/exceptions.cpp
index 396ff441ef9..4d8fb809ab9 100644
--- a/clang/test/CodeGenCXX/exceptions.cpp
+++ b/clang/test/CodeGenCXX/exceptions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - -fexceptions
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - -fexceptions
struct allocator {
allocator();
diff --git a/clang/test/CodeGenCXX/explicit-instantiation.cpp b/clang/test/CodeGenCXX/explicit-instantiation.cpp
index b33ba85cf66..ab9174e8f40 100644
--- a/clang/test/CodeGenCXX/explicit-instantiation.cpp
+++ b/clang/test/CodeGenCXX/explicit-instantiation.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -triple i686-pc-linux-gnu -o %t %s
+// RUN: %clang_cc1 -emit-llvm -triple i686-pc-linux-gnu -o %t %s
// RUN: grep "define i32 @_ZNK4plusIillEclERKiRKl" %t | count 1
template<typename T, typename U, typename Result>
diff --git a/clang/test/CodeGenCXX/expr.cpp b/clang/test/CodeGenCXX/expr.cpp
index 4dc97c47aa2..6d641dcb622 100644
--- a/clang/test/CodeGenCXX/expr.cpp
+++ b/clang/test/CodeGenCXX/expr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -x c++ < %s
+// RUN: %clang_cc1 -emit-llvm -x c++ < %s
void test0(int x) {
if (x != 0) return;
diff --git a/clang/test/CodeGenCXX/extern-c.cpp b/clang/test/CodeGenCXX/extern-c.cpp
index 3af8f3adb54..427a45aebb1 100644
--- a/clang/test/CodeGenCXX/extern-c.cpp
+++ b/clang/test/CodeGenCXX/extern-c.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
namespace foo {
// RUN: not grep "@a = global i32" %t
diff --git a/clang/test/CodeGenCXX/function-template-explicit-specialization.cpp b/clang/test/CodeGenCXX/function-template-explicit-specialization.cpp
index 046bc325a5d..21f0127ab48 100644
--- a/clang/test/CodeGenCXX/function-template-explicit-specialization.cpp
+++ b/clang/test/CodeGenCXX/function-template-explicit-specialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
template<typename T> void a(T);
template<> void a(int) {}
diff --git a/clang/test/CodeGenCXX/function-template-specialization.cpp b/clang/test/CodeGenCXX/function-template-specialization.cpp
index 677be4cc0f9..4a79fb1d674 100644
--- a/clang/test/CodeGenCXX/function-template-specialization.cpp
+++ b/clang/test/CodeGenCXX/function-template-specialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
template<typename T, typename U>
T* next(T* ptr, const U& diff);
diff --git a/clang/test/CodeGenCXX/global-array-destruction.cpp b/clang/test/CodeGenCXX/global-array-destruction.cpp
index ebea9c156e2..7b1566af8c4 100644
--- a/clang/test/CodeGenCXX/global-array-destruction.cpp
+++ b/clang/test/CodeGenCXX/global-array-destruction.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/global-init.cpp b/clang/test/CodeGenCXX/global-init.cpp
index ae450e17e85..b375aef4c8e 100644
--- a/clang/test/CodeGenCXX/global-init.cpp
+++ b/clang/test/CodeGenCXX/global-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=x86_64-apple-darwin10 -emit-llvm %s -o - |FileCheck %s
+// RUN: %clang_cc1 -triple=x86_64-apple-darwin10 -emit-llvm %s -o - |FileCheck %s
struct A {
A();
diff --git a/clang/test/CodeGenCXX/global-llvm-constant.cpp b/clang/test/CodeGenCXX/global-llvm-constant.cpp
index bd4319667e8..e799231ab74 100644
--- a/clang/test/CodeGenCXX/global-llvm-constant.cpp
+++ b/clang/test/CodeGenCXX/global-llvm-constant.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
struct A {
A() { x = 10; }
diff --git a/clang/test/CodeGenCXX/implicit-instantiation-1.cpp b/clang/test/CodeGenCXX/implicit-instantiation-1.cpp
index cc86ef4cb50..0c826e4b20d 100644
--- a/clang/test/CodeGenCXX/implicit-instantiation-1.cpp
+++ b/clang/test/CodeGenCXX/implicit-instantiation-1.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t
+// RUN: %clang_cc1 -emit-llvm %s -o %t
template<typename T>
struct X {
diff --git a/clang/test/CodeGenCXX/init-incomplete-type.cpp b/clang/test/CodeGenCXX/init-incomplete-type.cpp
index 402b86ea8cb..3312d3e04b7 100644
--- a/clang/test/CodeGenCXX/init-incomplete-type.cpp
+++ b/clang/test/CodeGenCXX/init-incomplete-type.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only -verify
+// RUN: %clang_cc1 %s -emit-llvm-only -verify
// PR5489
template<typename E>
diff --git a/clang/test/CodeGenCXX/inline-functions.cpp b/clang/test/CodeGenCXX/inline-functions.cpp
index 9af4c6e5bec..8d046a2f4a9 100644
--- a/clang/test/CodeGenCXX/inline-functions.cpp
+++ b/clang/test/CodeGenCXX/inline-functions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
// CHECK: ; ModuleID
struct A {
diff --git a/clang/test/CodeGenCXX/instantiate-init-list.cpp b/clang/test/CodeGenCXX/instantiate-init-list.cpp
index 7d5458af1f5..676d2994e7e 100644
--- a/clang/test/CodeGenCXX/instantiate-init-list.cpp
+++ b/clang/test/CodeGenCXX/instantiate-init-list.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only -verify
+// RUN: %clang_cc1 %s -emit-llvm-only -verify
struct F {
void (*x)();
diff --git a/clang/test/CodeGenCXX/key-function-vtable.cpp b/clang/test/CodeGenCXX/key-function-vtable.cpp
index e61f33a4cfc..251a14e28f2 100644
--- a/clang/test/CodeGenCXX/key-function-vtable.cpp
+++ b/clang/test/CodeGenCXX/key-function-vtable.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// Simple key function test
struct testa { virtual void a(); };
diff --git a/clang/test/CodeGenCXX/mangle-extern-local.cpp b/clang/test/CodeGenCXX/mangle-extern-local.cpp
index 7c25859a9a6..ed91da4e2e3 100644
--- a/clang/test/CodeGenCXX/mangle-extern-local.cpp
+++ b/clang/test/CodeGenCXX/mangle-extern-local.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// CHECK: @var1 = external global i32
// CHECK: @_ZN1N4var2E = external global i32
diff --git a/clang/test/CodeGenCXX/mangle-extreme.cpp b/clang/test/CodeGenCXX/mangle-extreme.cpp
index 77558d29d82..ef2d466e416 100644
--- a/clang/test/CodeGenCXX/mangle-extreme.cpp
+++ b/clang/test/CodeGenCXX/mangle-extreme.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
struct X { };
diff --git a/clang/test/CodeGenCXX/mangle-subst-std.cpp b/clang/test/CodeGenCXX/mangle-subst-std.cpp
index a2994c4abf2..913c8f101b5 100644
--- a/clang/test/CodeGenCXX/mangle-subst-std.cpp
+++ b/clang/test/CodeGenCXX/mangle-subst-std.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
namespace std {
struct A { A(); };
diff --git a/clang/test/CodeGenCXX/mangle-subst.cpp b/clang/test/CodeGenCXX/mangle-subst.cpp
index a940f4f447b..bd06869ff7f 100644
--- a/clang/test/CodeGenCXX/mangle-subst.cpp
+++ b/clang/test/CodeGenCXX/mangle-subst.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
struct X {};
diff --git a/clang/test/CodeGenCXX/mangle-system-header.cpp b/clang/test/CodeGenCXX/mangle-system-header.cpp
index 8c642bd0753..cb68bc19760 100644
--- a/clang/test/CodeGenCXX/mangle-system-header.cpp
+++ b/clang/test/CodeGenCXX/mangle-system-header.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
// PR5420
diff --git a/clang/test/CodeGenCXX/mangle-template.cpp b/clang/test/CodeGenCXX/mangle-template.cpp
index 32ce33da952..c8296f3c4bd 100644
--- a/clang/test/CodeGenCXX/mangle-template.cpp
+++ b/clang/test/CodeGenCXX/mangle-template.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
namespace test1 {
int x;
diff --git a/clang/test/CodeGenCXX/mangle-unnamed.cpp b/clang/test/CodeGenCXX/mangle-unnamed.cpp
index 66c81e59322..4aec7dbf4a7 100644
--- a/clang/test/CodeGenCXX/mangle-unnamed.cpp
+++ b/clang/test/CodeGenCXX/mangle-unnamed.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
struct S {
virtual ~S() { }
diff --git a/clang/test/CodeGenCXX/mangle.cpp b/clang/test/CodeGenCXX/mangle.cpp
index 62d8c6cc1e4..ede7e3ddaf0 100644
--- a/clang/test/CodeGenCXX/mangle.cpp
+++ b/clang/test/CodeGenCXX/mangle.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
struct X { };
struct Y { };
diff --git a/clang/test/CodeGenCXX/member-call-parens.cpp b/clang/test/CodeGenCXX/member-call-parens.cpp
index 0b808e04445..2054137fe94 100644
--- a/clang/test/CodeGenCXX/member-call-parens.cpp
+++ b/clang/test/CodeGenCXX/member-call-parens.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
struct A { int a(); };
typedef int B;
diff --git a/clang/test/CodeGenCXX/member-expressions.cpp b/clang/test/CodeGenCXX/member-expressions.cpp
index a38d5f9eaa2..720a9a70d07 100644
--- a/clang/test/CodeGenCXX/member-expressions.cpp
+++ b/clang/test/CodeGenCXX/member-expressions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin10 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin10 | FileCheck %s
// PR5392
namespace PR5392 {
diff --git a/clang/test/CodeGenCXX/member-function-pointers.cpp b/clang/test/CodeGenCXX/member-function-pointers.cpp
index 491ca5345af..149b5603ad7 100644
--- a/clang/test/CodeGenCXX/member-function-pointers.cpp
+++ b/clang/test/CodeGenCXX/member-function-pointers.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-apple-darwin9 | FileCheck %s
struct A { int a; void f(); virtual void vf(); };
struct B { int b; virtual void g(); };
diff --git a/clang/test/CodeGenCXX/member-functions.cpp b/clang/test/CodeGenCXX/member-functions.cpp
index 0dfaedff931..67038d65d62 100644
--- a/clang/test/CodeGenCXX/member-functions.cpp
+++ b/clang/test/CodeGenCXX/member-functions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -triple x86_64-apple-darwin9 -o %t
+// RUN: %clang_cc1 -emit-llvm %s -triple x86_64-apple-darwin9 -o %t
struct C {
void f();
void g(int, ...);
diff --git a/clang/test/CodeGenCXX/member-init-struct.cpp b/clang/test/CodeGenCXX/member-init-struct.cpp
index 9c0c3919794..688d92d74b8 100644
--- a/clang/test/CodeGenCXX/member-init-struct.cpp
+++ b/clang/test/CodeGenCXX/member-init-struct.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only -verify
+// RUN: %clang_cc1 %s -emit-llvm-only -verify
struct A {int a;};
struct B {float a;};
diff --git a/clang/test/CodeGenCXX/member-init-union.cpp b/clang/test/CodeGenCXX/member-init-union.cpp
index 334d5fd1f1c..2c50e18b6ff 100644
--- a/clang/test/CodeGenCXX/member-init-union.cpp
+++ b/clang/test/CodeGenCXX/member-init-union.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only -verify
+// RUN: %clang_cc1 %s -emit-llvm-only -verify
union x {
int a;
diff --git a/clang/test/CodeGenCXX/member-pointer-cast.cpp b/clang/test/CodeGenCXX/member-pointer-cast.cpp
index 794996881e2..4937b037de5 100644
--- a/clang/test/CodeGenCXX/member-pointer-cast.cpp
+++ b/clang/test/CodeGenCXX/member-pointer-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - -triple=x86_64-apple-darwin9 | FileCheck %s
struct A { int a; };
struct B { int b; };
diff --git a/clang/test/CodeGenCXX/member-pointer-type-convert.cpp b/clang/test/CodeGenCXX/member-pointer-type-convert.cpp
index 290daf2b4f1..16c14692f66 100644
--- a/clang/test/CodeGenCXX/member-pointer-type-convert.cpp
+++ b/clang/test/CodeGenCXX/member-pointer-type-convert.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
struct A;
typedef int A::*param_t;
diff --git a/clang/test/CodeGenCXX/member-pointers-zero-init.cpp b/clang/test/CodeGenCXX/member-pointers-zero-init.cpp
index caf31bd0621..18a2ead1ede 100644
--- a/clang/test/CodeGenCXX/member-pointers-zero-init.cpp
+++ b/clang/test/CodeGenCXX/member-pointers-zero-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o %t -triple=x86_64-apple-darwin9
+// RUN: %clang_cc1 -emit-llvm %s -o %t -triple=x86_64-apple-darwin9
struct A {
int i;
diff --git a/clang/test/CodeGenCXX/member-templates.cpp b/clang/test/CodeGenCXX/member-templates.cpp
index c8494c42cef..355ba20e171 100644
--- a/clang/test/CodeGenCXX/member-templates.cpp
+++ b/clang/test/CodeGenCXX/member-templates.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
// CHECK: ; ModuleID
struct A {
diff --git a/clang/test/CodeGenCXX/namespace-aliases.cpp b/clang/test/CodeGenCXX/namespace-aliases.cpp
index 5baea8791ef..74b8ebab4a5 100644
--- a/clang/test/CodeGenCXX/namespace-aliases.cpp
+++ b/clang/test/CodeGenCXX/namespace-aliases.cpp
@@ -1,3 +1,3 @@
-// RUN: clang-cc -emit-llvm-only %s
+// RUN: %clang_cc1 -emit-llvm-only %s
namespace A { }
namespace B = A;
diff --git a/clang/test/CodeGenCXX/nested-base-member-access.cpp b/clang/test/CodeGenCXX/nested-base-member-access.cpp
index 308f952c6dc..f1c7dd9a867 100644
--- a/clang/test/CodeGenCXX/nested-base-member-access.cpp
+++ b/clang/test/CodeGenCXX/nested-base-member-access.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o %t
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/new-operator-phi.cpp b/clang/test/CodeGenCXX/new-operator-phi.cpp
index a5eed28ccf9..38467ad31f9 100644
--- a/clang/test/CodeGenCXX/new-operator-phi.cpp
+++ b/clang/test/CodeGenCXX/new-operator-phi.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
// PR5454
#include <stddef.h>
diff --git a/clang/test/CodeGenCXX/new-with-default-arg.cpp b/clang/test/CodeGenCXX/new-with-default-arg.cpp
index b73b7f0865e..248cc9e0b93 100644
--- a/clang/test/CodeGenCXX/new-with-default-arg.cpp
+++ b/clang/test/CodeGenCXX/new-with-default-arg.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
// pr5547
struct A {
diff --git a/clang/test/CodeGenCXX/new.cpp b/clang/test/CodeGenCXX/new.cpp
index 13f26b253cd..71dbf1937e7 100644
--- a/clang/test/CodeGenCXX/new.cpp
+++ b/clang/test/CodeGenCXX/new.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-unknown-unknown %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown %s -emit-llvm -o - | FileCheck %s
#include <stddef.h>
void t1() {
diff --git a/clang/test/CodeGenCXX/nullptr.cpp b/clang/test/CodeGenCXX/nullptr.cpp
index 7bc52ad5210..31bd47522ed 100644
--- a/clang/test/CodeGenCXX/nullptr.cpp
+++ b/clang/test/CodeGenCXX/nullptr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -std=c++0x %s -emit-llvm -o %t
+// RUN: %clang_cc1 -std=c++0x %s -emit-llvm -o %t
int* a = nullptr;
diff --git a/clang/test/CodeGenCXX/overload-binop-implicitconvert.cpp b/clang/test/CodeGenCXX/overload-binop-implicitconvert.cpp
index f17a4585e69..0eb7a060961 100644
--- a/clang/test/CodeGenCXX/overload-binop-implicitconvert.cpp
+++ b/clang/test/CodeGenCXX/overload-binop-implicitconvert.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only
+// RUN: %clang_cc1 %s -emit-llvm-only
class T
{};
diff --git a/clang/test/CodeGenCXX/predefined-expr-sizeof.cpp b/clang/test/CodeGenCXX/predefined-expr-sizeof.cpp
index e318fbec18a..f74cfb38fd1 100644
--- a/clang/test/CodeGenCXX/predefined-expr-sizeof.cpp
+++ b/clang/test/CodeGenCXX/predefined-expr-sizeof.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// CHECK: store i32 49, i32* %size
// CHECK: store i32 52, i32* %size
diff --git a/clang/test/CodeGenCXX/predefined-expr.cpp b/clang/test/CodeGenCXX/predefined-expr.cpp
index 45b4e9f5402..6bd53c95f73 100644
--- a/clang/test/CodeGenCXX/predefined-expr.cpp
+++ b/clang/test/CodeGenCXX/predefined-expr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// CHECK: private constant [15 x i8] c"externFunction\00"
// CHECK: private constant [26 x i8] c"void NS::externFunction()\00"
diff --git a/clang/test/CodeGenCXX/ptr-to-datamember.cpp b/clang/test/CodeGenCXX/ptr-to-datamember.cpp
index ffaef32a13c..a6f523e2d7d 100644
--- a/clang/test/CodeGenCXX/ptr-to-datamember.cpp
+++ b/clang/test/CodeGenCXX/ptr-to-datamember.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/ptr-to-member-function.cpp b/clang/test/CodeGenCXX/ptr-to-member-function.cpp
index 52190b93737..f6e5a2b5114 100644
--- a/clang/test/CodeGenCXX/ptr-to-member-function.cpp
+++ b/clang/test/CodeGenCXX/ptr-to-member-function.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
+// RUN: %clang_cc1 -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s
// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s
// 13.3.3.2 Ranking implicit conversion sequences
diff --git a/clang/test/CodeGenCXX/reference-field.cpp b/clang/test/CodeGenCXX/reference-field.cpp
index 88d4c1f37e6..03120292595 100644
--- a/clang/test/CodeGenCXX/reference-field.cpp
+++ b/clang/test/CodeGenCXX/reference-field.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s -O2 | grep "@_Z1bv"
+// RUN: %clang_cc1 -emit-llvm -o - %s -O2 | grep "@_Z1bv"
// Make sure the call to b() doesn't get optimized out.
extern struct x {char& x,y;}y;
diff --git a/clang/test/CodeGenCXX/reference-init.cpp b/clang/test/CodeGenCXX/reference-init.cpp
index 9baad94a96e..1bfb28a66a0 100644
--- a/clang/test/CodeGenCXX/reference-init.cpp
+++ b/clang/test/CodeGenCXX/reference-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
struct XPTParamDescriptor {};
struct nsXPTParamInfo {
diff --git a/clang/test/CodeGenCXX/references.cpp b/clang/test/CodeGenCXX/references.cpp
index 74dc0ea6d7b..6bec8bd8c38 100644
--- a/clang/test/CodeGenCXX/references.cpp
+++ b/clang/test/CodeGenCXX/references.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -verify -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -verify -emit-llvm -o - %s | FileCheck %s
void t1() {
extern int& a;
int b = a;
diff --git a/clang/test/CodeGenCXX/reinterpret-cast.cpp b/clang/test/CodeGenCXX/reinterpret-cast.cpp
index 58a980d5288..ff5679248c2 100644
--- a/clang/test/CodeGenCXX/reinterpret-cast.cpp
+++ b/clang/test/CodeGenCXX/reinterpret-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s -std=c++0x
+// RUN: %clang_cc1 -emit-llvm -o - %s -std=c++0x
void *f1(unsigned long l) {
return reinterpret_cast<void *>(l);
}
@@ -14,4 +14,4 @@ unsigned long f3(void *p) {
void f4(int*&);
void f5(void*& u) {
f4(reinterpret_cast<int*&>(u));
-} \ No newline at end of file
+}
diff --git a/clang/test/CodeGenCXX/rtti-linkage.cpp b/clang/test/CodeGenCXX/rtti-linkage.cpp
index a2a1cdd48c1..451d3fb2704 100644
--- a/clang/test/CodeGenCXX/rtti-linkage.cpp
+++ b/clang/test/CodeGenCXX/rtti-linkage.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
// CHECK: _ZTS1B = constant
// CHECK: _ZTS1A = weak_odr constant
diff --git a/clang/test/CodeGenCXX/rtti.cpp b/clang/test/CodeGenCXX/rtti.cpp
index 7ba4d56b663..17c9cacae1a 100644
--- a/clang/test/CodeGenCXX/rtti.cpp
+++ b/clang/test/CodeGenCXX/rtti.cpp
@@ -1,7 +1,7 @@
-// RUN: clang-cc -I%S -triple x86_64-apple-darwin -std=c++0x -O0 -S %s -o %t.s
+// RUN: %clang_cc1 -I%S -triple x86_64-apple-darwin -std=c++0x -O0 -S %s -o %t.s
// RUN: FileCheck --input-file=%t.s %s
-// RUN: clang-cc -I%S -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t.ll
+// RUN: %clang_cc1 -I%S -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t.ll
// RUN: FileCheck -check-prefix LL --input-file=%t.ll %s
// XFAIL: *
diff --git a/clang/test/CodeGenCXX/static-assert.cpp b/clang/test/CodeGenCXX/static-assert.cpp
index e103b990625..dbb8f34d841 100644
--- a/clang/test/CodeGenCXX/static-assert.cpp
+++ b/clang/test/CodeGenCXX/static-assert.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -std=c++0x -verify
+// RUN: %clang_cc1 %s -emit-llvm -o - -std=c++0x -verify
static_assert(true, "");
diff --git a/clang/test/CodeGenCXX/static-data-member.cpp b/clang/test/CodeGenCXX/static-data-member.cpp
index 6e2abcc1ade..53a1d5e4c45 100644
--- a/clang/test/CodeGenCXX/static-data-member.cpp
+++ b/clang/test/CodeGenCXX/static-data-member.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
struct S {
static int i;
};
diff --git a/clang/test/CodeGenCXX/static-init-1.cpp b/clang/test/CodeGenCXX/static-init-1.cpp
index 2c452022c52..a926c0a2d32 100644
--- a/clang/test/CodeGenCXX/static-init-1.cpp
+++ b/clang/test/CodeGenCXX/static-init-1.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=x86_64-apple-darwin9 -emit-llvm %s -o %t
+// RUN: %clang_cc1 -triple=x86_64-apple-darwin9 -emit-llvm %s -o %t
// RUN: grep "call i32 @_Z5func1i" %t | count 3
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/static-init-2.cpp b/clang/test/CodeGenCXX/static-init-2.cpp
index e229dd4aa73..65ab3bb1262 100644
--- a/clang/test/CodeGenCXX/static-init-2.cpp
+++ b/clang/test/CodeGenCXX/static-init-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
// Make sure we don't crash generating y; its value is constant, but the
// initializer has side effects, so EmitConstantExpr should fail.
diff --git a/clang/test/CodeGenCXX/static-init.cpp b/clang/test/CodeGenCXX/static-init.cpp
index 91085440ae7..2ad6e9411f4 100644
--- a/clang/test/CodeGenCXX/static-init.cpp
+++ b/clang/test/CodeGenCXX/static-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
struct A {
A();
~A();
diff --git a/clang/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp b/clang/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp
index d439cbd5004..94fd9aa12ce 100644
--- a/clang/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp
+++ b/clang/test/CodeGenCXX/static-member-variable-explicit-specialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
// CHECK: ; ModuleID
template<typename> struct A { static int a; };
diff --git a/clang/test/CodeGenCXX/temp-order.cpp b/clang/test/CodeGenCXX/temp-order.cpp
index ecf075fcc11..e1ef7eb260a 100644
--- a/clang/test/CodeGenCXX/temp-order.cpp
+++ b/clang/test/CodeGenCXX/temp-order.cpp
@@ -1,5 +1,5 @@
// Output file should have no calls to error() with folding.
-// 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: FileCheck %s < %t
static unsigned pow(unsigned Base, unsigned Power) {
diff --git a/clang/test/CodeGenCXX/template-anonymous-union-member-initializer.cpp b/clang/test/CodeGenCXX/template-anonymous-union-member-initializer.cpp
index f8454282bad..921113a1484 100644
--- a/clang/test/CodeGenCXX/template-anonymous-union-member-initializer.cpp
+++ b/clang/test/CodeGenCXX/template-anonymous-union-member-initializer.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: %clang_cc1 -emit-llvm -o %t %s
template <typename T>
class A
{
diff --git a/clang/test/CodeGenCXX/template-linkage.cpp b/clang/test/CodeGenCXX/template-linkage.cpp
index 8013ba44c53..5d573d6e829 100644
--- a/clang/test/CodeGenCXX/template-linkage.cpp
+++ b/clang/test/CodeGenCXX/template-linkage.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
template<typename T> struct A {
virtual void f(T) { }
inline void g() { }
diff --git a/clang/test/CodeGenCXX/temporaries.cpp b/clang/test/CodeGenCXX/temporaries.cpp
index e55027460f0..f6b183fc84b 100644
--- a/clang/test/CodeGenCXX/temporaries.cpp
+++ b/clang/test/CodeGenCXX/temporaries.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin9 | FileCheck %s
struct A {
A();
~A();
@@ -201,4 +201,4 @@ void f11(H h) {
// CHECK-NOT: call void @_ZN1HD1Ev
// CHECK: ret void
f10(h);
-} \ No newline at end of file
+}
diff --git a/clang/test/CodeGenCXX/throw-expressions.cpp b/clang/test/CodeGenCXX/throw-expressions.cpp
index 7fe556312ba..9449618f2f2 100644
--- a/clang/test/CodeGenCXX/throw-expressions.cpp
+++ b/clang/test/CodeGenCXX/throw-expressions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
int val = 42;
int& test1() {
diff --git a/clang/test/CodeGenCXX/trivial-constructor-init.cpp b/clang/test/CodeGenCXX/trivial-constructor-init.cpp
index 90d6e655d8d..343dc6575a7 100644
--- a/clang/test/CodeGenCXX/trivial-constructor-init.cpp
+++ b/clang/test/CodeGenCXX/trivial-constructor-init.cpp
@@ -1,5 +1,5 @@
-// RUN: clang-cc -S %s -o %t-64.s
-// RUN: clang-cc -S %s -o %t-32.s
+// RUN: %clang_cc1 -S %s -o %t-64.s
+// RUN: %clang_cc1 -S %s -o %t-32.s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/unary-type-trait.cpp b/clang/test/CodeGenCXX/unary-type-trait.cpp
index b65b9f9d4f2..a11c67e1289 100644
--- a/clang/test/CodeGenCXX/unary-type-trait.cpp
+++ b/clang/test/CodeGenCXX/unary-type-trait.cpp
@@ -1,3 +1,3 @@
-// RUN: clang-cc -emit-llvm-only -verify %s
+// RUN: %clang_cc1 -emit-llvm-only -verify %s
bool a() { return __is_pod(int); }
diff --git a/clang/test/CodeGenCXX/vararg-conversion-ctor.cpp b/clang/test/CodeGenCXX/vararg-conversion-ctor.cpp
index 1306abf4a63..7e42859ac93 100644
--- a/clang/test/CodeGenCXX/vararg-conversion-ctor.cpp
+++ b/clang/test/CodeGenCXX/vararg-conversion-ctor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t-64.ll
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t-64.ll
// RUN: FileCheck -check-prefix LPLL64 --input-file=%t-64.ll %s
extern "C" int printf(...);
diff --git a/clang/test/CodeGenCXX/virt-call-offsets.cpp b/clang/test/CodeGenCXX/virt-call-offsets.cpp
index db0ba2f483b..3eb6b5da7d0 100644
--- a/clang/test/CodeGenCXX/virt-call-offsets.cpp
+++ b/clang/test/CodeGenCXX/virt-call-offsets.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
struct A { virtual void a(); };
struct B : A {};
diff --git a/clang/test/CodeGenCXX/virt-canonical-decl.cpp b/clang/test/CodeGenCXX/virt-canonical-decl.cpp
index c1a8c236af8..dfc36194892 100644
--- a/clang/test/CodeGenCXX/virt-canonical-decl.cpp
+++ b/clang/test/CodeGenCXX/virt-canonical-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only
+// RUN: %clang_cc1 %s -emit-llvm-only
class Base {
public:
diff --git a/clang/test/CodeGenCXX/virt-dtor-gen.cpp b/clang/test/CodeGenCXX/virt-dtor-gen.cpp
index 704d735c776..a4346bade78 100644
--- a/clang/test/CodeGenCXX/virt-dtor-gen.cpp
+++ b/clang/test/CodeGenCXX/virt-dtor-gen.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -o - -emit-llvm %s | FileCheck %s
+// RUN: %clang_cc1 -o - -emit-llvm %s | FileCheck %s
// PR5483
// Make sure we generate all three forms of the destructor when it is virtual.
diff --git a/clang/test/CodeGenCXX/virt-dtor-key.cpp b/clang/test/CodeGenCXX/virt-dtor-key.cpp
index 9cfd58dae2d..6a58c50b5b7 100644
--- a/clang/test/CodeGenCXX/virt-dtor-key.cpp
+++ b/clang/test/CodeGenCXX/virt-dtor-key.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s
// CHECK: @_ZTI3foo = constant
class foo {
foo();
diff --git a/clang/test/CodeGenCXX/virt-template-vtable.cpp b/clang/test/CodeGenCXX/virt-template-vtable.cpp
index 3fbdd2d9cde..76a1240731b 100644
--- a/clang/test/CodeGenCXX/virt-template-vtable.cpp
+++ b/clang/test/CodeGenCXX/virt-template-vtable.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
template<class T> class A {
A() {}
diff --git a/clang/test/CodeGenCXX/virt-thunk-reference.cpp b/clang/test/CodeGenCXX/virt-thunk-reference.cpp
index 4b361cfc3d2..0cd958bf320 100644
--- a/clang/test/CodeGenCXX/virt-thunk-reference.cpp
+++ b/clang/test/CodeGenCXX/virt-thunk-reference.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only %s
+// RUN: %clang_cc1 -emit-llvm-only %s
struct A { int a; virtual void aa(int&); };
struct B { int b; virtual void bb(int&); };
diff --git a/clang/test/CodeGenCXX/virt.cpp b/clang/test/CodeGenCXX/virt.cpp
index e3b2afe2f77..0acd264f187 100644
--- a/clang/test/CodeGenCXX/virt.cpp
+++ b/clang/test/CodeGenCXX/virt.cpp
@@ -1,7 +1,7 @@
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -O0 -S %s -o %t-64.s
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -O0 -S %s -o %t-64.s
// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s
-// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t-64.ll
+// RUN: %clang_cc1 -triple x86_64-apple-darwin -std=c++0x -emit-llvm %s -o %t-64.ll
// RUN: FileCheck -check-prefix LPLL64 --input-file=%t-64.ll %s
diff --git a/clang/test/CodeGenCXX/virtual-base-cast.cpp b/clang/test/CodeGenCXX/virtual-base-cast.cpp
index eae868f9b69..73b7c1c9529 100644
--- a/clang/test/CodeGenCXX/virtual-base-cast.cpp
+++ b/clang/test/CodeGenCXX/virtual-base-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple i686-pc-linux-gnu | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple i686-pc-linux-gnu | FileCheck %s
struct A { int a; virtual int aa(); };
struct B { int b; virtual int bb(); };
diff --git a/clang/test/CodeGenCXX/virtual-base-destructor-call.cpp b/clang/test/CodeGenCXX/virtual-base-destructor-call.cpp
index e791758aca9..1ee598afdc3 100644
--- a/clang/test/CodeGenCXX/virtual-base-destructor-call.cpp
+++ b/clang/test/CodeGenCXX/virtual-base-destructor-call.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
struct basic_ios{~basic_ios(); };
diff --git a/clang/test/CodeGenCXX/virtual-bases.cpp b/clang/test/CodeGenCXX/virtual-bases.cpp
index 4b069ead02b..1eaef3fa3af 100644
--- a/clang/test/CodeGenCXX/virtual-bases.cpp
+++ b/clang/test/CodeGenCXX/virtual-bases.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin10 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin10 | FileCheck %s
struct A {
A();
diff --git a/clang/test/CodeGenCXX/virtual-destructor-calls.cpp b/clang/test/CodeGenCXX/virtual-destructor-calls.cpp
index 976f56278ee..ecfcad23202 100644
--- a/clang/test/CodeGenCXX/virtual-destructor-calls.cpp
+++ b/clang/test/CodeGenCXX/virtual-destructor-calls.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm %s -o - -triple=x86_64-apple-darwin10 | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin10 | FileCheck %s
struct A {
virtual ~A();
diff --git a/clang/test/CodeGenCXX/virtual-destructor-synthesis.cpp b/clang/test/CodeGenCXX/virtual-destructor-synthesis.cpp
index b95218a322f..90f66a817db 100644
--- a/clang/test/CodeGenCXX/virtual-destructor-synthesis.cpp
+++ b/clang/test/CodeGenCXX/virtual-destructor-synthesis.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
struct box {
virtual ~box();
diff --git a/clang/test/CodeGenCXX/virtual-function-calls.cpp b/clang/test/CodeGenCXX/virtual-function-calls.cpp
index ca5acbabcc9..b927dec8f10 100644
--- a/clang/test/CodeGenCXX/virtual-function-calls.cpp
+++ b/clang/test/CodeGenCXX/virtual-function-calls.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// PR5021
struct A {
diff --git a/clang/test/CodeGenCXX/virtual-functions-incomplete-types.cpp b/clang/test/CodeGenCXX/virtual-functions-incomplete-types.cpp
index 1e1e96286e7..50e04357b39 100644
--- a/clang/test/CodeGenCXX/virtual-functions-incomplete-types.cpp
+++ b/clang/test/CodeGenCXX/virtual-functions-incomplete-types.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
struct A;
diff --git a/clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp b/clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp
index d179e9b7860..70bc6fceb36 100644
--- a/clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp
+++ b/clang/test/CodeGenCXX/virtual-implicit-copy-assignment.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s
struct D;
struct B {
diff --git a/clang/test/CodeGenCXX/virtual-inherited-destructor.cpp b/clang/test/CodeGenCXX/virtual-inherited-destructor.cpp
index 52b62edd294..509d40ae2fe 100644
--- a/clang/test/CodeGenCXX/virtual-inherited-destructor.cpp
+++ b/clang/test/CodeGenCXX/virtual-inherited-destructor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm-only
+// RUN: %clang_cc1 %s -emit-llvm-only
struct A { virtual ~A(); };
struct B : A {
diff --git a/clang/test/CodeGenCXX/virtual-operator-call.cpp b/clang/test/CodeGenCXX/virtual-operator-call.cpp
index 018052bb472..42d38e55a04 100644
--- a/clang/test/CodeGenCXX/virtual-operator-call.cpp
+++ b/clang/test/CodeGenCXX/virtual-operator-call.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
struct A {
virtual int operator-() = 0;
diff --git a/clang/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp b/clang/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp
index 3d99a021607..285e3da7592 100644
--- a/clang/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp
+++ b/clang/test/CodeGenCXX/virtual-pseudo-destructor-call.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
struct A {
virtual ~A();
diff --git a/clang/test/CodeGenCXX/vtable-cast-crash.cpp b/clang/test/CodeGenCXX/vtable-cast-crash.cpp
index a91d9790fe6..cc419fd4f52 100644
--- a/clang/test/CodeGenCXX/vtable-cast-crash.cpp
+++ b/clang/test/CodeGenCXX/vtable-cast-crash.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -emit-llvm-only %s
+// RUN: %clang_cc1 -emit-llvm-only %s
struct A
{
A();
diff --git a/clang/test/CodeGenCXX/vtable-key-function.cpp b/clang/test/CodeGenCXX/vtable-key-function.cpp
index b0371c0e0ba..90e8ea66f76 100644
--- a/clang/test/CodeGenCXX/vtable-key-function.cpp
+++ b/clang/test/CodeGenCXX/vtable-key-function.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
// PR5697
namespace PR5697 {
struct A {
diff --git a/clang/test/CodeGenCXX/vtable-linkage.cpp b/clang/test/CodeGenCXX/vtable-linkage.cpp
index f2d914feed9..6d3cf240096 100644
--- a/clang/test/CodeGenCXX/vtable-linkage.cpp
+++ b/clang/test/CodeGenCXX/vtable-linkage.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
namespace {
struct A {
diff --git a/clang/test/CodeGenCXX/x86_64-arguments.cpp b/clang/test/CodeGenCXX/x86_64-arguments.cpp
index 0e4c2abc107..bdee1bc252e 100644
--- a/clang/test/CodeGenCXX/x86_64-arguments.cpp
+++ b/clang/test/CodeGenCXX/x86_64-arguments.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -emit-llvm -o - %s | FileCheck %s
// CHECK: [[i64_i64_ty:%.*]] = type { i64, i64 }
// CHECK: [[i64_double_ty:%.*]] = type { i64, double }
OpenPOWER on IntegriCloud