Index: llvm/test/DebugInfo/Generic/lit.local.cfg
===================================================================
--- llvm/test/DebugInfo/Generic/lit.local.cfg
+++ llvm/test/DebugInfo/Generic/lit.local.cfg
@@ -1,4 +1,4 @@
 if not config.target_triple:
     config.unsupported = True
-elif 'xcore' in config.target_triple:
+elif config.target_triple.startswith(("nvptx", "xcore")):
     config.unsupported = True
Index: llvm/test/DebugInfo/attr-btf_type_tag.ll
===================================================================
--- llvm/test/DebugInfo/attr-btf_type_tag.ll
+++ llvm/test/DebugInfo/attr-btf_type_tag.ll
@@ -1,4 +1,4 @@
-; REQUIRES: x86-registered-target
+; REQUIRES: object-emission
 ; RUN: llc -filetype=obj -o %t %s
 ; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s
 ; Source:
Index: llvm/test/DebugInfo/dwarfdump-immutable.ll
===================================================================
--- llvm/test/DebugInfo/dwarfdump-immutable.ll
+++ llvm/test/DebugInfo/dwarfdump-immutable.ll
@@ -1,6 +1,6 @@
 ;; This test checks whether DWARF tag DW_TAG_immutable_type
 ;; is accepted and processed.
-; REQUIRES: default_triple
+; REQUIRES: object-emission
 ; RUN: %llc_dwarf %s -filetype=obj -o - | llvm-dwarfdump - | FileCheck %s
 
 ;; Test whether DW_TAG_immutable_type is accepted.
Index: llvm/test/Instrumentation/InstrProfiling/debug-info-correlate.ll
===================================================================
--- llvm/test/Instrumentation/InstrProfiling/debug-info-correlate.ll
+++ llvm/test/Instrumentation/InstrProfiling/debug-info-correlate.ll
@@ -2,7 +2,7 @@
 ; RUN: FileCheck < %t.ll --implicit-check-not "{{__llvm_prf_data|__llvm_prf_names}}" %s
 ; RUN: %llc_dwarf -O0 -filetype=obj < %t.ll | llvm-dwarfdump - | FileCheck --implicit-check-not "{{DW_TAG|NULL}}" %s --check-prefix CHECK-DWARF
 
-; REQUIRES: system-linux
+; REQUIRES: system-linux, object-emission
 
 @__profn_foo = private constant [3 x i8] c"foo"
 ; CHECK:      @__profc_foo =
Index: llvm/test/MC/AsmParser/debug-empty-source.s
===================================================================
--- llvm/test/MC/AsmParser/debug-empty-source.s
+++ llvm/test/MC/AsmParser/debug-empty-source.s
@@ -1,6 +1,6 @@
 // XFAIL: -aix
 // UNSUPPORTED: -zos
-// REQUIRES: default_triple
+// REQUIRES: object-emission
 // RUN: llvm-mc %s -o -| FileCheck %s
 
 .file 1 "dir1" "foo" source ""
Index: llvm/test/MC/AsmParser/debug-no-source.s
===================================================================
--- llvm/test/MC/AsmParser/debug-no-source.s
+++ llvm/test/MC/AsmParser/debug-no-source.s
@@ -1,5 +1,5 @@
 // UNSUPPORTED: -zos
-// REQUIRES: default_triple
+// REQUIRES: object-emission
 // RUN: llvm-mc %s | FileCheck %s
 
 .file 1 "dir1/foo"
Index: llvm/test/MC/ELF/cfi-version.ll
===================================================================
--- llvm/test/MC/ELF/cfi-version.ll
+++ llvm/test/MC/ELF/cfi-version.ll
@@ -8,7 +8,7 @@
 
 ; .debug_frame is not emitted for targeting Windows x64, arm64, or AIX.
 ; REQUIRES: debug_frame
-; REQUIRES: default_triple
+; REQUIRES: object-emission
 
 ; Function Attrs: nounwind
 define i32 @foo() #0 !dbg !4 {
Index: llvm/test/MC/ELF/dwarf-file0.s
===================================================================
--- llvm/test/MC/ELF/dwarf-file0.s
+++ llvm/test/MC/ELF/dwarf-file0.s
@@ -1,6 +1,6 @@
 # XFAIL: -aix
 # UNSUPPORTED: -zos
-# REQUIRES: default_triple
+# REQUIRES: object-emission
 # RUN: llvm-mc -dwarf-version 4 %s -filetype=obj -o - | llvm-dwarfdump -debug-line - | FileCheck %s
 # RUN: llvm-mc -dwarf-version 4 %s --fatal-warnings -o - | FileCheck %s --check-prefix=ASM
 # RUN: llvm-mc -dwarf-version 5 %s -filetype=obj -o - | llvm-dwarfdump -debug-line - | FileCheck %s
Index: llvm/test/MC/ELF/dwarf-loc0.s
===================================================================
--- llvm/test/MC/ELF/dwarf-loc0.s
+++ llvm/test/MC/ELF/dwarf-loc0.s
@@ -1,6 +1,6 @@
 # XFAIL: -aix
 # UNSUPPORTED: -zos
-# REQUIRES: default_triple
+# REQUIRES: object-emission
 # RUN: llvm-mc -dwarf-version 5 --defsym FILE0=1 %s -filetype=obj -o - | llvm-dwarfdump -debug-line - | FileCheck %s
 # RUN: not llvm-mc -dwarf-version 4 %s -filetype=asm -o - 2>&1 | FileCheck %s -check-prefix=ERR
 # Show that ".loc 0" works in DWARF v5, gets an error for earlier versions.
Index: llvm/test/lit.cfg.py
===================================================================
--- llvm/test/lit.cfg.py
+++ llvm/test/lit.cfg.py
@@ -299,7 +299,7 @@
 if config.target_triple:
     config.available_features.add('default_triple')
     # Direct object generation
-    if not 'xcore' in config.target_triple:
+    if not config.target_triple.startswith(("nvptx", "xcore")):
         config.available_features.add('object-emission')
 
 import subprocess
Index: llvm/test/tools/llvm-mc/lit.local.cfg
===================================================================
--- llvm/test/tools/llvm-mc/lit.local.cfg
+++ llvm/test/tools/llvm-mc/lit.local.cfg
@@ -1,3 +1,3 @@
 # Requires a non-empty default triple for these tests
-if 'default_triple' not in config.available_features:
+if 'object-emission' not in config.available_features:
     config.unsupported = True