diff --git a/llvm/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll b/llvm/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
--- a/llvm/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
+++ b/llvm/test/CodeGen/X86/2010-02-01-DbgValueCrash.ll
@@ -1,5 +1,4 @@
-; RUN: llc -O1 < %s
-; REQUIRES: default_triple
+; RUN: llc -mtriple=x86_64 -O1 < %s
 
 ; ModuleID = 'pr6157.bc'
 ; formerly crashed in SelectionDAGBuilder
diff --git a/llvm/test/CodeGen/X86/GC/alloc_loop.ll b/llvm/test/CodeGen/X86/GC/alloc_loop.ll
--- a/llvm/test/CodeGen/X86/GC/alloc_loop.ll
+++ b/llvm/test/CodeGen/X86/GC/alloc_loop.ll
@@ -1,6 +1,4 @@
-; RUN: llc < %s
-; REQUIRES: default_triple
-
+; RUN: llc -mtriple=x86_64 < %s
 
 declare i8* @llvm_gc_allocate(i32)
 declare void @llvm_gc_initialize(i32)
diff --git a/llvm/test/CodeGen/X86/GC/cg-O0.ll b/llvm/test/CodeGen/X86/GC/cg-O0.ll
--- a/llvm/test/CodeGen/X86/GC/cg-O0.ll
+++ b/llvm/test/CodeGen/X86/GC/cg-O0.ll
@@ -1,5 +1,4 @@
-; RUN: llc < %s -O0
-; REQUIRES: default_triple
+; RUN: llc -mtriple=x86_64 < %s -O0
 
 define i32 @main() {
 entry:
diff --git a/llvm/test/CodeGen/X86/GC/lower_gcroot.ll b/llvm/test/CodeGen/X86/GC/lower_gcroot.ll
--- a/llvm/test/CodeGen/X86/GC/lower_gcroot.ll
+++ b/llvm/test/CodeGen/X86/GC/lower_gcroot.ll
@@ -1,5 +1,4 @@
-; RUN: llc < %s
-; REQUIRES: default_triple
+; RUN: llc -mtriple=x86_64 < %s
 
 	%Env = type i8*
 
diff --git a/llvm/test/CodeGen/X86/dbg-distringtype-uint.ll b/llvm/test/CodeGen/X86/dbg-distringtype-uint.ll
--- a/llvm/test/CodeGen/X86/dbg-distringtype-uint.ll
+++ b/llvm/test/CodeGen/X86/dbg-distringtype-uint.ll
@@ -1,4 +1,4 @@
-; RUN: llc -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s
+; RUN: llc -mtriple=x86_64 -filetype=obj < %s | llvm-dwarfdump -debug-info - | FileCheck %s
 ;
 ; CHECK: [[SYM:[a-z0-9]+]]:  DW_TAG_formal_parameter
 ; CHECK:                     DW_AT_name	("esym")
diff --git a/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange.ll b/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange.ll
--- a/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange.ll
+++ b/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange.ll
@@ -1,6 +1,6 @@
 ;; This test checks whether DW_AT_rank attribute accepts DIExpression.
 
-; RUN: llc %s -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
+; RUN: llc %s -mtriple=x86_64 -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
 
 ;; Test whether DW_AT_data_location is generated.
 ; CHECK-LABEL:  DW_TAG_array_type
diff --git a/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange_const.ll b/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange_const.ll
--- a/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange_const.ll
+++ b/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange_const.ll
@@ -1,7 +1,7 @@
 ;; This test checks whether DW_AT_rank attribute accepts constants.
 ;; constants are interally stored as DIExpression.
 
-; RUN: llc %s -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
+; RUN: llc %s -mtriple=x86_64 -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
 
 ;; Test whether DW_AT_data_location is generated.
 ; CHECK-LABEL:  DW_TAG_array_type
diff --git a/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange_count.ll b/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange_count.ll
--- a/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange_count.ll
+++ b/llvm/test/DebugInfo/X86/dwarfdump-generic_subrange_count.ll
@@ -1,6 +1,6 @@
 ;; This test checks whether DW_AT_rank attribute accepts DIExpression.
 
-; RUN: llc %s -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
+; RUN: llc %s -mtriple=x86_64 -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
 
 ;; Test whether DW_AT_data_location is generated.
 ; CHECK-LABEL:  DW_TAG_array_type
diff --git a/llvm/test/DebugInfo/X86/dwarfdump-rankConst.ll b/llvm/test/DebugInfo/X86/dwarfdump-rankConst.ll
--- a/llvm/test/DebugInfo/X86/dwarfdump-rankConst.ll
+++ b/llvm/test/DebugInfo/X86/dwarfdump-rankConst.ll
@@ -1,6 +1,6 @@
 ;; This test checks whether DW_AT_rank attribute accepts DIExpression.
 
-; RUN: llc %s -filetype=obj -o %t.o
+; RUN: llc %s -mtriple=x86_64 -filetype=obj -o %t.o
 ; RUN: llvm-dwarfdump  %t.o | FileCheck %s
 
 ;; Test whether DW_AT_data_location is generated.
diff --git a/llvm/test/DebugInfo/X86/dwarfdump-rankExp.ll b/llvm/test/DebugInfo/X86/dwarfdump-rankExp.ll
--- a/llvm/test/DebugInfo/X86/dwarfdump-rankExp.ll
+++ b/llvm/test/DebugInfo/X86/dwarfdump-rankExp.ll
@@ -1,6 +1,6 @@
 ;; This test checks whether DW_AT_rank attribute accepts DIExpression.
 
-; RUN: llc %s -filetype=obj -o %t.o
+; RUN: llc %s -mtriple=x86_64 -filetype=obj -o %t.o
 ; RUN: llvm-dwarfdump  %t.o | FileCheck %s
 
 ;; Test whether DW_AT_data_location is generated.
diff --git a/llvm/test/DebugInfo/X86/dwarfdump-signed_const.ll b/llvm/test/DebugInfo/X86/dwarfdump-signed_const.ll
--- a/llvm/test/DebugInfo/X86/dwarfdump-signed_const.ll
+++ b/llvm/test/DebugInfo/X86/dwarfdump-signed_const.ll
@@ -1,6 +1,6 @@
 ;; This test checks whether DW_OP_consts is emitted correctly.
 
-; RUN: llc %s -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
+; RUN: llc %s -mtriple=x86_64 -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
 
 ;; Test whether DW_AT_data_location is generated.
 ; CHECK-LABEL:  DW_TAG_array_type
diff --git a/llvm/test/DebugInfo/X86/global-constants.ll b/llvm/test/DebugInfo/X86/global-constants.ll
--- a/llvm/test/DebugInfo/X86/global-constants.ll
+++ b/llvm/test/DebugInfo/X86/global-constants.ll
@@ -1,4 +1,4 @@
-; RUN: llc %s -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
+; RUN: llc %s -mtriple=x86_64 -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
 
 ; CHECK-DAG-LABEL:  DW_AT_name ("negconstant")
 ; CHECK:  DW_AT_const_value (-1)
diff --git a/llvm/test/DebugInfo/X86/invalid-global-constants.ll b/llvm/test/DebugInfo/X86/invalid-global-constants.ll
--- a/llvm/test/DebugInfo/X86/invalid-global-constants.ll
+++ b/llvm/test/DebugInfo/X86/invalid-global-constants.ll
@@ -1,4 +1,4 @@
-; RUN: llc %s -filetype=obj -o - 2>&1 | FileCheck %s --check-prefix=ERROR
+; RUN: llc %s -mtriple=x86_64 -filetype=obj -o - 2>&1 | FileCheck %s --check-prefix=ERROR
 ; ERROR: invalid expression
 
 !llvm.dbg.cu = !{!0}
diff --git a/llvm/test/DebugInfo/X86/objc_direct.ll b/llvm/test/DebugInfo/X86/objc_direct.ll
--- a/llvm/test/DebugInfo/X86/objc_direct.ll
+++ b/llvm/test/DebugInfo/X86/objc_direct.ll
@@ -1,5 +1,4 @@
-; UNSUPPORTED: -zos, -aix
-; RUN: llc < %s -filetype=obj -o %t
+; RUN: llc < %s -mtriple=x86_64 -filetype=obj -o %t
 ; RUN: llvm-dwarfdump -v %t | FileCheck %s
 
 ; Source code to regenerate:
diff --git a/llvm/test/LTO/X86/Inputs/remangle_intrinsics.ll b/llvm/test/LTO/X86/Inputs/remangle_intrinsics.ll
--- a/llvm/test/LTO/X86/Inputs/remangle_intrinsics.ll
+++ b/llvm/test/LTO/X86/Inputs/remangle_intrinsics.ll
@@ -1,3 +1,5 @@
+target triple = "x86_64-unknown-linux-gnu"
+
 %struct.rtx_def = type { i16, i16 }
 
 define void @bar(%struct.rtx_def* %a, i8 %b, i32 %c) {
diff --git a/llvm/test/LTO/X86/remangle_intrinsics.ll b/llvm/test/LTO/X86/remangle_intrinsics.ll
--- a/llvm/test/LTO/X86/remangle_intrinsics.ll
+++ b/llvm/test/LTO/X86/remangle_intrinsics.ll
@@ -1,8 +1,6 @@
-; UNSUPPORTED: powerpc64-ibm-aix
 ; RUN: llvm-as < %s > %t1
 ; RUN: llvm-as < %p/Inputs/remangle_intrinsics.ll > %t2
 ; RUN: llvm-lto %t1 %t2 | FileCheck %s
-; REQUIRES: default_triple
 
 ; We have "struct.rtx_def" type in both modules being LTOed. Both modules use
 ; an overloaded intrinsic which has this type in its signature/name. When
@@ -12,6 +10,8 @@
 
 ; CHECK: Wrote native object file
 
+target triple = "x86_64-unknown-linux-gnu"
+
 %struct.rtx_def = type { i16 }
 
 define void @foo(%struct.rtx_def* %a, i8 %b, i32 %c) {