11 files changed, 20 insertions, 20 deletions
diff --git a/debuginfo-tests/aggregate-indirect-arg.cpp b/debuginfo-tests/aggregate-indirect-arg.cpp
index bbbb01e9ca2..aa5ef8b1421 100644
--- a/debuginfo-tests/aggregate-indirect-arg.cpp
+++ b/debuginfo-tests/aggregate-indirect-arg.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx -O0 -g %s -c -o %t.o
-// RUN: %clangxx %t.o -o %t.out
+// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clangxx --target=%itanium_abi_host_triple %t.o -o %t.out
 // RUN: %test_debuginfo %s %t.out 
 // Radar 8945514
 // DEBUGGER: break 22
diff --git a/debuginfo-tests/block_var.m b/debuginfo-tests/block_var.m
index 83a30fd8c46..548cdd08438 100644
--- a/debuginfo-tests/block_var.m
+++ b/debuginfo-tests/block_var.m
@@ -1,5 +1,5 @@
-// RUN: %clang -O0 -g %s -c -o %t.o
-// RUN: %clang %t.o -o %t.out -framework Foundation
+// RUN: %clang --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clang --target=%itanium_abi_host_triple %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
 
 // REQUIRES: system-darwin
diff --git a/debuginfo-tests/blocks.m b/debuginfo-tests/blocks.m
index 0ac0e073efb..302005d6ca9 100644
--- a/debuginfo-tests/blocks.m
+++ b/debuginfo-tests/blocks.m
@@ -1,5 +1,5 @@
-// RUN: %clang -O0 -g %s -c -o %t.o
-// RUN: %clang %t.o -o %t.out -framework Foundation
+// RUN: %clang --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clang --target=%itanium_abi_host_triple %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
 
 // REQUIRES: system-darwin
diff --git a/debuginfo-tests/ctor.cpp b/debuginfo-tests/ctor.cpp
index 331d4e5756c..8a858e40dac 100644
--- a/debuginfo-tests/ctor.cpp
+++ b/debuginfo-tests/ctor.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx -O0 -g %s -c -o %t.o
-// RUN: %clangxx %t.o -o %t.out
+// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clangxx --target=%itanium_abi_host_triple %t.o -o %t.out
 // RUN: %test_debuginfo %s %t.out 
 
 
diff --git a/debuginfo-tests/dbg-arg.c b/debuginfo-tests/dbg-arg.c
index 02fcbf34b1b..e7acaa8e64a 100644
--- a/debuginfo-tests/dbg-arg.c
+++ b/debuginfo-tests/dbg-arg.c
@@ -1,6 +1,6 @@
 // This test case checks debug info during register moves for an argument.
-// RUN: %clang -arch x86_64 -mllvm -fast-isel=false  %s -c -o %t.o
-// RUN: %clang -arch x86_64 %t.o -o %t.out
+// RUN: %clang --target=%itanium_abi_host_triple -arch x86_64 -mllvm -fast-isel=false  %s -c -o %t.o
+// RUN: %clang --target=%itanium_abi_host_triple -arch x86_64 %t.o -o %t.out
 // RUN: %test_debuginfo %s %t.out
 //
 // Radar 8412415
diff --git a/debuginfo-tests/foreach.m b/debuginfo-tests/foreach.m
index 50e6af9bfce..132dacc5da7 100644
--- a/debuginfo-tests/foreach.m
+++ b/debuginfo-tests/foreach.m
@@ -1,5 +1,5 @@
-// RUN: %clang -O0 -g %s -c -o %t.o
-// RUN: %clang %t.o -o %t.out -framework Foundation
+// RUN: %clang --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clang --target=%itanium_abi_host_triple %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
 //
 // REQUIRES: system-darwin
diff --git a/debuginfo-tests/forward-declare-class.cpp b/debuginfo-tests/forward-declare-class.cpp
index 5c0f1df86e5..eb9d50745de 100644
--- a/debuginfo-tests/forward-declare-class.cpp
+++ b/debuginfo-tests/forward-declare-class.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -O0 -g %s -c -o %t.o
+// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %test_debuginfo %s %t.o
 // Radar 9168773
 
diff --git a/debuginfo-tests/nested-struct.cpp b/debuginfo-tests/nested-struct.cpp
index 22f2344e79b..ebb7ee4d71f 100644
--- a/debuginfo-tests/nested-struct.cpp
+++ b/debuginfo-tests/nested-struct.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -O0 -g %s -c -o %t.o
+// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %test_debuginfo %s %t.o
 // Radar 9440721
 // If debug info for my_number() is emitted outside function foo's scope
diff --git a/debuginfo-tests/sret.cpp b/debuginfo-tests/sret.cpp
index 4c46c3d0962..28d6a068ac6 100644
--- a/debuginfo-tests/sret.cpp
+++ b/debuginfo-tests/sret.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx -O0 -g %s -c -o %t.o
-// RUN: %clangxx %t.o -o %t.out
+// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clangxx --target=%itanium_abi_host_triple %t.o -o %t.out
 // RUN: %test_debuginfo %s %t.out 
 // Radar 8775834
 // DEBUGGER: break 62
diff --git a/debuginfo-tests/static-member-2.cpp b/debuginfo-tests/static-member-2.cpp
index 8e88a8c292b..dda9a225849 100644
--- a/debuginfo-tests/static-member-2.cpp
+++ b/debuginfo-tests/static-member-2.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx -O0 -g %s -o %t -c
-// RUN: %clangxx %t -o %t.out
+// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -o %t -c
+// RUN: %clangxx --target=%itanium_abi_host_triple %t -o %t.out
 // RUN: %test_debuginfo %s %t.out
 
 // FIXME: LLDB finds the wrong symbol for "C". rdar://problem/14933867
diff --git a/debuginfo-tests/static-member.cpp b/debuginfo-tests/static-member.cpp
index a8e3ecb9524..fdca889bdf7 100644
--- a/debuginfo-tests/static-member.cpp
+++ b/debuginfo-tests/static-member.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx -O0 -g %s -o %t -c
-// RUN: %clangxx %t -o %t.out
+// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -o %t -c
+// RUN: %clangxx --target=%itanium_abi_host_triple %t -o %t.out
 // RUN: %test_debuginfo %s %t.out
 
 // DEBUGGER: delete breakpoints