116 files changed, 57 insertions, 25 deletions
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index 0917762cd59..6a5ac889e6f 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -420,8 +420,10 @@
 /* Installation directory for data files */
 #cmakedefine LLVM_DATADIR "${LLVM_DATADIR}"
 
-/* Target triple LLVM will generate code for by default */
-#cmakedefine LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}"
+/* Target triple LLVM will generate code for by default
+ * Doesn't use `cmakedefine` because it is allowed to be empty.
+ */
+#define LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}"
 
 /* Installation directory for documentation */
 #cmakedefine LLVM_DOCSDIR "${LLVM_DOCSDIR}"
diff --git a/test/BugPoint/remove_arguments_test.ll b/test/BugPoint/remove_arguments_test.ll
index fee514e0c40..72be4fe5593 100644
--- a/test/BugPoint/remove_arguments_test.ll
+++ b/test/BugPoint/remove_arguments_test.ll
@@ -5,7 +5,7 @@
 ; Test to make sure that arguments are removed from the function if they are
 ; unnecessary. And clean up any types that frees up too.
 
-; CHECK: target triple
+; CHECK: ModuleID
 ; CHECK-NOT: struct.anon
 %struct.anon = type { i32 }
 
diff --git a/test/CodeGen/Generic/lit.local.cfg b/test/CodeGen/Generic/lit.local.cfg
index f3f03bd7047..f22d4aabd73 100644
--- a/test/CodeGen/Generic/lit.local.cfg
+++ b/test/CodeGen/Generic/lit.local.cfg
@@ -1,3 +1,3 @@
-if 'native' not in config.available_features:
+if not config.target_triple:
     config.unsupported = True
 
diff --git a/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll b/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
index fde330321aa..d20e3b05c09 100644
--- a/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
+++ b/test/CodeGen/PowerPC/2006-01-20-ShiftPartsCrash.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 define void @iterative_hash_host_wide_int() {
         %zero = alloca i32              ; <i32*> [#uses=2]
diff --git a/test/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll b/test/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll
index c63fd9ae170..3d5fa52d0ab 100644
--- a/test/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll
+++ b/test/CodeGen/PowerPC/2006-08-15-SelectionCrash.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 	%struct..0anon = type { i32 }
 	%struct.rtx_def = type { i16, i8, i8, [1 x %struct..0anon] }
diff --git a/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll b/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll
index 0e770985740..c064c273173 100644
--- a/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll
+++ b/test/CodeGen/PowerPC/2006-12-07-LargeAlloca.ll
@@ -1,6 +1,7 @@
 ; RUN: llc < %s -march=ppc64
 ; RUN: llc < %s -march=ppc32
 ; RUN: llc < %s 
+; REQUIRES: default_triple
 
 define void @bitap() {
 entry:
diff --git a/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll b/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll
index 9660d450cb4..8536dda0a9b 100644
--- a/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll
+++ b/test/CodeGen/PowerPC/2006-12-07-SelectCrash.ll
@@ -1,6 +1,7 @@
 ; RUN: llc < %s -march=ppc64
 ; RUN: llc < %s -march=ppc32
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 @qsz.b = external global i1             ; <i1*> [#uses=1]
 
diff --git a/test/CodeGen/PowerPC/2007-11-19-VectorSplitting.ll b/test/CodeGen/PowerPC/2007-11-19-VectorSplitting.ll
index 4830ca60f9f..aa39dfd0374 100644
--- a/test/CodeGen/PowerPC/2007-11-19-VectorSplitting.ll
+++ b/test/CodeGen/PowerPC/2007-11-19-VectorSplitting.ll
@@ -2,6 +2,7 @@
 ; RUN: llc < %s -march=ppc32 -mcpu=g3
 ; RUN: llc < %s -march=ppc32 -mcpu=g5
 ; PR1811
+; REQUIRES: default_triple
 
 define void @execute_shader(<4 x float>* %OUT, <4 x float>* %IN, <4 x float>*
 %CONST) {
diff --git a/test/CodeGen/PowerPC/load-shift-combine.ll b/test/CodeGen/PowerPC/load-shift-combine.ll
index 8d1f8146db9..3b468572521 100644
--- a/test/CodeGen/PowerPC/load-shift-combine.ll
+++ b/test/CodeGen/PowerPC/load-shift-combine.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 ; This used to cause a crash.  A standard load is converted to a pre-increment
 ; load.  Later the pre-increment load is combined with a subsequent SRL to
diff --git a/test/CodeGen/X86/2006-10-02-BoolRetCrash.ll b/test/CodeGen/X86/2006-10-02-BoolRetCrash.ll
index 795d4647a3f..609dbc155ed 100644
--- a/test/CodeGen/X86/2006-10-02-BoolRetCrash.ll
+++ b/test/CodeGen/X86/2006-10-02-BoolRetCrash.ll
@@ -1,5 +1,6 @@
 ; RUN: llc < %s 
 ; PR933
+; REQUIRES: default_triple
 
 define fastcc i1 @test() {
         ret i1 true
diff --git a/test/CodeGen/X86/2009-06-05-VariableIndexInsert.ll b/test/CodeGen/X86/2009-06-05-VariableIndexInsert.ll
index 8bb3dc63a3b..71a560a63ec 100644
--- a/test/CodeGen/X86/2009-06-05-VariableIndexInsert.ll
+++ b/test/CodeGen/X86/2009-06-05-VariableIndexInsert.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 define <2 x i64> @_mm_insert_epi16(<2 x i64> %a, i32 %b, i32 %imm) nounwind readnone {
 entry:
diff --git a/test/CodeGen/X86/2009-06-06-ConcatVectors.ll b/test/CodeGen/X86/2009-06-06-ConcatVectors.ll
index 92419fcb8b8..e26a8608a49 100644
--- a/test/CodeGen/X86/2009-06-06-ConcatVectors.ll
+++ b/test/CodeGen/X86/2009-06-06-ConcatVectors.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 define <2 x i64> @_mm_movpi64_pi64(<1 x i64> %a, <1 x i64> %b) nounwind readnone {
 entry:
diff --git a/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll b/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
index d6721170d6d..eb077c074bc 100644
--- a/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
+++ b/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
@@ -1,4 +1,6 @@
 ; RUN: llc -O1 < %s
+; REQUIRES: default_triple
+
 ; ModuleID = 'pr6157.bc'
 ; formerly crashed in SelectionDAGBuilder
 
diff --git a/test/CodeGen/X86/2010-07-06-DbgCrash.ll b/test/CodeGen/X86/2010-07-06-DbgCrash.ll
index 308d72c481a..5e565a1a667 100644
--- a/test/CodeGen/X86/2010-07-06-DbgCrash.ll
+++ b/test/CodeGen/X86/2010-07-06-DbgCrash.ll
@@ -1,4 +1,5 @@
 ; RUN: llc -O0 -relocation-model pic < %s -o /dev/null
+; REQUIRES: default_triple
 ; PR7545
 @.str = private constant [4 x i8] c"one\00", align 1 ; <[4 x i8]*> [#uses=1]
 @.str1 = private constant [4 x i8] c"two\00", align 1 ; <[5 x i8]*> [#uses=1]
diff --git a/test/CodeGen/X86/GC/alloc_loop.ll b/test/CodeGen/X86/GC/alloc_loop.ll
index 2a505e80aac..b924e1cee06 100644
--- a/test/CodeGen/X86/GC/alloc_loop.ll
+++ b/test/CodeGen/X86/GC/alloc_loop.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 
 declare i8* @llvm_gc_allocate(i32)
diff --git a/test/CodeGen/X86/GC/cg-O0.ll b/test/CodeGen/X86/GC/cg-O0.ll
index b4929425e94..1a390c9eb1c 100644
--- a/test/CodeGen/X86/GC/cg-O0.ll
+++ b/test/CodeGen/X86/GC/cg-O0.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s -O0
+; REQUIRES: default_triple
 
 define i32 @main() {
 entry:
diff --git a/test/CodeGen/X86/GC/lower_gcroot.ll b/test/CodeGen/X86/GC/lower_gcroot.ll
index c2d418ac50e..8cccd78100f 100644
--- a/test/CodeGen/X86/GC/lower_gcroot.ll
+++ b/test/CodeGen/X86/GC/lower_gcroot.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 	%Env = type i8*
 
diff --git a/test/CodeGen/X86/extractelement-shuffle.ll b/test/CodeGen/X86/extractelement-shuffle.ll
index d1ba9a84580..1b04c41d5c6 100644
--- a/test/CodeGen/X86/extractelement-shuffle.ll
+++ b/test/CodeGen/X86/extractelement-shuffle.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 ; Examples that exhibits a bug in DAGCombine.  The case is triggered by the
 ; following program.  The bug is DAGCombine assumes that the bit convert
diff --git a/test/CodeGen/X86/vshift_scalar.ll b/test/CodeGen/X86/vshift_scalar.ll
index 9dd8478caae..87eec3f9e97 100644
--- a/test/CodeGen/X86/vshift_scalar.ll
+++ b/test/CodeGen/X86/vshift_scalar.ll
@@ -1,4 +1,5 @@
 ; RUN: llc < %s
+; REQUIRES: default_triple
 
 ; Legalization test that requires scalarizing a vector.
 
diff --git a/test/DebugInfo/2009-10-16-Phi.ll b/test/DebugInfo/Generic/2009-10-16-Phi.ll
index e14653f6fcf..e14653f6fcf 100644
--- a/test/DebugInfo/2009-10-16-Phi.ll
+++ b/test/DebugInfo/Generic/2009-10-16-Phi.ll
diff --git a/test/DebugInfo/2009-11-03-InsertExtractValue.ll b/test/DebugInfo/Generic/2009-11-03-InsertExtractValue.ll
index c992a43c858..c992a43c858 100644
--- a/test/DebugInfo/2009-11-03-InsertExtractValue.ll
+++ b/test/DebugInfo/Generic/2009-11-03-InsertExtractValue.ll
diff --git a/test/DebugInfo/2009-11-05-DeadGlobalVariable.ll b/test/DebugInfo/Generic/2009-11-05-DeadGlobalVariable.ll
index 3791005dcfe..3791005dcfe 100644
--- a/test/DebugInfo/2009-11-05-DeadGlobalVariable.ll
+++ b/test/DebugInfo/Generic/2009-11-05-DeadGlobalVariable.ll
diff --git a/test/DebugInfo/2009-11-06-NamelessGlobalVariable.ll b/test/DebugInfo/Generic/2009-11-06-NamelessGlobalVariable.ll
index a871a257cc8..a871a257cc8 100644
--- a/test/DebugInfo/2009-11-06-NamelessGlobalVariable.ll
+++ b/test/DebugInfo/Generic/2009-11-06-NamelessGlobalVariable.ll
diff --git a/test/DebugInfo/2009-11-10-CurrentFn.ll b/test/DebugInfo/Generic/2009-11-10-CurrentFn.ll
index 7817a73ed97..7817a73ed97 100644
--- a/test/DebugInfo/2009-11-10-CurrentFn.ll
+++ b/test/DebugInfo/Generic/2009-11-10-CurrentFn.ll
diff --git a/test/DebugInfo/2010-01-05-DbgScope.ll b/test/DebugInfo/Generic/2010-01-05-DbgScope.ll
index c6d7ca85847..c6d7ca85847 100644
--- a/test/DebugInfo/2010-01-05-DbgScope.ll
+++ b/test/DebugInfo/Generic/2010-01-05-DbgScope.ll
diff --git a/test/DebugInfo/2010-03-12-llc-crash.ll b/test/DebugInfo/Generic/2010-03-12-llc-crash.ll
index aaa013c803f..aaa013c803f 100644
--- a/test/DebugInfo/2010-03-12-llc-crash.ll
+++ b/test/DebugInfo/Generic/2010-03-12-llc-crash.ll
diff --git a/test/DebugInfo/2010-03-19-DbgDeclare.ll b/test/DebugInfo/Generic/2010-03-19-DbgDeclare.ll
index fe7eaebc4ed..fe7eaebc4ed 100644
--- a/test/DebugInfo/2010-03-19-DbgDeclare.ll
+++ b/test/DebugInfo/Generic/2010-03-19-DbgDeclare.ll
diff --git a/test/DebugInfo/2010-03-24-MemberFn.ll b/test/DebugInfo/Generic/2010-03-24-MemberFn.ll
index 298c30e3de2..298c30e3de2 100644
--- a/test/DebugInfo/2010-03-24-MemberFn.ll
+++ b/test/DebugInfo/Generic/2010-03-24-MemberFn.ll
diff --git a/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll b/test/DebugInfo/Generic/2010-04-06-NestedFnDbgInfo.ll
index fd9124ad00a..fd9124ad00a 100644
--- a/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll
+++ b/test/DebugInfo/Generic/2010-04-06-NestedFnDbgInfo.ll
diff --git a/test/DebugInfo/2010-04-19-FramePtr.ll b/test/DebugInfo/Generic/2010-04-19-FramePtr.ll
index 0b4cee03b25..0b4cee03b25 100644
--- a/test/DebugInfo/2010-04-19-FramePtr.ll
+++ b/test/DebugInfo/Generic/2010-04-19-FramePtr.ll
diff --git a/test/DebugInfo/2010-05-03-DisableFramePtr.ll b/test/DebugInfo/Generic/2010-05-03-DisableFramePtr.ll
index c67ed73dac6..c67ed73dac6 100644
--- a/test/DebugInfo/2010-05-03-DisableFramePtr.ll
+++ b/test/DebugInfo/Generic/2010-05-03-DisableFramePtr.ll
diff --git a/test/DebugInfo/2010-05-03-OriginDIE.ll b/test/DebugInfo/Generic/2010-05-03-OriginDIE.ll
index 9ebfb06cc5e..9ebfb06cc5e 100644
--- a/test/DebugInfo/2010-05-03-OriginDIE.ll
+++ b/test/DebugInfo/Generic/2010-05-03-OriginDIE.ll
diff --git a/test/DebugInfo/2010-05-10-MultipleCU.ll b/test/DebugInfo/Generic/2010-05-10-MultipleCU.ll
index 92277a97d21..92277a97d21 100644
--- a/test/DebugInfo/2010-05-10-MultipleCU.ll
+++ b/test/DebugInfo/Generic/2010-05-10-MultipleCU.ll
diff --git a/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll b/test/DebugInfo/Generic/2010-06-29-InlinedFnLocalVar.ll
index feba316213a..feba316213a 100644
--- a/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll
+++ b/test/DebugInfo/Generic/2010-06-29-InlinedFnLocalVar.ll
diff --git a/test/DebugInfo/2010-07-19-Crash.ll b/test/DebugInfo/Generic/2010-07-19-Crash.ll
index 3189f6fdb74..3189f6fdb74 100644
--- a/test/DebugInfo/2010-07-19-Crash.ll
+++ b/test/DebugInfo/Generic/2010-07-19-Crash.ll
diff --git a/test/DebugInfo/2010-10-01-crash.ll b/test/DebugInfo/Generic/2010-10-01-crash.ll
index 6ae48f1c408..6ae48f1c408 100644
--- a/test/DebugInfo/2010-10-01-crash.ll
+++ b/test/DebugInfo/Generic/2010-10-01-crash.ll
diff --git a/test/DebugInfo/PR20038.ll b/test/DebugInfo/Generic/PR20038.ll
index 8ad6d7834be..8ad6d7834be 100644
--- a/test/DebugInfo/PR20038.ll
+++ b/test/DebugInfo/Generic/PR20038.ll
diff --git a/test/DebugInfo/accel-table-hash-collisions.ll b/test/DebugInfo/Generic/accel-table-hash-collisions.ll
index ff9c7851826..ff9c7851826 100644
--- a/test/DebugInfo/accel-table-hash-collisions.ll
+++ b/test/DebugInfo/Generic/accel-table-hash-collisions.ll
diff --git a/test/DebugInfo/array.ll b/test/DebugInfo/Generic/array.ll
index a9571db23ff..a9571db23ff 100644
--- a/test/DebugInfo/array.ll
+++ b/test/DebugInfo/Generic/array.ll
diff --git a/test/DebugInfo/block-asan.ll b/test/DebugInfo/Generic/block-asan.ll
index ae07e7b145b..ae07e7b145b 100644
--- a/test/DebugInfo/block-asan.ll
+++ b/test/DebugInfo/Generic/block-asan.ll
diff --git a/test/DebugInfo/bug_null_debuginfo.ll b/test/DebugInfo/Generic/bug_null_debuginfo.ll
index 09e36db42b4..09e36db42b4 100644
--- a/test/DebugInfo/bug_null_debuginfo.ll
+++ b/test/DebugInfo/Generic/bug_null_debuginfo.ll
diff --git a/test/DebugInfo/constant-pointers.ll b/test/DebugInfo/Generic/constant-pointers.ll
index b46ee5d98f0..b46ee5d98f0 100644
--- a/test/DebugInfo/constant-pointers.ll
+++ b/test/DebugInfo/Generic/constant-pointers.ll
diff --git a/test/DebugInfo/constant-sdnodes-have-dbg-location.ll b/test/DebugInfo/Generic/constant-sdnodes-have-dbg-location.ll
index d6b6413aa4f..d6b6413aa4f 100644
--- a/test/DebugInfo/constant-sdnodes-have-dbg-location.ll
+++ b/test/DebugInfo/Generic/constant-sdnodes-have-dbg-location.ll
diff --git a/test/DebugInfo/constantfp-sdnodes-have-dbg-location.ll b/test/DebugInfo/Generic/constantfp-sdnodes-have-dbg-location.ll
index 986a05d5677..986a05d5677 100644
--- a/test/DebugInfo/constantfp-sdnodes-have-dbg-location.ll
+++ b/test/DebugInfo/Generic/constantfp-sdnodes-have-dbg-location.ll
diff --git a/test/DebugInfo/cross-cu-inlining.ll b/test/DebugInfo/Generic/cross-cu-inlining.ll
index 6f9436ba1cf..6f9436ba1cf 100644
--- a/test/DebugInfo/cross-cu-inlining.ll
+++ b/test/DebugInfo/Generic/cross-cu-inlining.ll
diff --git a/test/DebugInfo/cross-cu-linkonce-distinct.ll b/test/DebugInfo/Generic/cross-cu-linkonce-distinct.ll
index 25b6b971bce..25b6b971bce 100644
--- a/test/DebugInfo/cross-cu-linkonce-distinct.ll
+++ b/test/DebugInfo/Generic/cross-cu-linkonce-distinct.ll
diff --git a/test/DebugInfo/cross-cu-linkonce.ll b/test/DebugInfo/Generic/cross-cu-linkonce.ll
index 50708d7ebe0..50708d7ebe0 100644
--- a/test/DebugInfo/cross-cu-linkonce.ll
+++ b/test/DebugInfo/Generic/cross-cu-linkonce.ll
diff --git a/test/DebugInfo/cu-range-hole.ll b/test/DebugInfo/Generic/cu-range-hole.ll
index 96b5380d97c..96b5380d97c 100644
--- a/test/DebugInfo/cu-range-hole.ll
+++ b/test/DebugInfo/Generic/cu-range-hole.ll
diff --git a/test/DebugInfo/cu-ranges.ll b/test/DebugInfo/Generic/cu-ranges.ll
index 03ddb2708bc..03ddb2708bc 100644
--- a/test/DebugInfo/cu-ranges.ll
+++ b/test/DebugInfo/Generic/cu-ranges.ll
diff --git a/test/DebugInfo/X86/dbg-at-specficiation.ll b/test/DebugInfo/Generic/dbg-at-specficiation.ll
index 7302aaecb93..7302aaecb93 100644
--- a/test/DebugInfo/X86/dbg-at-specficiation.ll
+++ b/test/DebugInfo/Generic/dbg-at-specficiation.ll
diff --git a/test/DebugInfo/dead-argument-order.ll b/test/DebugInfo/Generic/dead-argument-order.ll
index b3ae5fe5e31..b3ae5fe5e31 100644
--- a/test/DebugInfo/dead-argument-order.ll
+++ b/test/DebugInfo/Generic/dead-argument-order.ll
diff --git a/test/DebugInfo/debug-info-always-inline.ll b/test/DebugInfo/Generic/debug-info-always-inline.ll
index 5eaa6752218..5eaa6752218 100644
--- a/test/DebugInfo/debug-info-always-inline.ll
+++ b/test/DebugInfo/Generic/debug-info-always-inline.ll
diff --git a/test/DebugInfo/debug-info-qualifiers.ll b/test/DebugInfo/Generic/debug-info-qualifiers.ll
index c13a5ea731b..c13a5ea731b 100644
--- a/test/DebugInfo/debug-info-qualifiers.ll
+++ b/test/DebugInfo/Generic/debug-info-qualifiers.ll
diff --git a/test/DebugInfo/debuginfofinder-forward-declaration.ll b/test/DebugInfo/Generic/debuginfofinder-forward-declaration.ll
index 62c151bc8d7..62c151bc8d7 100644
--- a/test/DebugInfo/debuginfofinder-forward-declaration.ll
+++ b/test/DebugInfo/Generic/debuginfofinder-forward-declaration.ll
diff --git a/test/DebugInfo/debuginfofinder-multiple-cu.ll b/test/DebugInfo/Generic/debuginfofinder-multiple-cu.ll
index 06ed02a4ce0..06ed02a4ce0 100644
--- a/test/DebugInfo/debuginfofinder-multiple-cu.ll
+++ b/test/DebugInfo/Generic/debuginfofinder-multiple-cu.ll
diff --git a/test/DebugInfo/dwarf-public-names.ll b/test/DebugInfo/Generic/dwarf-public-names.ll
index c14412d3d81..c14412d3d81 100644
--- a/test/DebugInfo/dwarf-public-names.ll
+++ b/test/DebugInfo/Generic/dwarf-public-names.ll
diff --git a/test/DebugInfo/empty.ll b/test/DebugInfo/Generic/empty.ll
index f787039885b..f787039885b 100644
--- a/test/DebugInfo/empty.ll
+++ b/test/DebugInfo/Generic/empty.ll
diff --git a/test/DebugInfo/enum-types.ll b/test/DebugInfo/Generic/enum-types.ll
index 484f965384e..484f965384e 100644
--- a/test/DebugInfo/enum-types.ll
+++ b/test/DebugInfo/Generic/enum-types.ll
diff --git a/test/DebugInfo/enum.ll b/test/DebugInfo/Generic/enum.ll
index 8d91c4e3943..8d91c4e3943 100644
--- a/test/DebugInfo/enum.ll
+++ b/test/DebugInfo/Generic/enum.ll
diff --git a/test/DebugInfo/global.ll b/test/DebugInfo/Generic/global.ll
index ed8091a6832..ed8091a6832 100644
--- a/test/DebugInfo/global.ll
+++ b/test/DebugInfo/Generic/global.ll
diff --git a/test/DebugInfo/gmlt.test b/test/DebugInfo/Generic/gmlt.test
index 0514dbfc461..0514dbfc461 100644
--- a/test/DebugInfo/gmlt.test
+++ b/test/DebugInfo/Generic/gmlt.test
diff --git a/test/DebugInfo/gvn.ll b/test/DebugInfo/Generic/gvn.ll
index 1b32918dd34..1b32918dd34 100644
--- a/test/DebugInfo/gvn.ll
+++ b/test/DebugInfo/Generic/gvn.ll
diff --git a/test/DebugInfo/incorrect-variable-debugloc.ll b/test/DebugInfo/Generic/incorrect-variable-debugloc.ll
index b5787923d1c..b5787923d1c 100644
--- a/test/DebugInfo/incorrect-variable-debugloc.ll
+++ b/test/DebugInfo/Generic/incorrect-variable-debugloc.ll
diff --git a/test/DebugInfo/incorrect-variable-debugloc1.ll b/test/DebugInfo/Generic/incorrect-variable-debugloc1.ll
index 7d40e404ce1..7d40e404ce1 100644
--- a/test/DebugInfo/incorrect-variable-debugloc1.ll
+++ b/test/DebugInfo/Generic/incorrect-variable-debugloc1.ll
diff --git a/test/DebugInfo/inheritance.ll b/test/DebugInfo/Generic/inheritance.ll
index 802c4f195d4..802c4f195d4 100644
--- a/test/DebugInfo/inheritance.ll
+++ b/test/DebugInfo/Generic/inheritance.ll
diff --git a/test/DebugInfo/inline-debug-info-multiret.ll b/test/DebugInfo/Generic/inline-debug-info-multiret.ll
index e1ed553022c..e1ed553022c 100644
--- a/test/DebugInfo/inline-debug-info-multiret.ll
+++ b/test/DebugInfo/Generic/inline-debug-info-multiret.ll
diff --git a/test/DebugInfo/inline-debug-info.ll b/test/DebugInfo/Generic/inline-debug-info.ll
index baadc39a9f7..baadc39a9f7 100644
--- a/test/DebugInfo/inline-debug-info.ll
+++ b/test/DebugInfo/Generic/inline-debug-info.ll
diff --git a/test/DebugInfo/inline-no-debug-info.ll b/test/DebugInfo/Generic/inline-no-debug-info.ll
index a46146761a2..a46146761a2 100644
--- a/test/DebugInfo/inline-no-debug-info.ll
+++ b/test/DebugInfo/Generic/inline-no-debug-info.ll
diff --git a/test/DebugInfo/inline-scopes.ll b/test/DebugInfo/Generic/inline-scopes.ll
index 266d03e93e0..266d03e93e0 100644
--- a/test/DebugInfo/inline-scopes.ll
+++ b/test/DebugInfo/Generic/inline-scopes.ll
diff --git a/test/DebugInfo/inlined-arguments.ll b/test/DebugInfo/Generic/inlined-arguments.ll
index 69825faa8b9..69825faa8b9 100644
--- a/test/DebugInfo/inlined-arguments.ll
+++ b/test/DebugInfo/Generic/inlined-arguments.ll
diff --git a/test/DebugInfo/inlined-vars.ll b/test/DebugInfo/Generic/inlined-vars.ll
index 05e7f7d2beb..05e7f7d2beb 100644
--- a/test/DebugInfo/inlined-vars.ll
+++ b/test/DebugInfo/Generic/inlined-vars.ll
diff --git a/test/DebugInfo/Generic/lit.local.cfg b/test/DebugInfo/Generic/lit.local.cfg
new file mode 100644
index 00000000000..f22d4aabd73
--- /dev/null
+++ b/test/DebugInfo/Generic/lit.local.cfg
@@ -0,0 +1,3 @@
+if not config.target_triple:
+    config.unsupported = True
+
diff --git a/test/DebugInfo/location-verifier.ll b/test/DebugInfo/Generic/location-verifier.ll
index a767ab903c3..a767ab903c3 100644
--- a/test/DebugInfo/location-verifier.ll
+++ b/test/DebugInfo/Generic/location-verifier.ll
diff --git a/test/DebugInfo/lto-comp-dir.ll b/test/DebugInfo/Generic/lto-comp-dir.ll
index f20383d5636..f20383d5636 100644
--- a/test/DebugInfo/lto-comp-dir.ll
+++ b/test/DebugInfo/Generic/lto-comp-dir.ll
diff --git a/test/DebugInfo/member-order.ll b/test/DebugInfo/Generic/member-order.ll
index 4c1f6b6c0ba..4c1f6b6c0ba 100644
--- a/test/DebugInfo/member-order.ll
+++ b/test/DebugInfo/Generic/member-order.ll
diff --git a/test/DebugInfo/member-pointers.ll b/test/DebugInfo/Generic/member-pointers.ll
index 1570c07ddb2..1570c07ddb2 100644
--- a/test/DebugInfo/member-pointers.ll
+++ b/test/DebugInfo/Generic/member-pointers.ll
diff --git a/test/DebugInfo/missing-abstract-variable.ll b/test/DebugInfo/Generic/missing-abstract-variable.ll
index 0ebb5a28edc..0ebb5a28edc 100644
--- a/test/DebugInfo/missing-abstract-variable.ll
+++ b/test/DebugInfo/Generic/missing-abstract-variable.ll
diff --git a/test/DebugInfo/multiline.ll b/test/DebugInfo/Generic/multiline.ll
index aaad0326477..aaad0326477 100644
--- a/test/DebugInfo/multiline.ll
+++ b/test/DebugInfo/Generic/multiline.ll
diff --git a/test/DebugInfo/namespace.ll b/test/DebugInfo/Generic/namespace.ll
index 5554c9ff48e..5554c9ff48e 100644
--- a/test/DebugInfo/namespace.ll
+++ b/test/DebugInfo/Generic/namespace.ll
diff --git a/test/DebugInfo/namespace_function_definition.ll b/test/DebugInfo/Generic/namespace_function_definition.ll
index f7a34c1827d..f7a34c1827d 100644
--- a/test/DebugInfo/namespace_function_definition.ll
+++ b/test/DebugInfo/Generic/namespace_function_definition.ll
diff --git a/test/DebugInfo/namespace_inline_function_definition.ll b/test/DebugInfo/Generic/namespace_inline_function_definition.ll
index bc606198ce9..bc606198ce9 100644
--- a/test/DebugInfo/namespace_inline_function_definition.ll
+++ b/test/DebugInfo/Generic/namespace_inline_function_definition.ll
diff --git a/test/DebugInfo/nodebug.ll b/test/DebugInfo/Generic/nodebug.ll
index 6f20aecaaf5..6f20aecaaf5 100644
--- a/test/DebugInfo/nodebug.ll
+++ b/test/DebugInfo/Generic/nodebug.ll
diff --git a/test/DebugInfo/piece-verifier.ll b/test/DebugInfo/Generic/piece-verifier.ll
index 20d8e897e66..20d8e897e66 100644
--- a/test/DebugInfo/piece-verifier.ll
+++ b/test/DebugInfo/Generic/piece-verifier.ll
diff --git a/test/DebugInfo/X86/recursive_inlining.ll b/test/DebugInfo/Generic/recursive_inlining.ll
index c1fc70b689b..c1fc70b689b 100644
--- a/test/DebugInfo/X86/recursive_inlining.ll
+++ b/test/DebugInfo/Generic/recursive_inlining.ll
diff --git a/test/DebugInfo/restrict.ll b/test/DebugInfo/Generic/restrict.ll
index 49401712ccd..49401712ccd 100644
--- a/test/DebugInfo/restrict.ll
+++ b/test/DebugInfo/Generic/restrict.ll
diff --git a/test/DebugInfo/skeletoncu.ll b/test/DebugInfo/Generic/skeletoncu.ll
index 74ffec4519e..74ffec4519e 100644
--- a/test/DebugInfo/skeletoncu.ll
+++ b/test/DebugInfo/Generic/skeletoncu.ll
diff --git a/test/DebugInfo/sugared-constants.ll b/test/DebugInfo/Generic/sugared-constants.ll
index 7a344736e43..7a344736e43 100644
--- a/test/DebugInfo/sugared-constants.ll
+++ b/test/DebugInfo/Generic/sugared-constants.ll
diff --git a/test/DebugInfo/template-recursive-void.ll b/test/DebugInfo/Generic/template-recursive-void.ll
index 645f1795c76..645f1795c76 100644
--- a/test/DebugInfo/template-recursive-void.ll
+++ b/test/DebugInfo/Generic/template-recursive-void.ll
diff --git a/test/DebugInfo/tu-composite.ll b/test/DebugInfo/Generic/tu-composite.ll
index 4df4ea8219d..4df4ea8219d 100644
--- a/test/DebugInfo/tu-composite.ll
+++ b/test/DebugInfo/Generic/tu-composite.ll
diff --git a/test/DebugInfo/tu-member-pointer.ll b/test/DebugInfo/Generic/tu-member-pointer.ll
index 8b1eb3bb6d1..8b1eb3bb6d1 100644
--- a/test/DebugInfo/tu-member-pointer.ll
+++ b/test/DebugInfo/Generic/tu-member-pointer.ll
diff --git a/test/DebugInfo/two-cus-from-same-file.ll b/test/DebugInfo/Generic/two-cus-from-same-file.ll
index 4aeaaac22d2..4aeaaac22d2 100644
--- a/test/DebugInfo/two-cus-from-same-file.ll
+++ b/test/DebugInfo/Generic/two-cus-from-same-file.ll
diff --git a/test/DebugInfo/typedef.ll b/test/DebugInfo/Generic/typedef.ll
index 3cf4dffe937..3cf4dffe937 100644
--- a/test/DebugInfo/typedef.ll
+++ b/test/DebugInfo/Generic/typedef.ll
diff --git a/test/DebugInfo/unconditional-branch.ll b/test/DebugInfo/Generic/unconditional-branch.ll
index d4d7fb82741..d4d7fb82741 100644
--- a/test/DebugInfo/unconditional-branch.ll
+++ b/test/DebugInfo/Generic/unconditional-branch.ll
diff --git a/test/DebugInfo/varargs.ll b/test/DebugInfo/Generic/varargs.ll
index 1b5a921ad53..1b5a921ad53 100644
--- a/test/DebugInfo/varargs.ll
+++ b/test/DebugInfo/Generic/varargs.ll
diff --git a/test/DebugInfo/version.ll b/test/DebugInfo/Generic/version.ll
index d0caa295cc2..d0caa295cc2 100644
--- a/test/DebugInfo/version.ll
+++ b/test/DebugInfo/Generic/version.ll
diff --git a/test/DebugInfo/lit.local.cfg b/test/DebugInfo/lit.local.cfg
deleted file mode 100644
index f3f03bd7047..00000000000
--- a/test/DebugInfo/lit.local.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-if 'native' not in config.available_features:
-    config.unsupported = True
-
diff --git a/test/Feature/optnone-llc.ll b/test/Feature/optnone-llc.ll
index 544b2ee39fb..015cc842d9f 100644
--- a/test/Feature/optnone-llc.ll
+++ b/test/Feature/optnone-llc.ll
@@ -4,7 +4,7 @@
 ; RUN: llc -O3 -debug %s -o /dev/null 2>&1 | FileCheck %s --check-prefix=LLC-Ox
 ; RUN: llc -misched-postra -debug %s -o /dev/null 2>&1 | FileCheck %s --check-prefix=LLC-MORE
 
-; REQUIRES: asserts, native
+; REQUIRES: asserts, default_triple
 
 ; This test verifies that we don't run Machine Function optimizations
 ; on optnone functions.
diff --git a/test/Feature/optnone.ll b/test/Feature/optnone.ll
index 3cb6efdf45e..7d8afd4b773 100644
--- a/test/Feature/optnone.ll
+++ b/test/Feature/optnone.ll
@@ -1,5 +1,4 @@
 ; RUN: llvm-as < %s | llvm-dis | FileCheck %s
-; REQUIRE: native
 
 ; Check for the presence of attribute optnone in the disassembly.
 
diff --git a/test/LTO/X86/bcsection.ll b/test/LTO/X86/bcsection.ll
index e65ade62353..bcd6bc32848 100644
--- a/test/LTO/X86/bcsection.ll
+++ b/test/LTO/X86/bcsection.ll
@@ -15,6 +15,8 @@
 ; RUN: llvm-lto -exported-symbol=main -exported-symbol=_main -o %T/bcsection.macho.o %T/bcsection.macho.bco
 ; RUN: llvm-nm %T/bcsection.macho.o | FileCheck %s
 
+; REQUIRES: default_triple
+
 ; CHECK: main
 define i32 @main() {
   ret i32 0
diff --git a/test/LTO/X86/current-section.ll b/test/LTO/X86/current-section.ll
index f79b378318d..49eee49ae62 100644
--- a/test/LTO/X86/current-section.ll
+++ b/test/LTO/X86/current-section.ll
@@ -1,4 +1,5 @@
 ; RUN: llvm-as < %s >%t1
 ; RUN: llvm-lto -o %t2 %t1
+; REQUIRES: default_triple
 
 module asm ".align 4"
diff --git a/test/LTO/X86/list-symbols.ll b/test/LTO/X86/list-symbols.ll
index 41b7d00deec..1d98b390b18 100644
--- a/test/LTO/X86/list-symbols.ll
+++ b/test/LTO/X86/list-symbols.ll
@@ -1,6 +1,7 @@
 ; RUN: llvm-as -o %T/1.bc %s
 ; RUN: llvm-as -o %T/2.bc %S/Inputs/list-symbols.ll
 ; RUN: llvm-lto -list-symbols-only %T/1.bc %T/2.bc | FileCheck %s
+; REQUIRES: default_triple
 
 ; CHECK-LABEL: 1.bc:
 ; CHECK-DAG: foo
diff --git a/test/Linker/subprogram-linkonce-weak.ll b/test/Linker/subprogram-linkonce-weak.ll
index 6330ecc5b55..78a576d7635 100644
--- a/test/Linker/subprogram-linkonce-weak.ll
+++ b/test/Linker/subprogram-linkonce-weak.ll
@@ -1,8 +1,8 @@
-; REQUIRES: native
 ; RUN: llvm-link %s %S/Inputs/subprogram-linkonce-weak.ll -S -o %t1
 ; RUN: FileCheck %s -check-prefix=LW -check-prefix=CHECK <%t1
 ; RUN: llvm-link %S/Inputs/subprogram-linkonce-weak.ll %s -S -o %t2
 ; RUN: FileCheck %s -check-prefix=WL -check-prefix=CHECK <%t2
+; REQUIRES: default_triple
 
 ; This testcase tests the following flow:
 ;  - File A defines a linkonce version of @foo which has inlined into @bar.
diff --git a/test/Linker/type-unique-odr-a.ll b/test/Linker/type-unique-odr-a.ll
index 2030598a9b4..7dec8608949 100644
--- a/test/Linker/type-unique-odr-a.ll
+++ b/test/Linker/type-unique-odr-a.ll
@@ -1,4 +1,4 @@
-; REQUIRES: object-emission, native
+; REQUIRES: default_triple, object-emission
 ;
 ; RUN: llvm-link %s %p/type-unique-odr-b.ll -S -o - | %llc_dwarf -dwarf-linkage-names=Enable -filetype=obj -O0 | llvm-dwarfdump -debug-dump=info - | FileCheck %s
 ;
diff --git a/test/Linker/type-unique-simple-a.ll b/test/Linker/type-unique-simple-a.ll
index a7102e72ba2..5fb0ff2d491 100644
--- a/test/Linker/type-unique-simple-a.ll
+++ b/test/Linker/type-unique-simple-a.ll
@@ -1,4 +1,4 @@
-; REQUIRES: object-emission, native
+; REQUIRES: default_triple, object-emission
 
 ; RUN: llvm-link %s %p/type-unique-simple-b.ll -S -o %t
 ; RUN: cat %t | FileCheck %s -check-prefix=LINK
diff --git a/test/Linker/type-unique-simple2-a.ll b/test/Linker/type-unique-simple2-a.ll
index e46e716806c..aeaf708da50 100644
--- a/test/Linker/type-unique-simple2-a.ll
+++ b/test/Linker/type-unique-simple2-a.ll
@@ -1,4 +1,4 @@
-; REQUIRES: object-emission, native
+; REQUIRES: default_triple, object-emission
 ;
 ; RUN: llvm-link %s %p/type-unique-simple2-b.ll -S -o - | %llc_dwarf -filetype=obj -O0 | llvm-dwarfdump -debug-dump=info - | FileCheck %s
 ;
diff --git a/test/Linker/type-unique-simple2.ll b/test/Linker/type-unique-simple2.ll
index d4f398b8584..7c31cdf5975 100644
--- a/test/Linker/type-unique-simple2.ll
+++ b/test/Linker/type-unique-simple2.ll
@@ -1,4 +1,5 @@
-; REQUIRES: object-emission; native
+; REQUIRES: object-emission
+; REQUIRES: default_triple
 
 ; RUN: llvm-link %S/Inputs/type-unique-simple2-a.ll %S/Inputs/type-unique-simple2-b.ll -S -o %t
 ; RUN: cat %t | FileCheck %S/Inputs/type-unique-simple2-a.ll -check-prefix=LINK
diff --git a/test/Linker/type-unique-type-array-a.ll b/test/Linker/type-unique-type-array-a.ll
index 0004d35c52a..eb4fbd3ca74 100644
--- a/test/Linker/type-unique-type-array-a.ll
+++ b/test/Linker/type-unique-type-array-a.ll
@@ -1,4 +1,4 @@
-; REQUIRES: object-emission, native
+; REQUIRES: default_triple, object-emission
 ;
 ; RUN: llvm-link %s %p/type-unique-type-array-b.ll -S -o - | %llc_dwarf -filetype=obj -O0 | llvm-dwarfdump -debug-dump=info - | FileCheck %s
 ;
diff --git a/test/MC/ELF/cfi-version.ll b/test/MC/ELF/cfi-version.ll
index 3449fa60dfd..fc5ea0f4c83 100644
--- a/test/MC/ELF/cfi-version.ll
+++ b/test/MC/ELF/cfi-version.ll
@@ -4,6 +4,7 @@
 
 ; .debug_frame is not emitted for targeting Windows x64.
 ; REQUIRES: debug_frame
+; REQUIRES: default_triple
 
 ; Function Attrs: nounwind
 define i32 @foo() #0 {
diff --git a/test/Other/2010-05-06-Printer.ll b/test/Other/2010-05-06-Printer.ll
index 6c28b4a3d05..e57b9825b33 100644
--- a/test/Other/2010-05-06-Printer.ll
+++ b/test/Other/2010-05-06-Printer.ll
@@ -1,5 +1,5 @@
-; REQUIRES: native
 ; RUN: llc -O2 -print-after-all < %s 2>/dev/null
+; REQUIRES: default_triple
 
 define void @tester(){
   ret void
diff --git a/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll b/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll
index 6268c13ac16..43fcc605121 100644
--- a/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll
+++ b/test/Transforms/BranchFolding/2007-10-19-InlineAsmDirectives.ll
@@ -1,5 +1,6 @@
 ; RUN: opt < %s -O3 | llc -no-integrated-as | FileCheck %s
-; REQUIRES: X86
+; REQUIRES: default_triple
+
 ;; We don't want branch folding to fold asm directives.
 
 ; CHECK: bork_directive
@@ -11,7 +12,7 @@ entry:
 	%tmp = icmp eq i32 %param, 0
         br i1 %tmp, label %cond_true, label %cond_false
 
-cond_true:   
+cond_true:
         call void asm sideeffect ".bork_directive /* ${0:c}:${1:c} */", "i,i,~{dirflag},~{fpsr},~{flags}"( i32 37, i32 927 )
         ret void
 
diff --git a/test/lit.cfg b/test/lit.cfg
index ace3c2a6776..914d6b31456 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -355,11 +355,15 @@ if config.have_zlib == "1":
 else:
     config.available_features.add("nozlib")
 
-# Native compilation: host arch == target arch and native backend built-in
+# LLVM can be configured with an empty default triple
+# Some tests are "generic" and require a valid default triple
+if config.target_triple:
+    config.available_features.add("default_triple")
+
+# Native compilation: host arch == default triple arch
 # FIXME: Consider cases that target can be executed
 # even if host_triple were different from target_triple.
-if (config.host_triple == config.target_triple and
-    config.native_target in config.targets_to_build):
+if config.host_triple == config.target_triple:
     config.available_features.add("native")
 
 import subprocess
diff --git a/test/tools/llvm-mc/basic.test b/test/tools/llvm-mc/basic.test
index abdd3b71f7d..cfc372ef044 100644
--- a/test/tools/llvm-mc/basic.test
+++ b/test/tools/llvm-mc/basic.test
@@ -1,4 +1,4 @@
 # RUN: not llvm-mc %t.blah -o %t2 2>&1 | FileCheck --check-prefix=ENOENT %s
-# REQUIRES: native
+# REQUIRES: default_triple
 
 # ENOENT: {{.*}}.blah: {{[Nn]}}o such file or directory
diff --git a/test/tools/llvm-mc/fatal_warnings.test b/test/tools/llvm-mc/fatal_warnings.test
index e4dde48ee8d..3761ec4b26f 100644
--- a/test/tools/llvm-mc/fatal_warnings.test
+++ b/test/tools/llvm-mc/fatal_warnings.test
@@ -1,6 +1,6 @@
 # RUN: not llvm-mc --fatal-warnings %s 2>&1 | FileCheck %s
 # XFAIL: hexagon
-# REQUIRES: native
+# REQUIRES: default_triple
 
 # CHECK: error: .warning directive invoked in source file
 .warning
diff --git a/test/tools/llvm-mc/line_end_with_space.test b/test/tools/llvm-mc/line_end_with_space.test
index 0967d6afa97..4c365f6a8d5 100644
--- a/test/tools/llvm-mc/line_end_with_space.test
+++ b/test/tools/llvm-mc/line_end_with_space.test
@@ -1,2 +1,2 @@
 RUN: llvm-mc -disassemble %s
-# REQUIRES: native
+# REQUIRES: default_triple
diff --git a/test/tools/llvm-mc/lit.local.cfg b/test/tools/llvm-mc/lit.local.cfg
new file mode 100644
index 00000000000..f22d4aabd73
--- /dev/null
+++ b/test/tools/llvm-mc/lit.local.cfg
@@ -0,0 +1,3 @@
+if not config.target_triple:
+    config.unsupported = True
+
diff --git a/test/tools/llvm-mc/no_warnings.test b/test/tools/llvm-mc/no_warnings.test
index 031da4896f2..46549c4710d 100644
--- a/test/tools/llvm-mc/no_warnings.test
+++ b/test/tools/llvm-mc/no_warnings.test
@@ -1,6 +1,6 @@
 # RUN: llvm-mc --no-warn %s 2>&1 | FileCheck %s
 # XFAIL: hexagon
-# REQUIRES: native
+# REQUIRES: default_triple
 
 # CHECK-NOT: warning:
 .warning