First part of updating llvm/clang build glue: getting llvm-tblgen,

clang-tblgen and clang itself built.
svn path=/projects/clang380-import/; revision=292988
2015-12-31 14:39:45 +00:00 · 2015-12-31 14:39:45 +00:00 · 34cdd77646 · 2020-12-20 02:59:44 +00:00
commit 34cdd77646
parent 802df53c82
76 changed files with 217 additions and 143 deletions
--- a/Makefile.inc1
+++ b/Makefile.inc1
@ -1459,11 +1459,11 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtablegen \
-	usr.bin/clang/tblgen \
+	usr.bin/clang/llvm-tblgen \
 	usr.bin/clang/clang-tblgen

 ${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
-${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
+${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
 .endif

 # Default to building the GPL DTC, but build the BSDL one if users explicitly
@ -1668,7 +1668,7 @@ NXBENV=		MAKEOBJDIRPREFIX=${OBJTREE}/nxb \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin
 NXBMAKE=	${NXBENV} ${MAKE} \
-		TBLGEN=${NXBDESTDIR}/usr/bin/tblgen \
+		LLVM_TBLGEN=${NXBDESTDIR}/usr/bin/llvm-tblgen \
 		CLANG_TBLGEN=${NXBDESTDIR}/usr/bin/clang-tblgen \
 		MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
 		MK_GDB=no MK_TESTS=no \
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@ -38,7 +38,6 @@ SUBDIR=	libclanganalysis \
 	libllvmcore \
 	libllvminstcombine \
 	libllvminstrumentation \
-	libllvmipa \
 	libllvmipo \
 	libllvmirreader \
 	libllvmlinker \
@ -58,38 +57,38 @@ SUBDIR=	libclanganalysis \
 	libllvmvectorize \
 	\
 	libllvmaarch64asmparser \
+	libllvmaarch64asmprinter \
 	libllvmaarch64codegen \
 	libllvmaarch64desc \
 	libllvmaarch64info \
-	libllvmaarch64instprinter \
 	libllvmaarch64utils \
 	libllvmarmasmparser \
+	libllvmarmasmprinter \
 	libllvmarmcodegen \
 	libllvmarmdesc \
 	libllvmarmdisassembler \
 	libllvmarminfo \
-	libllvmarminstprinter \
 	libllvmmipsasmparser \
+	libllvmmipsasmprinter \
 	libllvmmipscodegen \
 	libllvmmipsdesc \
 	libllvmmipsinfo \
-	libllvmmipsinstprinter \
 	libllvmpowerpcasmparser \
+	libllvmpowerpcasmprinter \
 	libllvmpowerpccodegen \
 	libllvmpowerpcdesc \
 	libllvmpowerpcdisassembler \
 	libllvmpowerpcinfo \
-	libllvmpowerpcinstprinter \
 	libllvmsparcasmparser \
+	libllvmsparcasmprinter \
 	libllvmsparccodegen \
 	libllvmsparcdesc \
 	libllvmsparcinfo \
-	libllvmsparcinstprinter \
 	libllvmx86asmparser \
+	libllvmx86asmprinter \
 	libllvmx86codegen \
 	libllvmx86desc \
 	libllvmx86info \
-	libllvmx86instprinter \
 	libllvmx86utils

 .if ${MK_CLANG_EXTRAS} != "no"
@ -99,11 +98,13 @@ SUBDIR+=libllvmdebuginfodwarf \
 	libllvmlto \
 	libllvmmirparser \
 	libllvmorcjit \
-	libllvmpasses
+	libllvmpasses \
+	libllvmsymbolize
 .endif # MK_CLANG_EXTRAS
+	
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SUBDIR+=libllvmaarch64disassembler \
-	libllvmexecutionengine \
+SUBDIR+=libllvmexecutionengine \
+	libllvmaarch64disassembler \
 	libllvminterpreter \
 	libllvmmcjit \
 	libllvmmipsdisassembler \
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@ -39,13 +39,24 @@ CXXFLAGS.clang+= -stdlib=libc++

 .PATH:	${LLVM_SRCS}/${SRCDIR}

-TBLGEN?=	tblgen
+LLVM_TBLGEN?=	llvm-tblgen
 CLANG_TBLGEN?=	clang-tblgen

+Attributes.inc.h: ${LLVM_SRCS}/include/llvm/IR/Attributes.td
+	${LLVM_TBLGEN} -gen-attrs \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/include/llvm/IR/Attributes.td
+
+AttributesCompatFunc.inc.h: ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
+	${LLVM_TBLGEN} -gen-attrs \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
+
 Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
-	${TBLGEN} -gen-intrinsic \
+	${LLVM_TBLGEN} -gen-intrinsic \
 	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+
 .for arch in \
 	AArch64/AArch64 ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
 . for hdr in \
@ -63,7 +74,7 @@ Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
 	RegisterInfo/-gen-register-info \
 	SubtargetInfo/-gen-subtarget
 ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
-	${TBLGEN} ${hdr:T:C/,/ /g} \
+	${LLVM_TBLGEN} ${hdr:T:C/,/ /g} \
 	    -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
@ -212,13 +223,13 @@ Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 # XXX: Atrocious hack, need to clean this up later
 .if defined(LIB) && ${LIB} == "llvmlibdriver"
 Options.inc.h: ${LLVM_SRCS}/lib/LibDriver/Options.td
-	${TBLGEN} -gen-opt-parser-defs \
+	${LLVM_TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/lib/LibDriver/Options.td
 .else
 Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
-	${TBLGEN} -gen-opt-parser-defs \
+	${LLVM_TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Driver/Options.td
--- a/lib/clang/include/AttributesCompatFunc.inc
+++ b/lib/clang/include/AttributesCompatFunc.inc
@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AttributesCompatFunc.inc.h"
--- a/lib/clang/include/llvm/IR/Attributes.inc
+++ b/lib/clang/include/llvm/IR/Attributes.inc
@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "Attributes.inc.h"
--- a/lib/clang/libclangast/Makefile
+++ b/lib/clang/libclangast/Makefile
@ -34,6 +34,7 @@ SRCS=	APValue.cpp \
 	ExprCXX.cpp \
 	ExprClassification.cpp \
 	ExprConstant.cpp \
+	ExprObjC.cpp \
 	ExternalASTSource.cpp \
 	InheritViz.cpp \
 	ItaniumCXXABI.cpp \
@ -43,13 +44,17 @@ SRCS=	APValue.cpp \
 	MicrosoftMangle.cpp \
 	NSAPI.cpp \
 	NestedNameSpecifier.cpp \
+	OpenMPClause.cpp \
 	ParentMap.cpp \
 	RawCommentList.cpp \
 	RecordLayout.cpp \
 	RecordLayoutBuilder.cpp \
 	SelectorLocationsKind.cpp \
 	Stmt.cpp \
+	StmtCXX.cpp \
 	StmtIterator.cpp \
+	StmtObjC.cpp \
+	StmtOpenMP.cpp \
 	StmtPrinter.cpp \
 	StmtProfile.cpp \
 	StmtViz.cpp \
--- a/lib/clang/libclangcodegen/Makefile
+++ b/lib/clang/libclangcodegen/Makefile
@ -56,6 +56,7 @@ SRCS=	BackendUtil.cpp \
 TGHDRS=	AttrList \
 	AttrParsedAttrList \
 	AttrVisitor \
+	Attributes \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
--- a/lib/clang/libclangfrontend/Makefile
+++ b/lib/clang/libclangfrontend/Makefile
@ -33,6 +33,7 @@ SRCS=	ASTConsumers.cpp \
 	PrintPreprocessedOutput.cpp \
 	SerializedDiagnosticPrinter.cpp \
 	SerializedDiagnosticReader.cpp \
+	TestModuleFileExtension.cpp \
 	TextDiagnostic.cpp \
 	TextDiagnosticBuffer.cpp \
 	TextDiagnosticPrinter.cpp \
@ -41,6 +42,7 @@ SRCS=	ASTConsumers.cpp \
 TGHDRS=	AttrList \
 	AttrParsedAttrList \
 	AttrVisitor \
+	Attributes \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
--- a/lib/clang/libclangrewritefrontend/Makefile
+++ b/lib/clang/libclangrewritefrontend/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-.include <bsd.own.mk>
+.include <src.opts.mk>

 LIB=	clangrewritefrontend

@ -12,6 +12,11 @@ SRCS=	FixItRewriter.cpp \
 	RewriteMacros.cpp \
 	RewriteTest.cpp

+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	RewriteModernObjC.cpp \
+	RewriteObjC.cpp
+.endif
+
 TGHDRS=	AttrList \
 	AttrParsedAttrList \
 	Attrs \
--- a/lib/clang/libclangsema/Makefile
+++ b/lib/clang/libclangsema/Makefile
@ -24,6 +24,7 @@ SRCS=	AnalysisBasedWarnings.cpp \
 	SemaChecking.cpp \
 	SemaCodeComplete.cpp \
 	SemaConsumer.cpp \
+	SemaCoroutine.cpp \
 	SemaDecl.cpp \
 	SemaDeclAttr.cpp \
 	SemaDeclCXX.cpp \
--- a/lib/clang/libclangserialization/Makefile
+++ b/lib/clang/libclangserialization/Makefile
@ -15,6 +15,7 @@ SRCS=	ASTCommon.cpp \
 	GeneratePCH.cpp \
 	GlobalModuleIndex.cpp \
 	Module.cpp \
+	ModuleFileExtension.cpp \
 	ModuleManager.cpp

 TGHDRS=	AttrList \
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile
@ -28,6 +28,7 @@ SRCS=	AllocationDiagnostics.cpp \
 	DereferenceChecker.cpp \
 	DirectIvarAssignment.cpp \
 	DivZeroChecker.cpp \
+	DynamicTypeChecker.cpp \
 	DynamicTypePropagation.cpp \
 	ExprInspectionChecker.cpp \
 	FixedAddressChecker.cpp \
@ -35,6 +36,7 @@ SRCS=	AllocationDiagnostics.cpp \
 	IdenticalExprChecker.cpp \
 	IvarInvalidationChecker.cpp \
 	LLVMConventionsChecker.cpp \
+	LocalizationChecker.cpp \
 	MacOSKeychainAPIChecker.cpp \
 	MacOSXAPIChecker.cpp \
 	MallocChecker.cpp \
@ -44,12 +46,14 @@ SRCS=	AllocationDiagnostics.cpp \
 	NSErrorChecker.cpp \
 	NoReturnFunctionChecker.cpp \
 	NonNullParamChecker.cpp \
+	NullabilityChecker.cpp \
 	ObjCAtSyncChecker.cpp \
 	ObjCContainersASTChecker.cpp \
 	ObjCContainersChecker.cpp \
 	ObjCMissingSuperCallChecker.cpp \
 	ObjCSelfInitChecker.cpp \
 	ObjCUnusedIVarsChecker.cpp \
+	PaddingChecker.cpp \
 	PointerArithChecker.cpp \
 	PointerSubChecker.cpp \
 	PthreadLockChecker.cpp \
@ -70,6 +74,7 @@ SRCS=	AllocationDiagnostics.cpp \
 	UnixAPIChecker.cpp \
 	UnreachableCodeChecker.cpp \
 	VLASizeChecker.cpp \
+	VforkChecker.cpp \
 	VirtualCallChecker.cpp

 .if ${MK_CLANG_EXTRAS} != "no"
--- a/lib/clang/libclangstaticanalyzercore/Makefile
+++ b/lib/clang/libclangstaticanalyzercore/Makefile
@ -21,6 +21,7 @@ SRCS=	APSIntType.cpp \
 	CommonBugCategories.cpp \
 	ConstraintManager.cpp \
 	CoreEngine.cpp \
+	DynamicTypeMap.cpp \
 	Environment.cpp \
 	ExplodedGraph.cpp \
 	ExprEngine.cpp \
@ -30,6 +31,8 @@ SRCS=	APSIntType.cpp \
 	ExprEngineObjC.cpp \
 	FunctionSummary.cpp \
 	HTMLDiagnostics.cpp \
+	IssueHash.cpp \
+	LoopWidening.cpp \
 	MemRegion.cpp \
 	PathDiagnostic.cpp \
 	PlistDiagnostics.cpp \
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile
+++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile
@ -7,8 +7,8 @@ LIB=	clangstaticanalyzerfrontend
 SRCDIR=	tools/clang/lib/StaticAnalyzer/Frontend
 SRCS=	AnalysisConsumer.cpp \
 	CheckerRegistration.cpp \
-	ModelConsumer.cpp \
 	FrontendActions.cpp \
+	ModelConsumer.cpp \
 	ModelInjector.cpp

 TGHDRS=	AttrList \
--- a/lib/clang/libllvmaarch64instprinter/Makefile
+++ b/lib/clang/libllvmaarch64instprinter/Makefile
@ -2,7 +2,7 @@

 .include <bsd.own.mk>

-LIB=	llvmaarch64instprinter
+LIB=	llvmaarch64asmprinter

 SRCDIR=	lib/Target/AArch64/InstPrinter
 INCDIR=	lib/Target/AArch64
--- a/lib/clang/libllvmaarch64instprinter/Makefile.depend
+++ b/lib/clang/libllvmaarch64instprinter/Makefile.depend
--- a/lib/clang/libllvmaarch64codegen/Makefile
+++ b/lib/clang/libllvmaarch64codegen/Makefile
@ -41,6 +41,7 @@ TGHDRS=	AArch64GenCallingConv \
 	AArch64GenMCPseudoLowering \
 	AArch64GenRegisterInfo \
 	AArch64GenSubtargetInfo \
+	Attributes \
 	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmaarch64desc/Makefile
+++ b/lib/clang/libllvmaarch64desc/Makefile
@ -19,6 +19,7 @@ CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
 TGHDRS=	AArch64GenInstrInfo \
 	AArch64GenMCCodeEmitter \
 	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo
+	AArch64GenSubtargetInfo \
+	Attributes

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmaarch64disassembler/Makefile
+++ b/lib/clang/libllvmaarch64disassembler/Makefile
@ -12,7 +12,9 @@ SRCS=	AArch64Disassembler.cpp
 SRCS+=	AArch64ExternalSymbolizer.cpp
 .endif

-TGHDRS=	AArch64GenDisassemblerTables \
+TGHDRS=	Attributes \
+	Intrinsics \
+	AArch64GenDisassemblerTables \
 	AArch64GenInstrInfo \
 	AArch64GenRegisterInfo \
 	AArch64GenSubtargetInfo
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@ -6,9 +6,7 @@ LIB=	llvmanalysis

 SRCDIR=	lib/Analysis
 SRCS=	AliasAnalysis.cpp \
-	AliasAnalysisCounter.cpp \
 	AliasAnalysisEvaluator.cpp \
-	AliasDebugger.cpp \
 	AliasSetTracker.cpp \
 	AssumptionCache.cpp \
 	BasicAliasAnalysis.cpp \
@ -18,16 +16,23 @@ SRCS=	AliasAnalysis.cpp \
 	CFG.cpp \
 	CFGPrinter.cpp \
 	CFLAliasAnalysis.cpp \
+	CallGraph.cpp \
+	CallGraphSCCPass.cpp \
+	CallPrinter.cpp \
 	CaptureTracking.cpp \
 	CodeMetrics.cpp \
 	ConstantFolding.cpp \
 	CostModel.cpp \
 	Delinearization.cpp \
+	DemandedBits.cpp \
 	DependenceAnalysis.cpp \
 	DivergenceAnalysis.cpp \
 	DomPrinter.cpp \
 	DominanceFrontier.cpp \
+	EHPersonalities.cpp \
+	GlobalsModRef.cpp \
 	IVUsers.cpp \
+	InlineCost.cpp \
 	InstCount.cpp \
 	InstructionSimplify.cpp \
 	Interval.cpp \
@ -35,8 +40,6 @@ SRCS=	AliasAnalysis.cpp \
 	IteratedDominanceFrontier.cpp \
 	LazyCallGraph.cpp \
 	LazyValueInfo.cpp \
-	LibCallAliasAnalysis.cpp \
-	LibCallSemantics.cpp \
 	Lint.cpp \
 	Loads.cpp \
 	LoopAccessAnalysis.cpp \
@ -48,7 +51,10 @@ SRCS=	AliasAnalysis.cpp \
 	MemoryDependenceAnalysis.cpp \
 	MemoryLocation.cpp \
 	ModuleDebugInfoPrinter.cpp \
-	NoAliasAnalysis.cpp \
+	ObjCARCAliasAnalysis.cpp \
+	ObjCARCAnalysisUtils.cpp \
+	ObjCARCInstKind.cpp \
+	OrderedBasicBlock.cpp \
 	PHITransAddr.cpp \
 	PostDominators.cpp \
 	PtrUseVisitor.cpp \
@ -73,6 +79,7 @@ SRCS+=	Analysis.cpp \
 	Trace.cpp
 .endif
 	
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmarminstprinter/Makefile
+++ b/lib/clang/libllvmarminstprinter/Makefile
@ -2,7 +2,7 @@

 .include <bsd.own.mk>

-LIB=	llvmarminstprinter
+LIB=	llvmarmasmprinter

 SRCDIR=	lib/Target/ARM/InstPrinter
 INCDIR=	lib/Target/ARM
--- a/lib/clang/libllvmarminstprinter/Makefile.depend
+++ b/lib/clang/libllvmarminstprinter/Makefile.depend
--- a/lib/clang/libllvmarmcodegen/Makefile
+++ b/lib/clang/libllvmarmcodegen/Makefile
@ -46,6 +46,7 @@ TGHDRS=	ARMGenAsmWriter \
 	ARMGenMCPseudoLowering \
 	ARMGenRegisterInfo \
 	ARMGenSubtargetInfo \
+	Attributes \
 	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmarmdesc/Makefile
+++ b/lib/clang/libllvmarmdesc/Makefile
@ -6,7 +6,6 @@ LIB=	llvmarmdesc

 SRCDIR=	lib/Target/ARM/MCTargetDesc
 SRCS=	ARMAsmBackend.cpp \
-	ARMELFObjectWriter.cpp \
 	ARMELFObjectWriter.cpp \
 	ARMELFStreamer.cpp \
 	ARMMCAsmInfo.cpp \
@ -24,6 +23,7 @@ CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
 TGHDRS=	ARMGenInstrInfo \
 	ARMGenMCCodeEmitter \
 	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo
+	ARMGenSubtargetInfo \
+	Attributes

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmarminfo/Makefile
+++ b/lib/clang/libllvmarminfo/Makefile
@ -10,6 +10,7 @@ SRCS=	ARMTargetInfo.cpp

 TGHDRS=	ARMGenInstrInfo \
 	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo
+	ARMGenSubtargetInfo \
+	Attributes

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmasmparser/Makefile
+++ b/lib/clang/libllvmasmparser/Makefile
@ -9,4 +9,6 @@ SRCS=	LLLexer.cpp \
 	LLParser.cpp \
 	Parser.cpp

+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
--- a/lib/clang/libllvmasmprinter/Makefile
+++ b/lib/clang/libllvmasmprinter/Makefile
@ -12,8 +12,8 @@ SRCS=	ARMException.cpp \
 	AsmPrinterInlineAsm.cpp \
 	DIE.cpp \
 	DIEHash.cpp \
-	DebugLocStream.cpp \
 	DbgValueHistoryCalculator.cpp \
+	DebugLocStream.cpp \
 	DwarfAccelTable.cpp \
 	DwarfCFIException.cpp \
 	DwarfCompileUnit.cpp \
@ -28,6 +28,7 @@ SRCS=	ARMException.cpp \
 	WinCodeViewLineTables.cpp \
 	WinException.cpp

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmbitreader/Makefile
+++ b/lib/clang/libllvmbitreader/Makefile
@ -1,14 +1,18 @@
 # $FreeBSD$

-.include <bsd.own.mk>
+.include <src.opts.mk>

 LIB=	llvmbitreader

 SRCDIR=	lib/Bitcode/Reader
-SRCS=	BitReader.cpp \
-	BitcodeReader.cpp \
+SRCS=	BitcodeReader.cpp \
 	BitstreamReader.cpp

-TGHDRS=	Intrinsics
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	BitReader.cpp
+.endif
+
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmbitwriter/Makefile
+++ b/lib/clang/libllvmbitwriter/Makefile
@ -13,4 +13,7 @@ SRCS=	BitcodeWriter.cpp \
 SRCS+=	BitWriter.cpp
 .endif

+TGHDRS=	Attributes \
+	Intrinsics
+
 .include "../clang.lib.mk"
--- a/lib/clang/libllvmcodegen/Makefile
+++ b/lib/clang/libllvmcodegen/Makefile
@ -27,6 +27,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	ExpandISelPseudos.cpp \
 	ExpandPostRAPseudos.cpp \
 	FaultMaps.cpp \
+	FuncletLayout.cpp \
 	GCMetadata.cpp \
 	GCRootLowering.cpp \
 	GlobalMerge.cpp \
@ -39,6 +40,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	LLVMTargetMachine.cpp \
 	LatencyPriorityQueue.cpp \
 	LexicalScopes.cpp \
+	LiveDebugValues.cpp \
 	LiveDebugVariables.cpp \
 	LiveInterval.cpp \
 	LiveIntervalAnalysis.cpp \
@ -84,6 +86,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	OptimizePHIs.cpp \
 	PHIElimination.cpp \
 	PHIEliminationUtils.cpp \
+	ParallelCG.cpp \
 	Passes.cpp \
 	PeepholeOptimizer.cpp \
 	PostRASchedulerList.cpp \
@ -134,6 +137,7 @@ SRCS+=	GCMetadataPrinter.cpp \
 	GCStrategy.cpp
 .endif

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmcore/Makefile
+++ b/lib/clang/libllvmcore/Makefile
@ -23,6 +23,7 @@ SRCS=	AsmWriter.cpp \
 	DiagnosticPrinter.cpp \
 	Dominators.cpp \
 	Function.cpp \
+	FunctionInfo.cpp \
 	GCOV.cpp \
 	GVMaterializer.cpp \
 	Globals.cpp \
@ -38,7 +39,6 @@ SRCS=	AsmWriter.cpp \
 	MDBuilder.cpp \
 	Mangler.cpp \
 	Metadata.cpp \
-	MetadataTracking.cpp \
 	Module.cpp \
 	Operator.cpp \
 	Pass.cpp \
@ -57,6 +57,8 @@ SRCS=	AsmWriter.cpp \
 SRCS+=	PassManager.cpp
 .endif

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	AttributesCompatFunc \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmdebuginfodwarf/Makefile
+++ b/lib/clang/libllvmdebuginfodwarf/Makefile
@ -16,10 +16,12 @@ SRCS=	DWARFAbbreviationDeclaration.cpp \
 	DWARFDebugInfoEntry.cpp \
 	DWARFDebugLine.cpp \
 	DWARFDebugLoc.cpp \
+	DWARFDebugMacro.cpp \
 	DWARFDebugRangeList.cpp \
 	DWARFFormValue.cpp \
 	DWARFTypeUnit.cpp \
 	DWARFUnit.cpp \
+	DWARFUnitIndex.cpp \
 	SyntaxHighlighting.cpp

 .include "../clang.lib.mk"
--- a/lib/clang/libllvminstcombine/Makefile
+++ b/lib/clang/libllvminstcombine/Makefile
@ -19,6 +19,7 @@ SRCS=	InstCombineAddSub.cpp \
 	InstCombineVectorOps.cpp \
 	InstructionCombining.cpp

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvminstrumentation/Makefile
+++ b/lib/clang/libllvminstrumentation/Makefile
@ -9,16 +9,15 @@ SRCS=	AddressSanitizer.cpp \
 	BoundsChecking.cpp \
 	DataFlowSanitizer.cpp \
 	GCOVProfiling.cpp \
-	MemorySanitizer.cpp \
 	InstrProfiling.cpp \
+	Instrumentation.cpp \
+	MemorySanitizer.cpp \
+	PGOInstrumentation.cpp \
 	SafeStack.cpp \
 	SanitizerCoverage.cpp \
 	ThreadSanitizer.cpp

-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	Instrumentation.cpp
-.endif
-
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmipa/Makefile
+++ b/lib/clang/libllvmipa/Makefile
@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmipa
-
-SRCDIR=	lib/Analysis/IPA
-SRCS=	CallGraph.cpp \
-	CallGraphSCCPass.cpp \
-	CallPrinter.cpp \
-	GlobalsModRef.cpp \
-	InlineCost.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	IPA.cpp
-.endif
-
-TGHDRS=	Intrinsics
-
-.include "../clang.lib.mk"
--- a/lib/clang/libllvmipa/Makefile.depend
+++ b/lib/clang/libllvmipa/Makefile.depend
@ -1,26 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-CallGraph.o: Intrinsics.inc.h
-CallGraph.po: Intrinsics.inc.h
-CallGraphSCCPass.o: Intrinsics.inc.h
-CallGraphSCCPass.po: Intrinsics.inc.h
-CallPrinter.o: Intrinsics.inc.h
-CallPrinter.po: Intrinsics.inc.h
-GlobalsModRef.o: Intrinsics.inc.h
-GlobalsModRef.po: Intrinsics.inc.h
-InlineCost.o: Intrinsics.inc.h
-InlineCost.po: Intrinsics.inc.h
-.endif
--- a/lib/clang/libllvmipo/Makefile
+++ b/lib/clang/libllvmipo/Makefile
@ -8,13 +8,17 @@ SRCDIR=	lib/Transforms/IPO
 SRCS=	ArgumentPromotion.cpp \
 	BarrierNoopPass.cpp \
 	ConstantMerge.cpp \
+	CrossDSOCFI.cpp \
 	DeadArgumentElimination.cpp \
 	ElimAvailExtern.cpp \
 	ExtractGV.cpp \
+	ForceFunctionAttrs.cpp \
 	FunctionAttrs.cpp \
+	FunctionImport.cpp \
 	GlobalDCE.cpp \
 	GlobalOpt.cpp \
 	IPConstantPropagation.cpp \
+	InferFunctionAttrs.cpp \
 	InlineAlways.cpp \
 	InlineSimple.cpp \
 	Inliner.cpp \
@ -25,6 +29,7 @@ SRCS=	ArgumentPromotion.cpp \
 	PartialInlining.cpp \
 	PassManagerBuilder.cpp \
 	PruneEH.cpp \
+	SampleProfile.cpp \
 	StripDeadPrototypes.cpp \
 	StripSymbols.cpp

@ -32,6 +37,7 @@ SRCS=	ArgumentPromotion.cpp \
 SRCS+=	IPO.cpp
 .endif

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmirreader/Makefile
+++ b/lib/clang/libllvmirreader/Makefile
@ -7,4 +7,6 @@ LIB=	llvmirreader
 SRCDIR=	lib/IRReader
 SRCS=	IRReader.cpp

+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
--- a/lib/clang/libllvmlinker/Makefile
+++ b/lib/clang/libllvmlinker/Makefile
@ -5,6 +5,9 @@
 LIB=	llvmlinker

 SRCDIR=	lib/Linker
-SRCS=	LinkModules.cpp
+SRCS=	IRMover.cpp \
+	LinkModules.cpp
+
+TGHDRS=	Attributes

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@ -21,6 +21,7 @@ SRCS=	ConstantPools.cpp \
 	MCELFObjectTargetWriter.cpp \
 	MCELFStreamer.cpp \
 	MCExpr.cpp \
+	MCFragment.cpp \
 	MCInst.cpp \
 	MCInstPrinter.cpp \
 	MCInstrAnalysis.cpp \
--- a/lib/clang/libllvmmipsasmparser/Makefile
+++ b/lib/clang/libllvmmipsasmparser/Makefile
@ -8,7 +8,8 @@ SRCDIR=	lib/Target/Mips/AsmParser
 INCDIR=	lib/Target/Mips
 SRCS=	MipsAsmParser.cpp

-TGHDRS=	MipsGenAsmMatcher \
+TGHDRS=	Attributes \
+	MipsGenAsmMatcher \
 	MipsGenInstrInfo \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
--- a/lib/clang/libllvmmipsinstprinter/Makefile
+++ b/lib/clang/libllvmmipsinstprinter/Makefile
@ -2,13 +2,14 @@

 .include <bsd.own.mk>

-LIB=	llvmmipsinstprinter
+LIB=	llvmmipsasmprinter

 SRCDIR=	lib/Target/Mips/InstPrinter
 INCDIR=	lib/Target/Mips
 SRCS=	MipsInstPrinter.cpp

-TGHDRS=	MipsGenAsmWriter \
+TGHDRS=	Attributes \
+	MipsGenAsmWriter \
 	MipsGenInstrInfo \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
--- a/lib/clang/libllvmmipsinstprinter/Makefile.depend
+++ b/lib/clang/libllvmmipsinstprinter/Makefile.depend
--- a/lib/clang/libllvmmipscodegen/Makefile
+++ b/lib/clang/libllvmmipscodegen/Makefile
@ -38,7 +38,8 @@ SRCS=	Mips16FrameLowering.cpp \
 	MipsTargetMachine.cpp \
 	MipsTargetObjectFile.cpp

-TGHDRS=	Intrinsics \
+TGHDRS=	Attributes \
+	Intrinsics \
 	MipsGenAsmWriter \
 	MipsGenCallingConv \
 	MipsGenCodeEmitter \
--- a/lib/clang/libllvmmipsdesc/Makefile
+++ b/lib/clang/libllvmmipsdesc/Makefile
@ -19,7 +19,8 @@ SRCS=	MipsABIFlagsSection.cpp \
 	MipsTargetStreamer.cpp
 CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..

-TGHDRS=	MipsGenInstrInfo \
+TGHDRS=	Attributes \
+	MipsGenInstrInfo \
 	MipsGenMCCodeEmitter \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
--- a/lib/clang/libllvmmipsdisassembler/Makefile
+++ b/lib/clang/libllvmmipsdisassembler/Makefile
@ -8,7 +8,9 @@ SRCDIR=	lib/Target/Mips/Disassembler
 INCDIR=	lib/Target/Mips
 SRCS=	MipsDisassembler.cpp

-TGHDRS=	MipsGenDisassemblerTables \
+TGHDRS=	Attributes \
+	Intrinsics \
+	MipsGenDisassemblerTables \
 	MipsGenInstrInfo \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
--- a/lib/clang/libllvmmipsinfo/Makefile
+++ b/lib/clang/libllvmmipsinfo/Makefile
@ -8,7 +8,8 @@ SRCDIR=	lib/Target/Mips/TargetInfo
 INCDIR=	lib/Target/Mips
 SRCS=	MipsTargetInfo.cpp

-TGHDRS=	MipsGenInstrInfo \
+TGHDRS=	Attributes \
+	MipsGenInstrInfo \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo

--- a/lib/clang/libllvmobjcarcopts/Makefile
+++ b/lib/clang/libllvmobjcarcopts/Makefile
@ -1,15 +1,12 @@
 # $FreeBSD$

-.include <bsd.own.mk>
+.include <src.opts.mk>

 LIB=	llvmobjcarcopts

 SRCDIR=	lib/Transforms/ObjCARC
-SRCS=	ARCInstKind.cpp \
-	DependencyAnalysis.cpp \
-	ObjCARC.cpp \
+SRCS=	DependencyAnalysis.cpp \
 	ObjCARCAPElim.cpp \
-	ObjCARCAliasAnalysis.cpp \
 	ObjCARCContract.cpp \
 	ObjCARCExpand.cpp \
 	ObjCARCOpts.cpp \
@ -17,6 +14,11 @@ SRCS=	ARCInstKind.cpp \
 	ProvenanceAnalysisEvaluator.cpp \
 	PtrState.cpp

-TGHDRS=	Intrinsics
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	ObjCARC.cpp
+.endif
+
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmobject/Makefile
+++ b/lib/clang/libllvmobject/Makefile
@ -14,6 +14,7 @@ SRCS=	Archive.cpp \
 	ELFObjectFile.cpp \
 	ELFYAML.cpp \
 	Error.cpp \
+	FunctionIndexObjectFile.cpp \
 	IRObjectFile.cpp \
 	MachOObjectFile.cpp \
 	MachOUniversal.cpp \
@ -25,5 +26,7 @@ SRCS=	Archive.cpp \
 SRCS+=	Object.cpp \
 	SymbolSize.cpp
 .endif
+
+TGHDRS=	Attributes
 	
 .include "../clang.lib.mk"
--- a/lib/clang/libllvmorcjit/Makefile
+++ b/lib/clang/libllvmorcjit/Makefile
@ -7,6 +7,9 @@ LIB=	llvmorcjit
 SRCDIR=	lib/ExecutionEngine/Orc
 SRCS=	ExecutionUtils.cpp \
 	IndirectionUtils.cpp \
+	NullResolver.cpp \
+	OrcCBindings.cpp \
+	OrcCBindingsStack.cpp \
 	OrcMCJITReplacement.cpp \
 	OrcTargetSupport.cpp

--- a/lib/clang/libllvmpowerpcinstprinter/Makefile
+++ b/lib/clang/libllvmpowerpcinstprinter/Makefile
@ -2,7 +2,7 @@

 .include <bsd.own.mk>

-LIB=	llvmpowerpcinstprinter
+LIB=	llvmpowerpcasmprinter

 SRCDIR=	lib/Target/PowerPC/InstPrinter
 INCDIR=	lib/Target/PowerPC
--- a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
--- a/lib/clang/libllvmpowerpccodegen/Makefile
+++ b/lib/clang/libllvmpowerpccodegen/Makefile
@ -6,6 +6,7 @@ LIB=	llvmpowerpccodegen

 SRCDIR=	lib/Target/PowerPC
 SRCS=	PPCAsmPrinter.cpp \
+	PPCBoolRetToInt.cpp \
 	PPCBranchSelector.cpp \
 	PPCCTRLoops.cpp \
 	PPCEarlyReturn.cpp \
@ -18,6 +19,7 @@ SRCS=	PPCAsmPrinter.cpp \
 	PPCLoopDataPrefetch.cpp \
 	PPCLoopPreIncPrep.cpp \
 	PPCMCInstLower.cpp \
+	PPCMIPeephole.cpp \
 	PPCMachineFunctionInfo.cpp \
 	PPCRegisterInfo.cpp \
 	PPCSubtarget.cpp \
@ -30,7 +32,8 @@ SRCS=	PPCAsmPrinter.cpp \
 	PPCVSXFMAMutate.cpp \
 	PPCVSXSwapRemoval.cpp

-TGHDRS=	Intrinsics \
+TGHDRS=	Attributes \
+	Intrinsics \
 	PPCGenCallingConv \
 	PPCGenCodeEmitter \
 	PPCGenDAGISel \
--- a/lib/clang/libllvmpowerpcinfo/Makefile
+++ b/lib/clang/libllvmpowerpcinfo/Makefile
@ -8,7 +8,8 @@ SRCDIR=	lib/Target/PowerPC/TargetInfo
 INCDIR=	lib/Target/PowerPC
 SRCS=	PowerPCTargetInfo.cpp

-TGHDRS=	PPCGenInstrInfo \
+TGHDRS=	Attributes \
+	PPCGenInstrInfo \
 	PPCGenRegisterInfo \
 	PPCGenSubtargetInfo

--- a/lib/clang/libllvmprofiledata/Makefile
+++ b/lib/clang/libllvmprofiledata/Makefile
@ -18,4 +18,6 @@ SRCS=	CoverageMapping.cpp \
 SRCS+=	SampleProfWriter.cpp
 .endif

+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
--- a/lib/clang/libllvmscalaropts/Makefile
+++ b/lib/clang/libllvmscalaropts/Makefile
@ -26,6 +26,7 @@ SRCS=	ADCE.cpp \
 	LoopDistribute.cpp \
 	LoopIdiomRecognize.cpp \
 	LoopInterchange.cpp \
+	LoopLoadElimination.cpp \
 	LoopRerollPass.cpp \
 	LoopRotation.cpp \
 	LoopStrengthReduce.cpp \
@ -43,7 +44,6 @@ SRCS=	ADCE.cpp \
 	RewriteStatepointsForGC.cpp \
 	SCCP.cpp \
 	SROA.cpp \
-	SampleProfile.cpp \
 	ScalarReplAggregates.cpp \
 	Scalarizer.cpp \
 	SeparateConstOffsetFromGEP.cpp \
@ -59,6 +59,7 @@ SRCS+=	LoopInstSimplify.cpp \
 	Scalar.cpp
 .endif

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmselectiondag/Makefile
+++ b/lib/clang/libllvmselectiondag/Makefile
@ -30,6 +30,7 @@ SRCS=	DAGCombiner.cpp \
 	TargetLowering.cpp \
 	TargetSelectionDAGInfo.cpp

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmsparcinstprinter/Makefile
+++ b/lib/clang/libllvmsparcinstprinter/Makefile
@ -2,7 +2,7 @@

 .include <bsd.own.mk>

-LIB=	llvmsparcinstprinter
+LIB=	llvmsparcasmprinter

 SRCDIR=	lib/Target/Sparc/InstPrinter
 INCDIR=	lib/Target/Sparc
--- a/lib/clang/libllvmsparcinstprinter/Makefile.depend
+++ b/lib/clang/libllvmsparcinstprinter/Makefile.depend
--- a/lib/clang/libllvmsparccodegen/Makefile
+++ b/lib/clang/libllvmsparccodegen/Makefile
@ -18,7 +18,8 @@ SRCS=	DelaySlotFiller.cpp \
 	SparcTargetMachine.cpp \
 	SparcTargetObjectFile.cpp

-TGHDRS=	Intrinsics \
+TGHDRS=	Attributes \
+	Intrinsics \
 	SparcGenAsmWriter \
 	SparcGenCallingConv \
 	SparcGenCodeEmitter \
--- a/lib/clang/libllvmsparcdisassembler/Makefile
+++ b/lib/clang/libllvmsparcdisassembler/Makefile
@ -8,7 +8,9 @@ SRCDIR=	lib/Target/Sparc/Disassembler
 INCDIR=	lib/Target/Sparc
 SRCS=	SparcDisassembler.cpp

-TGHDRS=	SparcGenDisassemblerTables \
+TGHDRS=	Attributes \
+	Intrinsics \
+	SparcGenDisassemblerTables \
 	SparcGenInstrInfo \
 	SparcGenRegisterInfo \
 	SparcGenSubtargetInfo
--- a/lib/clang/libllvmsparcinfo/Makefile
+++ b/lib/clang/libllvmsparcinfo/Makefile
@ -8,7 +8,8 @@ SRCDIR=	lib/Target/Sparc/TargetInfo
 INCDIR=	lib/Target/Sparc
 SRCS=	SparcTargetInfo.cpp

-TGHDRS=	SparcGenInstrInfo \
+TGHDRS=	Attributes \
+	SparcGenInstrInfo \
 	SparcGenRegisterInfo \
 	SparcGenSubtargetInfo

--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@ -34,6 +34,7 @@ SRCS=	APFloat.cpp \
 	IntEqClasses.cpp \
 	IntervalMap.cpp \
 	IntrusiveRefCntPtr.cpp \
+	JamCRC.cpp \
 	LEB128.cpp \
 	LineIterator.cpp \
 	Locale.cpp \
@ -77,7 +78,6 @@ SRCS=	APFloat.cpp \
 	Triple.cpp \
 	Twine.cpp \
 	Unicode.cpp \
-	Valgrind.cpp \
 	YAMLParser.cpp \
 	YAMLTraits.cpp \
 	circular_raw_ostream.cpp \
@ -96,6 +96,8 @@ SRCS+=	ARMWinEH.cpp \
 	FileOutputBuffer.cpp \
 	FileUtilities.cpp \
 	SystemUtils.cpp \
+	ThreadPool.cpp \
+	Valgrind.cpp \
 	Watchdog.cpp
 .endif

--- a/lib/clang/libllvmtarget/Makefile
+++ b/lib/clang/libllvmtarget/Makefile
@ -16,6 +16,7 @@ SRCS=	Target.cpp \
 SRCS+=	TargetIntrinsicInfo.cpp
 .endif
 	
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmtransformutils/Makefile
+++ b/lib/clang/libllvmtransformutils/Makefile
@ -40,6 +40,7 @@ SRCS=	ASanStackFrameLayout.cpp \
 	SimplifyIndVar.cpp \
 	SimplifyInstructions.cpp \
 	SimplifyLibCalls.cpp \
+	SplitModule.cpp \
 	SymbolRewriter.cpp \
 	UnifyFunctionExitNodes.cpp \
 	ValueMapper.cpp
@ -48,6 +49,7 @@ SRCS=	ASanStackFrameLayout.cpp \
 SRCS+=	Utils.cpp
 .endif

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmvectorize/Makefile
+++ b/lib/clang/libllvmvectorize/Makefile
@ -13,6 +13,7 @@ SRCS=	BBVectorize.cpp \
 SRCS+=	Vectorize.cpp
 .endif

-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics

 .include "../clang.lib.mk"
--- a/lib/clang/libllvmx86instprinter/Makefile
+++ b/lib/clang/libllvmx86instprinter/Makefile
@ -2,7 +2,7 @@

 .include <bsd.own.mk>

-LIB=	llvmx86instprinter
+LIB=	llvmx86asmprinter

 SRCDIR=	lib/Target/X86/InstPrinter
 INCDIR=	lib/Target/X86
--- a/lib/clang/libllvmx86instprinter/Makefile.depend
+++ b/lib/clang/libllvmx86instprinter/Makefile.depend
--- a/lib/clang/libllvmx86codegen/Makefile
+++ b/lib/clang/libllvmx86codegen/Makefile
@ -17,6 +17,7 @@ SRCS=	X86AsmPrinter.cpp \
 	X86InstrInfo.cpp \
 	X86MCInstLower.cpp \
 	X86MachineFunctionInfo.cpp \
+	X86OptimizeLEAs.cpp \
 	X86PadShortFunction.cpp \
 	X86RegisterInfo.cpp \
 	X86SelectionDAGInfo.cpp \
@ -27,7 +28,8 @@ SRCS=	X86AsmPrinter.cpp \
 	X86VZeroUpper.cpp \
 	X86WinEHState.cpp

-TGHDRS=	Intrinsics \
+TGHDRS=	Attributes \
+	Intrinsics \
 	X86GenCallingConv \
 	X86GenDAGISel \
 	X86GenFastISel \
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@ -210,8 +210,9 @@ TRACER= ${TIME_STAMP} ${:U}
 MK_SHARED_TOOLCHAIN= no
 .endif
 TOOLCHAIN_VARS=	AS AR CC CLANG_TBLGEN CXX CPP LD NM OBJDUMP OBJCOPY RANLIB \
-		STRINGS SIZE TBLGEN
+		STRINGS SIZE LLVM_TBLGEN
 _toolchain_bin_CLANG_TBLGEN=	/usr/bin/clang-tblgen
+_toolchain_bin_LLVM_TBLGEN=	/usr/bin/llvm-tblgen
 _toolchain_bin_CXX=		/usr/bin/c++
 .ifdef WITH_TOOLSDIR
 TOOLSDIR?= ${HOST_OBJTOP}/tools
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@ -1052,7 +1052,7 @@ OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
-OLD_FILES+=usr/bin/tblgen
+OLD_FILES+=usr/bin/llvm-tblgen
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/common_interface_defs.h
@ -1143,7 +1143,7 @@ OLD_DIRS+=usr/share/doc/llvm
 OLD_FILES+=usr/share/man/man1/clang.1.gz
 OLD_FILES+=usr/share/man/man1/clang++.1.gz
 OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz
-OLD_FILES+=usr/share/man/man1/tblgen.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz
 .endif

 .if ${MK_CLANG_EXTRAS} == no
--- 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"
--- 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 \
--- a/usr.bin/clang/llvm-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 \
--- a/usr.bin/clang/llvm-tblgen/Makefile.depend
+++ b/usr.bin/clang/llvm-tblgen/Makefile.depend
--- a/usr.bin/clang/llvm-tblgen/llvm-tblgen.1
+++ b/usr.bin/clang/llvm-tblgen/llvm-tblgen.1