Index: head/lib/clang/libllvm/Makefile
===================================================================
--- head/lib/clang/libllvm/Makefile
+++ head/lib/clang/libllvm/Makefile
@@ -371,30 +371,30 @@
 SRCS_MIN+=	DebugInfo/CodeView/TypeRecordMapping.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeStreamMerger.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeTableCollection.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFAcceleratorTable.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFCompileUnit.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFContext.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDataExtractor.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugAbbrev.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugArangeSet.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugAranges.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugFrame.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLine.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLoc.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugMacro.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugPubTable.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugRangeList.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFDie.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFExpression.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFFormValue.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFGdbIndex.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFTypeUnit.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFUnit.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
-SRCS_MIW+=	DebugInfo/DWARF/DWARFVerifier.cpp
-SRCS_MIW+=	DebugInfo/DWARF/SyntaxHighlighting.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFAcceleratorTable.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFCompileUnit.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFContext.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDataExtractor.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugAbbrev.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugArangeSet.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugAranges.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugFrame.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugLine.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugLoc.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugMacro.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugPubTable.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDebugRangeList.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFDie.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFExpression.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFFormValue.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFGdbIndex.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFTypeUnit.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFUnit.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
+SRCS_XDL+=	DebugInfo/DWARF/DWARFVerifier.cpp
+SRCS_XDL+=	DebugInfo/DWARF/SyntaxHighlighting.cpp
 SRCS_MIN+=	DebugInfo/MSF/MSFBuilder.cpp
 SRCS_MIN+=	DebugInfo/MSF/MSFCommon.cpp
 SRCS_MIN+=	DebugInfo/MSF/MSFError.cpp
@@ -1275,7 +1275,7 @@
 SRCS_EXT+=	XRay/InstrumentationMap.cpp
 
 SRCS_ALL+=	${SRCS_MIN}
-.if !defined(TOOLS_PREFIX) || ${MK_LLD_IS_LD} != "no"
+.if !defined(TOOLS_PREFIX)
 SRCS_ALL+=	${SRCS_MIW}
 .endif
 .if ${MK_CLANG_EXTRAS} != "no"