Update llvm and clang library Makefiles.

39 files changed, 183 insertions, 90 deletions

diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index 328aa78..f4a96bb 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -11,11 +11,6 @@ _libclangstaticanalyzer= \
 _libclangarcmigrate= \
 	libclangarcmigrate
 .endif # MK_CLANG_FULL
-.if ${MK_CLANG_FULL} != "no" || ${MK_LLDB} != "no"
-_libclangrewriter= \
-	libclangrewritecore \
-	libclangrewritefrontend
-.endif # (MK_CLANG_FULL || MK_LLDB)
 
 SUBDIR=	libclanganalysis \
 	${_libclangarcmigrate} \
@@ -28,7 +23,8 @@ SUBDIR=	libclanganalysis \
 	libclangfrontendtool \
 	libclanglex \
 	libclangparse \
-	${_libclangrewriter} \
+	libclangrewritefrontend \
+	libclangrewrite \
 	libclangsema \
 	libclangserialization \
 	${_libclangstaticanalyzer} \
@@ -51,6 +47,7 @@ SUBDIR=	libclanganalysis \
 	libllvmobjcarcopts \
 	libllvmobject \
 	libllvmoption \
+	libllvmprofiledata \
 	libllvmscalaropts \
 	libllvmselectiondag \
 	libllvmsupport \
@@ -74,6 +71,7 @@ SUBDIR=	libclanganalysis \
 	libllvmpowerpcasmparser \
 	libllvmpowerpccodegen \
 	libllvmpowerpcdesc \
+	libllvmpowerpcdisassembler \
 	libllvmpowerpcinfo \
 	libllvmpowerpcinstprinter \
 	libllvmsparcasmparser \
@@ -91,7 +89,8 @@ SUBDIR=	libclanganalysis \
 	libllvmx86utils
 
 .if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=libllvmdebuginfo
+SUBDIR+=libllvmdebuginfo \
+	libllvmmcanalysis
 .endif # MK_CLANG_EXTRAS
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SUBDIR+=libllvmexecutionengine \
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 241d15e..4ede5fb 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -12,7 +12,7 @@ CFLAGS+=	-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
 
 .if ${MK_CLANG_FULL} != "no"
 CFLAGS+=	-DCLANG_ENABLE_ARCMT \
-		-DCLANG_ENABLE_REWRITER \
+		-DCLANG_ENABLE_OBJC_REWRITER \
 		-DCLANG_ENABLE_STATIC_ANALYZER
 .endif # MK_CLANG_FULL
 
@@ -35,7 +35,7 @@ BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-unknown-freebsd11.
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
 		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
-CXXFLAGS+=	-fno-exceptions -fno-rtti
+CXXFLAGS+=	-std=c++11 -fno-exceptions -fno-rtti
 
 .PATH:	${LLVM_SRCS}/${SRCDIR}
 
@@ -80,8 +80,8 @@ AttrDump.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
-AttrIdentifierArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-identifier-arg-list \
+AttrHasAttributeImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-has-attribute-impl \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
@@ -90,11 +90,6 @@ AttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
-AttrLateParsed.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-late-parsed-list \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
 AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-list \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
@@ -115,6 +110,11 @@ AttrParsedAttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
+AttrParserStringSwitches.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+
 AttrPCHRead.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-pch-read \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
@@ -125,11 +125,6 @@ AttrPCHWrite.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
-AttrSpellings.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-spelling-list \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
 AttrSpellingListIndex.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	${CLANG_TBLGEN} -gen-clang-attr-spelling-index \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
@@ -140,8 +135,8 @@ AttrTemplateInstantiate.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
-AttrTypeArg.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-type-arg-list \
+AttrVisitor.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-ast-visitor \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
 
@@ -220,12 +215,6 @@ Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Driver/Options.td
 
-CC1AsOptions.inc.h: ${CLANG_SRCS}/include/clang/Driver/CC1AsOptions.td
-	${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/CC1AsOptions.td
-
 Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 	${CLANG_TBLGEN} -gen-clang-sa-checkers \
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
diff --git a/lib/clang/libclanganalysis/Makefile b/lib/clang/libclanganalysis/Makefile
index f71b689..572ae86 100644
--- a/lib/clang/libclanganalysis/Makefile
+++ b/lib/clang/libclanganalysis/Makefile
@@ -24,9 +24,13 @@ SRCS=	AnalysisDeclContext.cpp \
 	ReachableCode.cpp \
 	ScanfFormatString.cpp \
 	ThreadSafety.cpp \
+	ThreadSafetyCommon.cpp \
+	ThreadSafetyLogical.cpp \
+	ThreadSafetyTIL.cpp \
 	UninitializedValues.cpp
 
 TGHDRS=	AttrList \
+	AttrVisitor \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
diff --git a/lib/clang/libclangarcmigrate/Makefile b/lib/clang/libclangarcmigrate/Makefile
index 1604a50..a6b06c4 100644
--- a/lib/clang/libclangarcmigrate/Makefile
+++ b/lib/clang/libclangarcmigrate/Makefile
@@ -28,6 +28,7 @@ SRCS=	ARCMT.cpp \
 
 TGHDRS=	AttrList \
 	AttrParsedAttrList \
+	AttrVisitor \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
diff --git a/lib/clang/libclangast/Makefile b/lib/clang/libclangast/Makefile
index 71cd684..080d002 100644
--- a/lib/clang/libclangast/Makefile
+++ b/lib/clang/libclangast/Makefile
@@ -65,6 +65,7 @@ SRCS=	APValue.cpp \
 TGHDRS=	AttrDump \
 	AttrImpl \
 	AttrList \
+	AttrVisitor \
 	Attrs \
 	CommentCommandInfo \
 	CommentCommandList \
diff --git a/lib/clang/libclangbasic/Makefile b/lib/clang/libclangbasic/Makefile
index 16bae4c..285ac5d 100644
--- a/lib/clang/libclangbasic/Makefile
+++ b/lib/clang/libclangbasic/Makefile
@@ -5,7 +5,8 @@
 LIB=	clangbasic
 
 SRCDIR=	tools/clang/lib/Basic
-SRCS=	Builtins.cpp \
+SRCS=	Attributes.cpp \
+	Builtins.cpp \
 	CharInfo.cpp \
 	Diagnostic.cpp \
 	DiagnosticIDs.cpp \
@@ -23,9 +24,12 @@ SRCS=	Builtins.cpp \
 	Targets.cpp \
 	TokenKinds.cpp \
 	Version.cpp \
-	VersionTuple.cpp
+	VersionTuple.cpp \
+	VirtualFileSystem.cpp \
+	Warnings.cpp
 
-TGHDRS=	DiagnosticAnalysisKinds \
+TGHDRS=	AttrHasAttributeImpl \
+	DiagnosticAnalysisKinds \
 	DiagnosticASTKinds \
 	DiagnosticCommentKinds \
 	DiagnosticCommonKinds \
diff --git a/lib/clang/libclangcodegen/Makefile b/lib/clang/libclangcodegen/Makefile
index 3b45f6b..97a3dd4 100644
--- a/lib/clang/libclangcodegen/Makefile
+++ b/lib/clang/libclangcodegen/Makefile
@@ -26,29 +26,34 @@ SRCS=	BackendUtil.cpp \
 	CGExprComplex.cpp \
 	CGExprConstant.cpp \
 	CGExprScalar.cpp \
+	CGLoopInfo.cpp \
 	CGObjC.cpp \
 	CGObjCGNU.cpp \
 	CGObjCMac.cpp \
 	CGObjCRuntime.cpp \
 	CGOpenCLRuntime.cpp \
-	CGRTTI.cpp \
+	CGOpenMPRuntime.cpp \
 	CGRecordLayoutBuilder.cpp \
 	CGStmt.cpp \
+	CGStmtOpenMP.cpp \
 	CGVTT.cpp \
 	CGVTables.cpp \
 	CodeGenABITypes.cpp \
 	CodeGenAction.cpp \
 	CodeGenFunction.cpp \
 	CodeGenModule.cpp \
+	CodeGenPGO.cpp \
 	CodeGenTBAA.cpp \
 	CodeGenTypes.cpp \
 	ItaniumCXXABI.cpp \
 	MicrosoftCXXABI.cpp \
-	MicrosoftVBTables.cpp \
 	ModuleBuilder.cpp \
+	SanitizerBlacklist.cpp \
 	TargetInfo.cpp
 
 TGHDRS=	AttrList \
+	AttrParsedAttrList \
+	AttrVisitor \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
diff --git a/lib/clang/libclangdriver/Makefile b/lib/clang/libclangdriver/Makefile
index 91a8f61..f923cc4 100644
--- a/lib/clang/libclangdriver/Makefile
+++ b/lib/clang/libclangdriver/Makefile
@@ -6,11 +6,11 @@ LIB=	clangdriver
 
 SRCDIR=	tools/clang/lib/Driver
 SRCS=	Action.cpp \
-	CC1AsOptions.cpp \
 	Compilation.cpp \
 	Driver.cpp \
 	DriverOptions.cpp \
 	Job.cpp \
+	Multilib.cpp \
 	Phases.cpp \
 	SanitizerArgs.cpp \
 	Tool.cpp \
@@ -20,8 +20,7 @@ SRCS=	Action.cpp \
 	Types.cpp \
 	WindowsToolChain.cpp
 
-TGHDRS=	CC1AsOptions \
-	DiagnosticCommonKinds \
+TGHDRS=	DiagnosticCommonKinds \
 	DiagnosticDriverKinds \
 	DiagnosticSemaKinds \
 	Options
diff --git a/lib/clang/libclangfrontend/Makefile b/lib/clang/libclangfrontend/Makefile
index 4ea3556..4b158bc 100644
--- a/lib/clang/libclangfrontend/Makefile
+++ b/lib/clang/libclangfrontend/Makefile
@@ -26,17 +26,18 @@ SRCS=	ASTConsumers.cpp \
 	LangStandards.cpp \
 	LayoutOverrideSource.cpp \
 	LogDiagnosticPrinter.cpp \
+	ModuleDependencyCollector.cpp \
 	MultiplexConsumer.cpp \
 	PrintPreprocessedOutput.cpp \
 	SerializedDiagnosticPrinter.cpp \
 	TextDiagnostic.cpp \
 	TextDiagnosticBuffer.cpp \
 	TextDiagnosticPrinter.cpp \
-	VerifyDiagnosticConsumer.cpp \
-	Warnings.cpp
+	VerifyDiagnosticConsumer.cpp
 
 TGHDRS=	AttrList \
 	AttrParsedAttrList \
+	AttrVisitor \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
diff --git a/lib/clang/libclanglex/Makefile b/lib/clang/libclanglex/Makefile
index 3a2873f..90b1fca 100644
--- a/lib/clang/libclanglex/Makefile
+++ b/lib/clang/libclanglex/Makefile
@@ -28,7 +28,7 @@ SRCS=	HeaderMap.cpp \
 	TokenConcatenation.cpp \
 	TokenLexer.cpp
 
-TGHDRS=	AttrSpellings \
+TGHDRS=	AttrSpellingListIndex \
 	DiagnosticCommonKinds \
 	DiagnosticLexKinds
 
diff --git a/lib/clang/libclangparse/Makefile b/lib/clang/libclangparse/Makefile
index b204d87..e690d66 100644
--- a/lib/clang/libclangparse/Makefile
+++ b/lib/clang/libclangparse/Makefile
@@ -16,15 +16,14 @@ SRCS=	ParseAST.cpp \
 	ParseOpenMP.cpp \
 	ParsePragma.cpp \
 	ParseStmt.cpp \
+	ParseStmtAsm.cpp \
 	ParseTemplate.cpp \
 	ParseTentative.cpp \
 	Parser.cpp
 
-TGHDRS=	AttrIdentifierArg \
-	AttrLateParsed \
-	AttrList \
+TGHDRS=	AttrList \
 	AttrParsedAttrList \
-	AttrTypeArg \
+	AttrParserStringSwitches \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
diff --git a/lib/clang/libclangrewritecore/Makefile b/lib/clang/libclangrewrite/Makefile
index 80115ee..ec770c3 100644
--- a/lib/clang/libclangrewritecore/Makefile
+++ b/lib/clang/libclangrewrite/Makefile
@@ -2,9 +2,9 @@
 
 .include <bsd.own.mk>
 
-LIB=	clangrewritecore
+LIB=	clangrewrite
 
-SRCDIR=	tools/clang/lib/Rewrite/Core
+SRCDIR=	tools/clang/lib/Rewrite
 SRCS=	DeltaTree.cpp \
 	HTMLRewrite.cpp \
 	RewriteRope.cpp \
diff --git a/lib/clang/libclangrewritefrontend/Makefile b/lib/clang/libclangrewritefrontend/Makefile
index 8c41669..7510d73 100644
--- a/lib/clang/libclangrewritefrontend/Makefile
+++ b/lib/clang/libclangrewritefrontend/Makefile
@@ -4,7 +4,7 @@
 
 LIB=	clangrewritefrontend
 
-SRCDIR=	tools/clang/lib/Rewrite/Frontend
+SRCDIR=	tools/clang/lib/Frontend/Rewrite
 SRCS=	FixItRewriter.cpp \
 	FrontendActions.cpp \
 	HTMLPrint.cpp \
diff --git a/lib/clang/libclangsema/Makefile b/lib/clang/libclangsema/Makefile
index 9157b46..d868880 100644
--- a/lib/clang/libclangsema/Makefile
+++ b/lib/clang/libclangsema/Makefile
@@ -49,7 +49,6 @@ SRCS=	AnalysisBasedWarnings.cpp \
 	SemaTemplateInstantiateDecl.cpp \
 	SemaTemplateVariadic.cpp \
 	SemaType.cpp \
-	TargetAttributesSema.cpp \
 	TypeLocBuilder.cpp
 
 TGHDRS=	AttrList \
@@ -58,6 +57,7 @@ TGHDRS=	AttrList \
 	AttrParsedAttrList \
 	AttrSpellingListIndex \
 	AttrTemplateInstantiate \
+	AttrVisitor \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile b/lib/clang/libclangstaticanalyzercheckers/Makefile
index db27182..5fb1035 100644
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile
@@ -33,7 +33,6 @@ SRCS=	AllocationDiagnostics.cpp \
 	ExprInspectionChecker.cpp \
 	FixedAddressChecker.cpp \
 	GenericTaintChecker.cpp \
-	IdempotentOperationChecker.cpp \
 	IdenticalExprChecker.cpp \
 	IvarInvalidationChecker.cpp \
 	LLVMConventionsChecker.cpp \
@@ -62,6 +61,7 @@ SRCS=	AllocationDiagnostics.cpp \
 	StackAddrEscapeChecker.cpp \
 	StreamChecker.cpp \
 	TaintTesterChecker.cpp \
+	TestAfterDivZeroChecker.cpp \
 	TraversalChecker.cpp \
 	UndefBranchChecker.cpp \
 	UndefCapturedBlockVarChecker.cpp \
@@ -74,6 +74,7 @@ SRCS=	AllocationDiagnostics.cpp \
 	VirtualCallChecker.cpp
 
 TGHDRS=	AttrList \
+	AttrVisitor \
 	Attrs \
 	Checkers \
 	CommentCommandList \
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile b/lib/clang/libclangstaticanalyzerfrontend/Makefile
index de7b326..61b782d 100644
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile
+++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile
@@ -10,6 +10,7 @@ SRCS=	AnalysisConsumer.cpp \
 	FrontendActions.cpp
 
 TGHDRS=	AttrList \
+	AttrVisitor \
 	Attrs \
 	Checkers \
 	CommentCommandList \
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
index ea2a718..afbb611 100644
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@@ -12,9 +12,12 @@ SRCS=	AliasAnalysis.cpp \
 	AliasSetTracker.cpp \
 	Analysis.cpp \
 	BasicAliasAnalysis.cpp \
+	BlockFrequencyInfo.cpp \
+	BlockFrequencyInfoImpl.cpp \
 	BranchProbabilityInfo.cpp \
 	CFG.cpp \
 	CFGPrinter.cpp \
+	CGSCCPassManager.cpp \
 	CaptureTracking.cpp \
 	CodeMetrics.cpp \
 	ConstantFolding.cpp \
@@ -28,6 +31,8 @@ SRCS=	AliasAnalysis.cpp \
 	InstructionSimplify.cpp \
 	Interval.cpp \
 	IntervalPartition.cpp \
+	JumpInstrTableInfo.cpp \
+	LazyCallGraph.cpp \
 	LazyValueInfo.cpp \
 	LibCallAliasAnalysis.cpp \
 	LibCallSemantics.cpp \
@@ -56,9 +61,9 @@ SRCS=	AliasAnalysis.cpp \
 	TypeBasedAliasAnalysis.cpp \
 	ValueTracking.cpp
 
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	BlockFrequencyInfo.cpp
-.endif
+#.if ${MK_CLANG_EXTRAS} != "no"
+#SRCS+=	BlockFrequencyInfo.cpp
+#.endif
 
 TGHDRS=	Intrinsics
 
diff --git a/lib/clang/libllvmarmcodegen/Makefile b/lib/clang/libllvmarmcodegen/Makefile
index db57418..22f75dd 100644
--- a/lib/clang/libllvmarmcodegen/Makefile
+++ b/lib/clang/libllvmarmcodegen/Makefile
@@ -24,6 +24,7 @@ SRCS=	A15SDOptimizer.cpp \
 	ARMMCInstLower.cpp \
 	ARMMachineFunctionInfo.cpp \
 	ARMRegisterInfo.cpp \
+	ARMOptimizeBarriersPass.cpp \
 	ARMSelectionDAGInfo.cpp \
 	ARMSubtarget.cpp \
 	ARMTargetMachine.cpp \
diff --git a/lib/clang/libllvmarmdesc/Makefile b/lib/clang/libllvmarmdesc/Makefile
index 73999ad..42c3f5c 100644
--- a/lib/clang/libllvmarmdesc/Makefile
+++ b/lib/clang/libllvmarmdesc/Makefile
@@ -7,6 +7,7 @@ LIB=	llvmarmdesc
 SRCDIR=	lib/Target/ARM/MCTargetDesc
 SRCS=	ARMAsmBackend.cpp \
 	ARMELFObjectWriter.cpp \
+	ARMELFObjectWriter.cpp \
 	ARMELFStreamer.cpp \
 	ARMMCAsmInfo.cpp \
 	ARMMCCodeEmitter.cpp \
@@ -14,7 +15,10 @@ SRCS=	ARMAsmBackend.cpp \
 	ARMMCTargetDesc.cpp \
 	ARMMachORelocationInfo.cpp \
 	ARMMachObjectWriter.cpp \
-	ARMUnwindOpAsm.cpp
+	ARMTargetStreamer.cpp \
+	ARMUnwindOpAsm.cpp \
+	ARMWinCOFFObjectWriter.cpp \
+	ARMWinCOFFStreamer.cpp
 CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
 
 TGHDRS=	ARMGenInstrInfo \
diff --git a/lib/clang/libllvmasmprinter/Makefile b/lib/clang/libllvmasmprinter/Makefile
index afb0ecf..0a4caa5 100644
--- a/lib/clang/libllvmasmprinter/Makefile
+++ b/lib/clang/libllvmasmprinter/Makefile
@@ -6,19 +6,24 @@ LIB=	llvmasmprinter
 
 SRCDIR=	lib/CodeGen/AsmPrinter
 SRCS=	ARMException.cpp \
+	AddressPool.cpp \
 	AsmPrinter.cpp \
 	AsmPrinterDwarf.cpp \
 	AsmPrinterInlineAsm.cpp \
 	DIE.cpp \
 	DIEHash.cpp \
+	DbgValueHistoryCalculator.cpp \
 	DwarfAccelTable.cpp \
 	DwarfCFIException.cpp \
-	DwarfCompileUnit.cpp \
 	DwarfDebug.cpp \
-	DwarfException.cpp \
+	DwarfFile.cpp \
+	DwarfStringPool.cpp \
+	DwarfUnit.cpp \
+	EHStreamer.cpp \
 	ErlangGCPrinter.cpp \
 	OcamlGCPrinter.cpp \
-	Win64Exception.cpp
+	Win64Exception.cpp \
+	WinCodeViewLineTables.cpp
 
 TGHDRS=	Intrinsics
 
diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile
index e43f39d..a23b173 100644
--- a/lib/clang/libllvmcodegen/Makefile
+++ b/lib/clang/libllvmcodegen/Makefile
@@ -8,11 +8,13 @@ SRCDIR=	lib/CodeGen
 SRCS=	AggressiveAntiDepBreaker.cpp \
 	AllocationOrder.cpp \
 	Analysis.cpp \
+	AtomicExpandLoadLinkedPass.cpp \
 	BasicTargetTransformInfo.cpp \
 	BranchFolding.cpp \
 	CalcSpillWeights.cpp \
 	CallingConvLower.cpp \
 	CodeGen.cpp \
+	CodeGenPrepare.cpp \
 	CriticalAntiDepBreaker.cpp \
 	DFAPacketizer.cpp \
 	DeadMachineInstructionElim.cpp \
@@ -26,11 +28,13 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	GCMetadata.cpp \
 	GCMetadataPrinter.cpp \
 	GCStrategy.cpp \
+	GlobalMerge.cpp \
 	IfConversion.cpp \
 	InlineSpiller.cpp \
 	InterferenceCache.cpp \
 	IntrinsicLowering.cpp \
 	JITCodeEmitter.cpp \
+	JumpInstrTables.cpp \
 	LLVMTargetMachine.cpp \
 	LatencyPriorityQueue.cpp \
 	LexicalScopes.cpp \
@@ -38,10 +42,10 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	LiveInterval.cpp \
 	LiveIntervalAnalysis.cpp \
 	LiveIntervalUnion.cpp \
+	LivePhysRegs.cpp \
 	LiveRangeCalc.cpp \
 	LiveRangeEdit.cpp \
 	LiveRegMatrix.cpp \
-	LiveRegUnits.cpp \
 	LiveStackAnalysis.cpp \
 	LiveVariables.cpp \
 	LocalStackSlotAllocation.cpp \
@@ -52,6 +56,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	MachineCSE.cpp \
 	MachineCodeEmitter.cpp \
 	MachineCopyPropagation.cpp \
+	MachineDominanceFrontier.cpp \
 	MachineDominators.cpp \
 	MachineFunction.cpp \
 	MachineFunctionAnalysis.cpp \
@@ -65,6 +70,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	MachineModuleInfoImpls.cpp \
 	MachinePassRegistry.cpp \
 	MachinePostDominators.cpp \
+	MachineRegionInfo.cpp \
 	MachineRegisterInfo.cpp \
 	MachineSSAUpdater.cpp \
 	MachineScheduler.cpp \
@@ -101,6 +107,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	Spiller.cpp \
 	SplitKit.cpp \
 	StackColoring.cpp \
+	StackMapLivenessAnalysis.cpp \
 	StackMaps.cpp \
 	StackProtector.cpp \
 	StackSlotColoring.cpp \
diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile
index 137b1c3..920b70b 100644
--- a/lib/clang/libllvmcore/Makefile
+++ b/lib/clang/libllvmcore/Makefile
@@ -9,19 +9,24 @@ SRCS=	AsmWriter.cpp \
 	Attributes.cpp \
 	AutoUpgrade.cpp \
 	BasicBlock.cpp \
+	Comdat.cpp \
 	ConstantFold.cpp \
+	ConstantRange.cpp \
 	Constants.cpp \
 	Core.cpp \
 	DIBuilder.cpp \
 	DataLayout.cpp \
 	DebugInfo.cpp \
 	DebugLoc.cpp \
+	DiagnosticInfo.cpp \
+	DiagnosticPrinter.cpp \
 	Dominators.cpp \
 	Function.cpp \
 	GCOV.cpp \
 	GVMaterializer.cpp \
 	Globals.cpp \
 	IRBuilder.cpp \
+	IRPrintingPasses.cpp \
 	InlineAsm.cpp \
 	Instruction.cpp \
 	Instructions.cpp \
@@ -30,12 +35,13 @@ SRCS=	AsmWriter.cpp \
 	LLVMContextImpl.cpp \
 	LeakDetector.cpp \
 	LegacyPassManager.cpp \
+	MDBuilder.cpp \
+	Mangler.cpp \
 	Metadata.cpp \
 	Module.cpp \
 	Pass.cpp \
 	PassManager.cpp \
 	PassRegistry.cpp \
-	PrintModulePass.cpp \
 	Type.cpp \
 	TypeFinder.cpp \
 	Use.cpp \
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
index 84ba618..5843584 100644
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@@ -5,7 +5,8 @@
 LIB=	llvmmc
 
 SRCDIR=	lib/MC
-SRCS=	ELFObjectWriter.cpp \
+SRCS=	ConstantPools.cpp \
+	ELFObjectWriter.cpp \
 	MCAsmBackend.cpp \
 	MCAsmInfo.cpp \
 	MCAsmInfoCOFF.cpp \
@@ -13,7 +14,6 @@ SRCS=	ELFObjectWriter.cpp \
 	MCAsmInfoELF.cpp \
 	MCAsmStreamer.cpp \
 	MCAssembler.cpp \
-	MCAtom.cpp \
 	MCCodeEmitter.cpp \
 	MCCodeGenInfo.cpp \
 	MCContext.cpp \
@@ -23,22 +23,17 @@ SRCS=	ELFObjectWriter.cpp \
 	MCELFStreamer.cpp \
 	MCExpr.cpp \
 	MCExternalSymbolizer.cpp \
-	MCFunction.cpp \
 	MCInst.cpp \
 	MCInstPrinter.cpp \
 	MCInstrAnalysis.cpp \
 	MCLabel.cpp \
+	MCLinkerOptimizationHint.cpp \
 	MCMachOStreamer.cpp \
 	MCMachObjectTargetWriter.cpp \
-	MCModule.cpp \
-	MCModuleYAML.cpp \
 	MCNullStreamer.cpp \
-	MCObjectDisassembler.cpp \
 	MCObjectFileInfo.cpp \
 	MCObjectStreamer.cpp \
-	MCObjectSymbolizer.cpp \
 	MCObjectWriter.cpp \
-	MCPureStreamer.cpp \
 	MCRegisterInfo.cpp \
 	MCRelocationInfo.cpp \
 	MCSection.cpp \
@@ -49,12 +44,15 @@ SRCS=	ELFObjectWriter.cpp \
 	MCSubtargetInfo.cpp \
 	MCSymbol.cpp \
 	MCSymbolizer.cpp \
+	MCTargetOptions.cpp \
 	MCValue.cpp \
 	MCWin64EH.cpp \
 	MachObjectWriter.cpp \
+	StringTableBuilder.cpp \
 	SubtargetFeature.cpp \
 	WinCOFFObjectWriter.cpp \
-	WinCOFFStreamer.cpp
+	WinCOFFStreamer.cpp \
+	YAML.cpp
 
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SRCS+=	MCDisassembler.cpp
diff --git a/lib/clang/libllvmmcanalysis/Makefile b/lib/clang/libllvmmcanalysis/Makefile
new file mode 100644
index 0000000..aa40bbe
--- /dev/null
+++ b/lib/clang/libllvmmcanalysis/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	llvmmcanalysis
+
+SRCDIR=	lib/MC/MCAnalysis
+SRCS=	MCAtom.cpp \
+	MCFunction.cpp \
+	MCModule.cpp \
+	MCModuleYAML.cpp \
+	MCObjectDisassembler.cpp \
+	MCObjectSymbolizer.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipscodegen/Makefile b/lib/clang/libllvmmipscodegen/Makefile
index 9ba7099..ae68d93 100644
--- a/lib/clang/libllvmmipscodegen/Makefile
+++ b/lib/clang/libllvmmipscodegen/Makefile
@@ -7,6 +7,7 @@ LIB=	llvmmipscodegen
 SRCDIR=	lib/Target/Mips
 SRCS=	Mips16FrameLowering.cpp \
 	Mips16HardFloat.cpp \
+	Mips16HardFloatInfo.cpp \
 	Mips16ISelDAGToDAG.cpp \
 	Mips16ISelLowering.cpp \
 	Mips16InstrInfo.cpp \
@@ -16,6 +17,7 @@ SRCS=	Mips16FrameLowering.cpp \
 	MipsCodeEmitter.cpp \
 	MipsConstantIslandPass.cpp \
 	MipsDelaySlotFiller.cpp \
+	MipsFastISel.cpp \
 	MipsFrameLowering.cpp \
 	MipsISelDAGToDAG.cpp \
 	MipsISelLowering.cpp \
@@ -25,6 +27,7 @@ SRCS=	Mips16FrameLowering.cpp \
 	MipsMCInstLower.cpp \
 	MipsMachineFunction.cpp \
 	MipsModuleISelDAGToDAG.cpp \
+	MipsOptimizePICCall.cpp \
 	MipsOs16.cpp \
 	MipsRegisterInfo.cpp \
 	MipsSEFrameLowering.cpp \
@@ -42,6 +45,7 @@ TGHDRS=	Intrinsics \
 	MipsGenCallingConv \
 	MipsGenCodeEmitter \
 	MipsGenDAGISel \
+	MipsGenFastISel \
 	MipsGenInstrInfo \
 	MipsGenMCPseudoLowering \
 	MipsGenRegisterInfo \
diff --git a/lib/clang/libllvmmipsdesc/Makefile b/lib/clang/libllvmmipsdesc/Makefile
index 07cbbfa..e2c04a9 100644
--- a/lib/clang/libllvmmipsdesc/Makefile
+++ b/lib/clang/libllvmmipsdesc/Makefile
@@ -5,12 +5,16 @@
 LIB=	llvmmipsdesc
 
 SRCDIR=	lib/Target/Mips/MCTargetDesc
-SRCS=	MipsAsmBackend.cpp \
+SRCS=	MipsABIFlagsSection.cpp \
+	MipsAsmBackend.cpp \
 	MipsELFObjectWriter.cpp \
+	MipsELFStreamer.cpp \
 	MipsMCAsmInfo.cpp \
 	MipsMCCodeEmitter.cpp \
+	MipsMCExpr.cpp \
 	MipsMCTargetDesc.cpp \
-	MipsReginfo.cpp \
+	MipsNaClELFStreamer.cpp \
+	MipsOptionRecord.cpp \
 	MipsTargetStreamer.cpp
 CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
 
diff --git a/lib/clang/libllvmobject/Makefile b/lib/clang/libllvmobject/Makefile
index 7e48093..804fff8 100644
--- a/lib/clang/libllvmobject/Makefile
+++ b/lib/clang/libllvmobject/Makefile
@@ -13,10 +13,12 @@ SRCS=	Archive.cpp \
 	ELFObjectFile.cpp \
 	ELFYAML.cpp \
 	Error.cpp \
+	IRObjectFile.cpp \
 	MachOObjectFile.cpp \
 	MachOUniversal.cpp \
 	Object.cpp \
 	ObjectFile.cpp \
-	YAML.cpp
+	RecordStreamer.cpp \
+	SymbolicFile.cpp
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcdisassembler/Makefile b/lib/clang/libllvmpowerpcdisassembler/Makefile
new file mode 100644
index 0000000..58735e4
--- /dev/null
+++ b/lib/clang/libllvmpowerpcdisassembler/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	llvmpowerpcdisassembler
+
+SRCDIR=	lib/Target/PowerPC/Disassembler
+INCDIR=	lib/Target/PowerPC
+SRCS=	PPCDisassembler.cpp
+
+TGHDRS=	PPCGenDisassemblerTables \
+	PPCGenInstrInfo \
+	PPCGenRegisterInfo \
+	PPCGenSubtargetInfo
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmprofiledata/Makefile b/lib/clang/libllvmprofiledata/Makefile
new file mode 100644
index 0000000..371f269
--- /dev/null
+++ b/lib/clang/libllvmprofiledata/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	llvmprofiledata
+
+SRCDIR=	lib/ProfileData
+SRCS=	InstrProf.cpp \
+	InstrProfReader.cpp \
+	InstrProfWriter.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmruntimedyld/Makefile b/lib/clang/libllvmruntimedyld/Makefile
index 02ca4bd..c7ccc33 100644
--- a/lib/clang/libllvmruntimedyld/Makefile
+++ b/lib/clang/libllvmruntimedyld/Makefile
@@ -7,6 +7,7 @@ LIB=	llvmruntimedyld
 SRCDIR=	lib/ExecutionEngine/RuntimeDyld
 SRCS=	GDBRegistrar.cpp \
 	RuntimeDyld.cpp \
+	RuntimeDyldChecker.cpp \
 	RuntimeDyldELF.cpp \
 	RuntimeDyldMachO.cpp
 
diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile
index 8da4bf0..58a7340 100644
--- a/lib/clang/libllvmscalaropts/Makefile
+++ b/lib/clang/libllvmscalaropts/Makefile
@@ -6,7 +6,7 @@ LIB=	llvmscalaropts
 
 SRCDIR=	lib/Transforms/Scalar
 SRCS=	ADCE.cpp \
-	CodeGenPrepare.cpp \
+	ConstantHoisting.cpp \
 	ConstantProp.cpp \
 	CorrelatedValuePropagation.cpp \
 	DCE.cpp \
@@ -14,10 +14,10 @@ SRCS=	ADCE.cpp \
 	EarlyCSE.cpp \
 	FlattenCFGPass.cpp \
 	GVN.cpp \
-	GlobalMerge.cpp \
 	IndVarSimplify.cpp \
 	JumpThreading.cpp \
 	LICM.cpp \
+	LoadCombine.cpp \
 	LoopDeletion.cpp \
 	LoopIdiomRecognize.cpp \
 	LoopRerollPass.cpp \
@@ -27,6 +27,7 @@ SRCS=	ADCE.cpp \
 	LoopUnswitch.cpp \
 	LowerAtomic.cpp \
 	MemCpyOptimizer.cpp \
+	MergedLoadStoreMotion.cpp \
 	PartiallyInlineLibCalls.cpp \
 	Reassociate.cpp \
 	Reg2Mem.cpp \
@@ -34,6 +35,8 @@ SRCS=	ADCE.cpp \
 	SROA.cpp \
 	SampleProfile.cpp \
 	ScalarReplAggregates.cpp \
+	Scalarizer.cpp \
+	SeparateConstOffsetFromGEP.cpp \
 	SimplifyCFGPass.cpp \
 	Sink.cpp \
 	StructurizeCFG.cpp \
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index b7cfe6a..4560f2a 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -8,12 +8,14 @@ SRCDIR=	lib/Support
 SRCS=	APFloat.cpp \
 	APInt.cpp \
 	APSInt.cpp \
+	ARMBuildAttrs.cpp \
+	ARMWinEH.cpp \
 	Allocator.cpp \
 	Atomic.cpp \
 	BlockFrequency.cpp \
 	BranchProbability.cpp \
 	CommandLine.cpp \
-	ConstantRange.cpp \
+	Compression.cpp \
 	ConvertUTF.c \
 	ConvertUTFWrapper.cpp \
 	CrashRecoveryContext.cpp \
@@ -37,6 +39,8 @@ SRCS=	APFloat.cpp \
 	IntrusiveRefCntPtr.cpp \
 	IsInf.cpp \
 	IsNAN.cpp \
+	LEB128.cpp \
+	LineIterator.cpp \
 	Locale.cpp \
 	LockFileManager.cpp \
 	MD5.cpp \
@@ -51,12 +55,15 @@ SRCS=	APFloat.cpp \
 	Process.cpp \
 	Program.cpp \
 	RWMutex.cpp \
+	RandomNumberGenerator.cpp \
 	Regex.cpp \
+	ScaledNumber.cpp \
 	SearchForAddressOfSpecialSymbol.cpp \
 	Signals.cpp \
 	SmallPtrSet.cpp \
 	SmallVector.cpp \
 	SourceMgr.cpp \
+	SpecialCaseList.cpp \
 	Statistic.cpp \
 	StreamableMemoryObject.cpp \
 	StringExtras.cpp \
@@ -84,16 +91,10 @@ SRCS=	APFloat.cpp \
 	regerror.c \
 	regexec.c \
 	regfree.c \
-	regstrlcpy.c \
-	system_error.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+=	Disassembler.cpp
-.endif
+	regstrlcpy.c
 
 .if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	Compression.cpp \
-	DataStream.cpp \
+SRCS+=	DataStream.cpp \
 	FileUtilities.cpp \
 	SystemUtils.cpp
 .endif
diff --git a/lib/clang/libllvmtablegen/Makefile b/lib/clang/libllvmtablegen/Makefile
index 9a764b3..fb0c5b8 100644
--- a/lib/clang/libllvmtablegen/Makefile
+++ b/lib/clang/libllvmtablegen/Makefile
@@ -8,6 +8,7 @@ SRCDIR=	lib/TableGen
 SRCS=	Error.cpp \
 	Main.cpp \
 	Record.cpp \
+	SetTheory.cpp \
 	StringMatcher.cpp \
 	TableGenBackend.cpp \
 	TGLexer.cpp \
diff --git a/lib/clang/libllvmtarget/Makefile b/lib/clang/libllvmtarget/Makefile
index b85fbec..4722e68 100644
--- a/lib/clang/libllvmtarget/Makefile
+++ b/lib/clang/libllvmtarget/Makefile
@@ -5,8 +5,7 @@
 LIB=	llvmtarget
 
 SRCDIR=	lib/Target
-SRCS=	Mangler.cpp \
-	Target.cpp \
+SRCS=	Target.cpp \
 	TargetIntrinsicInfo.cpp \
 	TargetJITInfo.cpp \
 	TargetLibraryInfo.cpp \
diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile
index cfad040..ba1fb2a 100644
--- a/lib/clang/libllvmtransformutils/Makefile
+++ b/lib/clang/libllvmtransformutils/Makefile
@@ -5,7 +5,9 @@
 LIB=	llvmtransformutils
 
 SRCDIR=	lib/Transforms/Utils
-SRCS=	BasicBlockUtils.cpp \
+SRCS=	ASanStackFrameLayout.cpp \
+	AddDiscriminators.cpp \
+	BasicBlockUtils.cpp \
 	BreakCriticalEdges.cpp \
 	BuildLibCalls.cpp \
 	BypassSlowDivision.cpp \
@@ -13,6 +15,7 @@ SRCS=	BasicBlockUtils.cpp \
 	CloneModule.cpp \
 	CmpInstAnalysis.cpp \
 	CodeExtractor.cpp \
+	CtorUtils.cpp \
 	DemoteRegToStack.cpp \
 	FlattenCFG.cpp \
 	GlobalStatus.cpp \
@@ -36,7 +39,6 @@ SRCS=	BasicBlockUtils.cpp \
 	SimplifyIndVar.cpp \
 	SimplifyInstructions.cpp \
 	SimplifyLibCalls.cpp \
-	SpecialCaseList.cpp \
 	UnifyFunctionExitNodes.cpp \
 	ValueMapper.cpp
 
diff --git a/lib/clang/libllvmx86asmparser/Makefile b/lib/clang/libllvmx86asmparser/Makefile
index 0d32f9c..f972065 100644
--- a/lib/clang/libllvmx86asmparser/Makefile
+++ b/lib/clang/libllvmx86asmparser/Makefile
@@ -6,7 +6,8 @@ LIB=	llvmx86asmparser
 
 SRCDIR=	lib/Target/X86/AsmParser
 INCDIR=	lib/Target/X86
-SRCS=	X86AsmParser.cpp
+SRCS=	X86AsmInstrumentation.cpp \
+	X86AsmParser.cpp
 
 TGHDRS=	X86GenAsmMatcher \
 	X86GenInstrInfo \
diff --git a/lib/clang/libllvmx86codegen/Makefile b/lib/clang/libllvmx86codegen/Makefile
index ed7ab8e..039a07d 100644
--- a/lib/clang/libllvmx86codegen/Makefile
+++ b/lib/clang/libllvmx86codegen/Makefile
@@ -6,7 +6,7 @@ LIB=	llvmx86codegen
 
 SRCDIR=	lib/Target/X86
 SRCS=	X86AsmPrinter.cpp \
-	X86COFFMachineModuleInfo.cpp \
+	X86AtomicExpandPass.cpp \
 	X86CodeEmitter.cpp \
 	X86FastISel.cpp \
 	X86FixupLEAs.cpp \
diff --git a/lib/clang/libllvmx86desc/Makefile b/lib/clang/libllvmx86desc/Makefile
index 6401649..1ca2839 100644
--- a/lib/clang/libllvmx86desc/Makefile
+++ b/lib/clang/libllvmx86desc/Makefile
@@ -13,7 +13,8 @@ SRCS=	X86AsmBackend.cpp \
 	X86MCTargetDesc.cpp \
 	X86MachORelocationInfo.cpp \
 	X86MachObjectWriter.cpp \
-	X86WinCOFFObjectWriter.cpp
+	X86WinCOFFObjectWriter.cpp \
+	X86WinCOFFStreamer.cpp
 CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
 
 TGHDRS=	X86GenInstrInfo \
diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
index e5489a0..23ec976 100644
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ b/lib/clang/libllvmx86disassembler/Makefile
@@ -9,11 +9,12 @@ INCDIR=	lib/Target/X86
 SRCS=	X86Disassembler.cpp
 
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+=	X86DisassemblerDecoder.c
+SRCS+=	X86DisassemblerDecoder.cpp
 .endif
 
 TGHDRS=	X86GenDisassemblerTables \
 	X86GenInstrInfo \
-	X86GenRegisterInfo
+	X86GenRegisterInfo \
+	X86GenSubtargetInfo
 
 .include "../clang.lib.mk"