Index: lib/clang/libllvm/Makefile
===================================================================
--- lib/clang/libllvm/Makefile
+++ lib/clang/libllvm/Makefile
@@ -523,7 +523,7 @@
 SRCS_EXT+=	DebugInfo/PDB/PDBSymbolUnknown.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDBSymbolUsingNamespace.cpp
 SRCS_EXT+=	DebugInfo/PDB/UDTLayout.cpp
-SRCS_EXT+=	DebugInfo/Symbolize/DIPrinter.cpp
+SRCS_MIW+=	DebugInfo/Symbolize/DIPrinter.cpp
 SRCS_MIW+=	DebugInfo/Symbolize/SymbolizableObjectFile.cpp
 SRCS_MIW+=	DebugInfo/Symbolize/Symbolize.cpp
 SRCS_MIN+=	Demangle/ItaniumDemangle.cpp
@@ -779,7 +779,7 @@
 SRCS_MIN+=	Support/BlockFrequency.cpp
 SRCS_MIN+=	Support/BranchProbability.cpp
 SRCS_MIN+=	Support/BuryPointer.cpp
-SRCS_EXT+=	Support/COM.cpp
+SRCS_MIW+=	Support/COM.cpp
 SRCS_MIN+=	Support/CachePruning.cpp
 SRCS_MIN+=	Support/Chrono.cpp
 SRCS_MIN+=	Support/CodeGenCoverage.cpp
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -1372,6 +1372,7 @@
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/llvm-objdump
+OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/llvm-tblgen
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/asan_interface.h
@@ -1561,7 +1562,6 @@
 OLD_FILES+=usr/bin/llvm-pdbutil
 OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/bin/llvm-rtdyld
-OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/llvm-xray
 OLD_FILES+=usr/bin/opt
 OLD_FILES+=usr/share/man/man1/bugpoint.1.gz
Index: usr.bin/clang/Makefile
===================================================================
--- usr.bin/clang/Makefile
+++ usr.bin/clang/Makefile
@@ -8,6 +8,7 @@
 
 .if !defined(TOOLS_PREFIX)
 SUBDIR+=	llvm-objdump
+SUBDIR+=	llvm-symbolizer
 
 .if ${MK_CLANG_EXTRAS} != "no"
 SUBDIR+=	bugpoint
@@ -33,7 +34,6 @@
 SUBDIR+=	llvm-objcopy
 SUBDIR+=	llvm-pdbutil
 SUBDIR+=	llvm-rtdyld
-SUBDIR+=	llvm-symbolizer
 SUBDIR+=	llvm-xray
 SUBDIR+=	opt
 .endif