DIRDEPS_BUILD: Update clang dependencies after r296417.

Sponsored by:	EMC / Isilon Storage Division

22 files changed, 106 insertions, 90 deletions

diff --git a/usr.bin/clang/bugpoint/Makefile.depend b/usr.bin/clang/bugpoint/Makefile.depend
index 4540509..00803ce 100644
--- a/usr.bin/clang/bugpoint/Makefile.depend
+++ b/usr.bin/clang/bugpoint/Makefile.depend
@@ -15,7 +15,6 @@ DIRDEPS = \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
 	lib/clang/libllvmirreader \
 	lib/clang/libllvmlinker \
@@ -33,9 +32,10 @@ DIRDEPS = \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libthr \
+	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
-	usr.bin/clang/tblgen.host \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
index 24611b4..eea6f09 100644
--- a/usr.bin/clang/clang/Makefile.depend
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -26,18 +26,17 @@ DIRDEPS = \
 	lib/clang/libclangstaticanalyzercore \
 	lib/clang/libclangstaticanalyzerfrontend \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmparser \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
@@ -46,7 +45,6 @@ DIRDEPS = \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
 	lib/clang/libllvmirreader \
 	lib/clang/libllvmlinker \
@@ -54,36 +52,35 @@ DIRDEPS = \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobjcarcopts \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmoption \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmvectorize \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
@@ -93,7 +90,7 @@ DIRDEPS = \
 	lib/msun \
 	lib/ncurses/ncursesw \
 	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/tblgen.host \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llc/Makefile.depend b/usr.bin/clang/llc/Makefile.depend
index 89b7ace..374f871 100644
--- a/usr.bin/clang/llc/Makefile.depend
+++ b/usr.bin/clang/llc/Makefile.depend
@@ -8,63 +8,63 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmparser \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmirreader \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmmirparser \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
@@ -73,7 +73,7 @@ DIRDEPS = \
 	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
-	usr.bin/clang/tblgen.host \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/lldb/Makefile.depend b/usr.bin/clang/lldb/Makefile.depend
index ce522d3..acf1b8c 100644
--- a/usr.bin/clang/lldb/Makefile.depend
+++ b/usr.bin/clang/lldb/Makefile.depend
@@ -42,12 +42,16 @@ DIRDEPS = \
 	lib/clang/liblldbPluginDisassemblerLLVM \
 	lib/clang/liblldbPluginDynamicLoaderPosixDYLD \
 	lib/clang/liblldbPluginDynamicLoaderStatic \
+	lib/clang/liblldbPluginExpressionParserClang \
+	lib/clang/liblldbPluginExpressionParserGo \
 	lib/clang/liblldbPluginInstructionARM \
 	lib/clang/liblldbPluginInstructionARM64 \
 	lib/clang/liblldbPluginInstructionMIPS \
 	lib/clang/liblldbPluginInstructionMIPS64 \
 	lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer \
 	lib/clang/liblldbPluginJITLoaderGDB \
+	lib/clang/liblldbPluginLanguageCPlusPlus \
+	lib/clang/liblldbPluginLanguageObjC \
 	lib/clang/liblldbPluginMemoryHistoryASan \
 	lib/clang/liblldbPluginObjectContainerBSDArchive \
 	lib/clang/liblldbPluginObjectFileELF \
@@ -59,6 +63,7 @@ DIRDEPS = \
 	lib/clang/liblldbPluginProcessGDBRemote \
 	lib/clang/liblldbPluginProcessPOSIX \
 	lib/clang/liblldbPluginProcessUtility \
+	lib/clang/liblldbPluginScriptInterpreterNone \
 	lib/clang/liblldbPluginSymbolFileDWARF \
 	lib/clang/liblldbPluginSymbolFileSymtab \
 	lib/clang/liblldbPluginSymbolVendorELF \
@@ -68,19 +73,19 @@ DIRDEPS = \
 	lib/clang/liblldbTarget \
 	lib/clang/liblldbUtility \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmparser \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
@@ -90,7 +95,6 @@ DIRDEPS = \
 	lib/clang/libllvmexecutionengine \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
 	lib/clang/libllvmirreader \
 	lib/clang/libllvmlinker \
@@ -99,40 +103,40 @@ DIRDEPS = \
 	lib/clang/libllvmmcjit \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobjcarcopts \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmoption \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmruntimedyld \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmvectorize \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
diff --git a/usr.bin/clang/lli/Makefile.depend b/usr.bin/clang/lli/Makefile.depend
index 7a56dc3..7ceb1a7 100644
--- a/usr.bin/clang/lli/Makefile.depend
+++ b/usr.bin/clang/lli/Makefile.depend
@@ -11,13 +11,13 @@ DIRDEPS = \
 	lib/clang/libllvmasmparser \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvmexecutionengine \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
 	lib/clang/libllvminterpreter \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmirreader \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
@@ -33,11 +33,11 @@ DIRDEPS = \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
@@ -46,6 +46,7 @@ DIRDEPS = \
 	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-ar/Makefile.depend b/usr.bin/clang/llvm-ar/Makefile.depend
index e8ffd79..6c076d8 100644
--- a/usr.bin/clang/llvm-ar/Makefile.depend
+++ b/usr.bin/clang/llvm-ar/Makefile.depend
@@ -8,62 +8,62 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmlibdriver \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmoption \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
@@ -72,6 +72,7 @@ DIRDEPS = \
 	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-as/Makefile.depend b/usr.bin/clang/llvm-as/Makefile.depend
index d978dfa..a41464d 100644
--- a/usr.bin/clang/llvm-as/Makefile.depend
+++ b/usr.bin/clang/llvm-as/Makefile.depend
@@ -17,6 +17,7 @@ DIRDEPS = \
 	lib/libthr \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-bcanalyzer/Makefile.depend b/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
index a85bf50..d5ac336 100644
--- a/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
+++ b/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
@@ -16,6 +16,7 @@ DIRDEPS = \
 	lib/libthr \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-cov/Makefile.depend b/usr.bin/clang/llvm-cov/Makefile.depend
index e930acc..652277f 100644
--- a/usr.bin/clang/llvm-cov/Makefile.depend
+++ b/usr.bin/clang/llvm-cov/Makefile.depend
@@ -18,6 +18,7 @@ DIRDEPS = \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libthr \
+	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
 
diff --git a/usr.bin/clang/llvm-cxxdump/Makefile.depend b/usr.bin/clang/llvm-cxxdump/Makefile.depend
index b0fffb4..e1873fe 100644
--- a/usr.bin/clang/llvm-cxxdump/Makefile.depend
+++ b/usr.bin/clang/llvm-cxxdump/Makefile.depend
@@ -8,60 +8,60 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
diff --git a/usr.bin/clang/llvm-diff/Makefile.depend b/usr.bin/clang/llvm-diff/Makefile.depend
index 609342a..0406d2f 100644
--- a/usr.bin/clang/llvm-diff/Makefile.depend
+++ b/usr.bin/clang/llvm-diff/Makefile.depend
@@ -18,6 +18,7 @@ DIRDEPS = \
 	lib/libthr \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-dis/Makefile.depend b/usr.bin/clang/llvm-dis/Makefile.depend
index 9ff2a96..bf56a27 100644
--- a/usr.bin/clang/llvm-dis/Makefile.depend
+++ b/usr.bin/clang/llvm-dis/Makefile.depend
@@ -17,7 +17,7 @@ DIRDEPS = \
 	lib/libthr \
 	lib/msun \
 	lib/ncurses/ncursesw \
-	usr.bin/clang/tblgen.host \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-extract/Makefile.depend b/usr.bin/clang/llvm-extract/Makefile.depend
index 83ab34e..35cf93b 100644
--- a/usr.bin/clang/llvm-extract/Makefile.depend
+++ b/usr.bin/clang/llvm-extract/Makefile.depend
@@ -13,9 +13,9 @@ DIRDEPS = \
 	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
 	lib/clang/libllvmirreader \
+	lib/clang/libllvmlinker \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmobject \
@@ -30,6 +30,7 @@ DIRDEPS = \
 	lib/libthr \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-link/Makefile.depend b/usr.bin/clang/llvm-link/Makefile.depend
index bd34ef2..0195115 100644
--- a/usr.bin/clang/llvm-link/Makefile.depend
+++ b/usr.bin/clang/llvm-link/Makefile.depend
@@ -12,9 +12,11 @@ DIRDEPS = \
 	lib/clang/libllvmbitreader \
 	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcore \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmirreader \
 	lib/clang/libllvmlinker \
+	lib/clang/libllvmmc \
+	lib/clang/libllvmmcparser \
+	lib/clang/libllvmobject \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtransformutils \
 	lib/libc \
@@ -23,6 +25,7 @@ DIRDEPS = \
 	lib/libthr \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-lto/Makefile.depend b/usr.bin/clang/llvm-lto/Makefile.depend
index 65a810f..6915918 100644
--- a/usr.bin/clang/llvm-lto/Makefile.depend
+++ b/usr.bin/clang/llvm-lto/Makefile.depend
@@ -8,19 +8,20 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
+	lib/clang/libllvmasmparser \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
 	lib/clang/libllvmbitwriter \
@@ -28,46 +29,46 @@ DIRDEPS = \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
+	lib/clang/libllvmirreader \
 	lib/clang/libllvmlinker \
 	lib/clang/libllvmlto \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobjcarcopts \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmvectorize \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
@@ -76,7 +77,7 @@ DIRDEPS = \
 	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
-	usr.bin/clang/tblgen.host \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-mc/Makefile.depend b/usr.bin/clang/llvm-mc/Makefile.depend
index b0fffb4..e1873fe 100644
--- a/usr.bin/clang/llvm-mc/Makefile.depend
+++ b/usr.bin/clang/llvm-mc/Makefile.depend
@@ -8,60 +8,60 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
diff --git a/usr.bin/clang/llvm-nm/Makefile.depend b/usr.bin/clang/llvm-nm/Makefile.depend
index b0fffb4..df4b7a2 100644
--- a/usr.bin/clang/llvm-nm/Makefile.depend
+++ b/usr.bin/clang/llvm-nm/Makefile.depend
@@ -8,60 +8,60 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
@@ -70,6 +70,7 @@ DIRDEPS = \
 	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-objdump/Makefile.depend b/usr.bin/clang/llvm-objdump/Makefile.depend
index 67fb73f..40d8758 100644
--- a/usr.bin/clang/llvm-objdump/Makefile.depend
+++ b/usr.bin/clang/llvm-objdump/Makefile.depend
@@ -8,61 +8,61 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvmdebuginfodwarf \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
diff --git a/usr.bin/clang/llvm-profdata/Makefile.depend b/usr.bin/clang/llvm-profdata/Makefile.depend
index e930acc..42a42b2 100644
--- a/usr.bin/clang/llvm-profdata/Makefile.depend
+++ b/usr.bin/clang/llvm-profdata/Makefile.depend
@@ -18,8 +18,10 @@ DIRDEPS = \
 	lib/libc++ \
 	lib/libcompiler_rt \
 	lib/libthr \
+	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile.depend b/usr.bin/clang/llvm-rtdyld/Makefile.depend
index 11d417f..bf4a9ba 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile.depend
+++ b/usr.bin/clang/llvm-rtdyld/Makefile.depend
@@ -8,64 +8,64 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
 	lib/clang/libllvmdebuginfodwarf \
 	lib/clang/libllvmexecutionengine \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcjit \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmruntimedyld \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
diff --git a/usr.bin/clang/llvm-symbolizer/Makefile.depend b/usr.bin/clang/llvm-symbolizer/Makefile.depend
index f85831c..d489cce 100644
--- a/usr.bin/clang/llvm-symbolizer/Makefile.depend
+++ b/usr.bin/clang/llvm-symbolizer/Makefile.depend
@@ -15,6 +15,7 @@ DIRDEPS = \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmsupport \
+	lib/clang/libllvmsymbolize \
 	lib/libc \
 	lib/libc++ \
 	lib/libcompiler_rt \
diff --git a/usr.bin/clang/opt/Makefile.depend b/usr.bin/clang/opt/Makefile.depend
index 021f7a6..b2a718f 100644
--- a/usr.bin/clang/opt/Makefile.depend
+++ b/usr.bin/clang/opt/Makefile.depend
@@ -8,19 +8,19 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64asmprinter \
 	lib/clang/libllvmaarch64codegen \
 	lib/clang/libllvmaarch64desc \
 	lib/clang/libllvmaarch64disassembler \
 	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64instprinter \
 	lib/clang/libllvmaarch64utils \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmasmprinter \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
 	lib/clang/libllvmarmdisassembler \
 	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmparser \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
@@ -29,46 +29,46 @@ DIRDEPS = \
 	lib/clang/libllvmcore \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
 	lib/clang/libllvmirreader \
+	lib/clang/libllvmlinker \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcdisassembler \
 	lib/clang/libllvmmcparser \
 	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipsasmprinter \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobjcarcopts \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpasses \
 	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpcasmprinter \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcdisassembler \
 	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmpowerpcinstprinter \
 	lib/clang/libllvmprofiledata \
 	lib/clang/libllvmscalaropts \
 	lib/clang/libllvmselectiondag \
 	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparcasmprinter \
 	lib/clang/libllvmsparccodegen \
 	lib/clang/libllvmsparcdesc \
 	lib/clang/libllvmsparcdisassembler \
 	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsparcinstprinter \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtarget \
 	lib/clang/libllvmtransformutils \
 	lib/clang/libllvmvectorize \
 	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86asmprinter \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
 	lib/clang/libllvmx86disassembler \
 	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
 	lib/libc++ \
@@ -77,7 +77,7 @@ DIRDEPS = \
 	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
-	usr.bin/clang/tblgen.host \
+	usr.bin/clang/llvm-tblgen.host \
 
 
 .include <dirdeps.mk>