5 files changed, 16 insertions, 14 deletions

diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index c19f7b6efd32a..8e42cdad35489 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-SUBDIR=	clang clang-tblgen tblgen
+SUBDIR=	clang clang-tblgen llvm-tblgen
 
 .if !defined(TOOLS_PREFIX)
 .if ${MK_CLANG_EXTRAS} != "no"
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 1489a5e2d3270..b6deacb335cc6 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -30,7 +30,9 @@ MLINKS+= clang.1 cc.1 \
 	clang.1 cpp.1
 .endif
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	Attributes \
+	Intrinsics \
+	DiagnosticCommonKinds \
 	DiagnosticDriverKinds \
 	DiagnosticFrontendKinds \
 	DiagnosticLexKinds \
@@ -64,40 +66,39 @@ LIBDEPS=clangfrontendtool \
 	clangbasic \
 	llvmoption \
 	llvmobjcarcopts \
-	llvmlinker \
-	llvmirreader \
 	llvmipo \
 	llvmvectorize \
-	llvmbitwriter \
+	llvmlinker \
+	llvmirreader \
 	llvmasmparser \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
 	llvmaarch64desc \
 	llvmaarch64info \
-	llvmaarch64instprinter \
+	llvmaarch64asmprinter \
 	llvmaarch64utils \
 	llvmarmdisassembler \
 	llvmarmcodegen \
 	llvmarmasmparser \
 	llvmarmdesc \
 	llvmarminfo \
-	llvmarminstprinter \
+	llvmarmasmprinter \
 	llvmmipscodegen \
 	llvmmipsasmparser \
 	llvmmipsdesc \
 	llvmmipsinfo \
-	llvmmipsinstprinter \
+	llvmmipsasmprinter \
 	llvmpowerpcdisassembler \
 	llvmpowerpccodegen \
 	llvmpowerpcasmparser \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
-	llvmpowerpcinstprinter \
+	llvmpowerpcasmprinter \
 	llvmsparccodegen \
 	llvmsparcasmparser \
 	llvmsparcdesc \
 	llvmsparcinfo \
-	llvmsparcinstprinter \
+	llvmsparcasmprinter \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \
@@ -105,11 +106,11 @@ LIBDEPS=clangfrontendtool \
 	llvmcodegen \
 	llvmtarget \
 	llvmscalaropts \
-	llvmprofiledata \
 	llvminstcombine \
 	llvminstrumentation \
+	llvmprofiledata \
 	llvmtransformutils \
-	llvmipa \
+	llvmbitwriter \
 	llvmanalysis \
 	llvmx86desc \
 	llvmobject \
@@ -117,7 +118,7 @@ LIBDEPS=clangfrontendtool \
 	llvmbitreader \
 	llvmmcdisassembler \
 	llvmx86info \
-	llvmx86instprinter \
+	llvmx86asmprinter \
 	llvmmc \
 	llvmx86utils \
 	llvmcore \
diff --git a/usr.bin/clang/tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile
index 75a45de8e53ce..14b46db89ca90 100644
--- a/usr.bin/clang/tblgen/Makefile
+++ b/usr.bin/clang/llvm-tblgen/Makefile
@@ -2,12 +2,13 @@
 
 .include <bsd.own.mk>
 
-PROG_CXX=tblgen
+PROG_CXX=llvm-tblgen
 
 SRCDIR=	utils/TableGen
 SRCS=	AsmMatcherEmitter.cpp \
 	AsmWriterEmitter.cpp \
 	AsmWriterInst.cpp \
+	Attributes.cpp \
 	CTagsEmitter.cpp \
 	CallingConvEmitter.cpp \
 	CodeEmitterGen.cpp \
diff --git a/usr.bin/clang/tblgen/Makefile.depend b/usr.bin/clang/llvm-tblgen/Makefile.depend
index 58ed9a748cc7b..58ed9a748cc7b 100644
--- a/usr.bin/clang/tblgen/Makefile.depend
+++ b/usr.bin/clang/llvm-tblgen/Makefile.depend
diff --git a/usr.bin/clang/tblgen/tblgen.1 b/usr.bin/clang/llvm-tblgen/llvm-tblgen.1
index 9ee3841dc8410..9ee3841dc8410 100644
--- a/usr.bin/clang/tblgen/tblgen.1
+++ b/usr.bin/clang/llvm-tblgen/llvm-tblgen.1