Index: llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
===================================================================
--- llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
+++ llvm/unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
@@ -43,7 +43,7 @@
 template <uint16_t Version, class AddrType, class RefAddrType>
 void TestAllForms() {
   Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   // Test that we can decode all DW_FORM values correctly.
@@ -477,7 +477,7 @@
 
 template <uint16_t Version, class AddrType> void TestChildren() {
   Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   // Test that we can decode DW_FORM_ref_addr values correctly in DWARF 2 with
@@ -619,7 +619,7 @@
 
 template <uint16_t Version, class AddrType> void TestReferences() {
   Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   // Test that we can decode DW_FORM_refXXX values correctly in DWARF.
@@ -881,7 +881,7 @@
 
 template <uint16_t Version, class AddrType> void TestAddresses() {
   Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   // Test the DWARF APIs related to accessing the DW_AT_low_pc and
@@ -1069,7 +1069,7 @@
 TEST(DWARFDebugInfo, TestStringOffsets) {
 #endif
   Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   const char *String1 = "Hello";
@@ -1133,7 +1133,7 @@
 
 TEST(DWARFDebugInfo, TestEmptyStringOffsets) {
   Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   const char *String1 = "Hello";
@@ -1162,7 +1162,7 @@
 
 TEST(DWARFDebugInfo, TestRelations) {
   Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   // Test the DWARF APIs related to accessing the DW_AT_low_pc and
@@ -1349,7 +1349,7 @@
 
 TEST(DWARFDebugInfo, TestChildIterators) {
   Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   // Test the DWARF APIs related to iterating across the children of a DIE using
@@ -1458,7 +1458,7 @@
 
 TEST(DWARFDebugInfo, TestAttributeIterators) {
   Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   // Test the DWARF APIs related to iterating across all attribute values in a
@@ -1520,7 +1520,7 @@
 
 TEST(DWARFDebugInfo, TestFindRecurse) {
   Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   uint16_t Version = 4;
@@ -1734,7 +1734,7 @@
 
 TEST(DWARFDebugInfo, TestFindAttrs) {
   Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   // Test the DWARFDie::find() and DWARFDie::findRecursively() that take an
@@ -1797,7 +1797,7 @@
 
 TEST(DWARFDebugInfo, TestImplicitConstAbbrevs) {
   Triple Triple = getNormalizedDefaultTargetTriple();
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   uint16_t Version = 5;
Index: llvm/unittests/DebugInfo/DWARF/DWARFDieManualExtractTest.cpp
===================================================================
--- llvm/unittests/DebugInfo/DWARF/DWARFDieManualExtractTest.cpp
+++ llvm/unittests/DebugInfo/DWARF/DWARFDieManualExtractTest.cpp
@@ -24,7 +24,7 @@
   typedef uint32_t AddrType;
   uint16_t Version = 4;
   Triple Triple = getDefaultTargetTripleForAddrSize(sizeof(AddrType));
-  if (!isObjectEmissionSupported(Triple))
+  if (!isConfigurationSupported(Triple))
     return;
 
   auto ExpectedDG = dwarfgen::Generator::create(Triple, Version);
Index: llvm/unittests/DebugInfo/DWARF/DwarfUtils.h
===================================================================
--- llvm/unittests/DebugInfo/DWARF/DwarfUtils.h
+++ llvm/unittests/DebugInfo/DWARF/DwarfUtils.h
@@ -21,7 +21,6 @@
 Triple getDefaultTargetTripleForAddrSize(uint8_t AddrSize);
 Triple getNormalizedDefaultTargetTriple();
 bool isConfigurationSupported(Triple &T);
-bool isObjectEmissionSupported(Triple &T);
 
 } // end namespace utils
 } // end namespace dwarf
Index: llvm/unittests/DebugInfo/DWARF/DwarfUtils.cpp
===================================================================
--- llvm/unittests/DebugInfo/DWARF/DwarfUtils.cpp
+++ llvm/unittests/DebugInfo/DWARF/DwarfUtils.cpp
@@ -48,12 +48,6 @@
 }
 
 bool llvm::dwarf::utils::isConfigurationSupported(Triple &T) {
-  initLLVMIfNeeded();
-  std::string Err;
-  return TargetRegistry::lookupTarget(T.getTriple(), Err);
-}
-
-bool llvm::dwarf::utils::isObjectEmissionSupported(Triple &T) {
   initLLVMIfNeeded();
   std::string Err;
   const Target *TheTarget = TargetRegistry::lookupTarget(T.getTriple(), Err);