Update Makefiles and other build glue for llvm/clang 3.7.0, as of trunk

r238337.

28 files changed, 186 insertions, 117 deletions

diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index a7513c3..7aa8837 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -97,7 +97,11 @@ SUBDIR=	libclanganalysis \
 	libllvmx86utils
 
 .if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=libllvmdebuginfo
+SUBDIR+=libllvmdebuginfodwarf \
+	libllvmdebuginfopdb \
+	libllvmlto \
+	libllvmorcjit \
+	libllvmpasses
 .endif # MK_CLANG_EXTRAS
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SUBDIR+=libllvmexecutionengine \
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
index 5f973b1..e605a22 100644
--- a/lib/clang/include/Makefile
+++ b/lib/clang/include/Makefile
@@ -8,9 +8,10 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
 
 .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers
 
-INCSDIR=${LIBDIR}/clang/3.6.1/include
+INCSDIR=${LIBDIR}/clang/3.7.0/include
 
-INCS=	__stddef_max_align_t.h \
+INCS=	Intrin.h \
+	__stddef_max_align_t.h \
 	__wmmintrin_aes.h \
 	__wmmintrin_pclmul.h \
 	adxintrin.h \
@@ -19,18 +20,23 @@ INCS=	__stddef_max_align_t.h \
 	arm_acle.h \
 	avx2intrin.h \
 	avx512bwintrin.h \
+	avx512dqintrin.h \
 	avx512erintrin.h \
 	avx512fintrin.h \
 	avx512vlbwintrin.h \
+	avx512vldqintrin.h \
 	avx512vlintrin.h \
 	avxintrin.h \
 	bmi2intrin.h \
 	bmiintrin.h \
 	cpuid.h \
+	cuda_builtin_vars.h \
 	emmintrin.h \
 	f16cintrin.h \
 	fma4intrin.h \
 	fmaintrin.h \
+	htmintrin.h \
+	htmxlintrin.h \
 	ia32intrin.h \
 	immintrin.h \
 	lzcntintrin.h \
@@ -44,10 +50,12 @@ INCS=	__stddef_max_align_t.h \
 	prfchwintrin.h \
 	rdseedintrin.h \
 	rtmintrin.h \
+	s390intrin.h \
 	shaintrin.h \
 	smmintrin.h \
 	tbmintrin.h \
 	tmmintrin.h \
+	vadefs.h \
 	wmmintrin.h \
 	x86intrin.h \
 	xmmintrin.h \
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index e13af79..7244e22 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,11 +1,11 @@
 /* $FreeBSD$ */
 
-#define	CLANG_VERSION			3.6.1
+#define	CLANG_VERSION			3.7.0
 #define	CLANG_VERSION_MAJOR		3
-#define	CLANG_VERSION_MINOR		6
-#define	CLANG_VERSION_PATCHLEVEL	1
+#define	CLANG_VERSION_MINOR		7
+#define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX		" 20150525"
+#define	CLANG_VENDOR_SUFFIX		" 20150530"
 
-#define	SVN_REVISION			"237755"
+#define	SVN_REVISION			"238337"
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index bb435f9..6f49238 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -28,7 +28,7 @@
 /* Define if we have libxml2 */
 /* #undef CLANG_HAVE_LIBXML */
 
-#define PACKAGE_STRING "LLVM 3.6.1"
+#define PACKAGE_STRING "LLVM 3.7.0svn"
 
 /* The LLVM product name and version */
 #define BACKEND_PACKAGE_STRING PACKAGE_STRING
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 7a4e7ea..9921836 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -44,9 +44,6 @@
 /* Define to 1 if you have the `backtrace' function. */
 /* #undef HAVE_BACKTRACE */
 
-/* Define to 1 if you have the `ceilf' function. */
-#define HAVE_CEILF 1
-
 /* Define to 1 if you have the <CrashReporterClient.h> header file. */
 /* #undef HAVE_CRASHREPORTERCLIENT_H */
 
@@ -93,12 +90,6 @@
 #define HAVE_EXECINFO_H 1
 #endif
 
-/* Define to 1 if you have the `exp' function. */
-#define HAVE_EXP 1
-
-/* Define to 1 if you have the `exp2' function. */
-#define HAVE_EXP2 1
-
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
@@ -114,15 +105,6 @@
 /* Define to 1 if you have the <ffi.h> header file. */
 /* #undef HAVE_FFI_H */
 
-/* Set to 1 if the finite function is found in <ieeefp.h> */
-/* #undef HAVE_FINITE_IN_IEEEFP_H */
-
-/* Define to 1 if you have the `floorf' function. */
-#define HAVE_FLOORF 1
-
-/* Define to 1 if you have the `fmodf' function. */
-#define HAVE_FMODF 1
-
 /* Define to 1 if you have the `futimens' function. */
 #if __FreeBSD_version >= 1100056
 #define HAVE_FUTIMENS 1
@@ -155,18 +137,6 @@
 /* Define to 1 if you have the `isatty' function. */
 #define HAVE_ISATTY 1
 
-/* Set to 1 if the isinf function is found in <cmath> */
-#define HAVE_ISINF_IN_CMATH 1
-
-/* Set to 1 if the isinf function is found in <math.h> */
-#define HAVE_ISINF_IN_MATH_H 1
-
-/* Set to 1 if the isnan function is found in <cmath> */
-#define HAVE_ISNAN_IN_CMATH 1
-
-/* Set to 1 if the isnan function is found in <math.h> */
-#define HAVE_ISNAN_IN_MATH_H 1
-
 /* Define if libedit is available on this platform. */
 #define HAVE_LIBEDIT 1
 
@@ -198,17 +168,6 @@
    the current directory to the dynamic linker search path. */
 #define HAVE_LINK_R 1
 
-/* Define to 1 if you have the `log' function. */
-#define HAVE_LOG 1
-
-/* Define to 1 if you have the `log10' function. */
-#define HAVE_LOG10 1
-
-/* Define to 1 if you have the `log2' function. */
-#if __FreeBSD_version >= 900027 || (__FreeBSD_version < 900000 && __FreeBSD_version >= 802502)
-#define HAVE_LOG2 1
-#endif
-
 /* Define to 1 if you have the `longjmp' function. */
 #define HAVE_LONGJMP 1
 
@@ -252,15 +211,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 
-/* Define to 1 if you have the `nearbyintf' function. */
-#define HAVE_NEARBYINTF 1
-
 /* Define to 1 if you have the `posix_spawn' function. */
 /* #undef HAVE_POSIX_SPAWN */
 
-/* Define to 1 if you have the `powf' function. */
-#define HAVE_POWF 1
-
 /* Define to 1 if you have the `pread' function. */
 #define HAVE_PREAD 1
 
@@ -285,15 +238,6 @@
 /* Define to 1 if you have the `realpath' function. */
 #define HAVE_REALPATH 1
 
-/* Define to 1 if you have the `rintf' function. */
-#define HAVE_RINTF 1
-
-/* Define to 1 if you have the `round' function. */
-#define HAVE_ROUND 1
-
-/* Define to 1 if you have the `roundf' function. */
-#define HAVE_ROUNDF 1
-
 /* Define to 1 if you have the `sbrk' function. */
 #define HAVE_SBRK 1
 
@@ -324,12 +268,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
-/* Set to 1 if the std::isinf function is found in <cmath> */
-#define HAVE_STD_ISINF_IN_CMATH 1
-
-/* Set to 1 if the std::isnan function is found in <cmath> */
-#define HAVE_STD_ISNAN_IN_CMATH 1
-
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
@@ -342,9 +280,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if you have the `strtof' function. */
-#define HAVE_STRTOF 1
-
 /* Define to 1 if you have the `strtoll' function. */
 #define HAVE_STRTOLL 1
 
@@ -470,6 +405,9 @@
 /* Have host's ___chkstk */
 /* #undef HAVE____CHKSTK */
 
+/* Have host's ___chkstk_ms */
+/* #undef HAVE____CHKSTK_MS */
+
 /* Linker version detected at compile time. */
 /* #undef HOST_LINK_VERSION */
 
@@ -488,6 +426,9 @@
 /* Installation directory for documentation */
 /* #undef LLVM_DOCSDIR */
 
+/* Define to enable checks that alter the LLVM C++ ABI */
+#define LLVM_ENABLE_ABI_BREAKING_CHECKS 1
+
 /* Define if threads enabled */
 #define LLVM_ENABLE_THREADS 0
 
@@ -555,13 +496,13 @@
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 6
+#define LLVM_VERSION_MINOR 7
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "3.6.1"
+#define LLVM_VERSION_STRING "3.7.0svn"
 
 /* The shared library extension */
 #define LTDL_SHLIB_EXT ".so"
@@ -577,13 +518,13 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 3.6.1"
+#define PACKAGE_STRING "LLVM 3.7.0svn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "llvm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.6.1"
+#define PACKAGE_VERSION "3.7.0svn"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index a44de59..692bd4a 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -92,12 +92,15 @@
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 6
+#define LLVM_VERSION_MINOR 7
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "3.6.1"
+#define LLVM_VERSION_STRING "3.7.0svn"
+
+/* Define to enable checks that alter the LLVM C++ ABI */
+#define LLVM_ENABLE_ABI_BREAKING_CHECKS 1
 
 #endif
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
index 7c81c5b..4d0485f 100644
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@@ -26,24 +26,26 @@ SRCS=	AliasAnalysis.cpp \
 	CostModel.cpp \
 	Delinearization.cpp \
 	DependenceAnalysis.cpp \
+	DivergenceAnalysis.cpp \
 	DomPrinter.cpp \
 	DominanceFrontier.cpp \
-	FunctionTargetTransformInfo.cpp \
 	IVUsers.cpp \
 	InstCount.cpp \
 	InstructionSimplify.cpp \
 	Interval.cpp \
 	IntervalPartition.cpp \
-	JumpInstrTableInfo.cpp \
+	IteratedDominanceFrontier.cpp \
 	LazyCallGraph.cpp \
 	LazyValueInfo.cpp \
 	LibCallAliasAnalysis.cpp \
 	LibCallSemantics.cpp \
 	Lint.cpp \
 	Loads.cpp \
+	LoopAccessAnalysis.cpp \
 	LoopInfo.cpp \
 	LoopPass.cpp \
 	MemDepPrinter.cpp \
+	MemDerefPrinter.cpp \
 	MemoryBuiltins.cpp \
 	MemoryDependenceAnalysis.cpp \
 	ModuleDebugInfoPrinter.cpp \
@@ -60,6 +62,7 @@ SRCS=	AliasAnalysis.cpp \
 	ScalarEvolutionNormalization.cpp \
 	ScopedNoAliasAA.cpp \
 	SparsePropagation.cpp \
+	TargetLibraryInfo.cpp \
 	TargetTransformInfo.cpp \
 	Trace.cpp \
 	TypeBasedAliasAnalysis.cpp \
diff --git a/lib/clang/libllvmarmcodegen/Makefile b/lib/clang/libllvmarmcodegen/Makefile
index dc951e3..6da61b9 100644
--- a/lib/clang/libllvmarmcodegen/Makefile
+++ b/lib/clang/libllvmarmcodegen/Makefile
@@ -21,8 +21,8 @@ SRCS=	A15SDOptimizer.cpp \
 	ARMLoadStoreOptimizer.cpp \
 	ARMMCInstLower.cpp \
 	ARMMachineFunctionInfo.cpp \
-	ARMRegisterInfo.cpp \
 	ARMOptimizeBarriersPass.cpp \
+	ARMRegisterInfo.cpp \
 	ARMSelectionDAGInfo.cpp \
 	ARMSubtarget.cpp \
 	ARMTargetMachine.cpp \
@@ -31,11 +31,10 @@ SRCS=	A15SDOptimizer.cpp \
 	MLxExpansionPass.cpp \
 	Thumb1FrameLowering.cpp \
 	Thumb1InstrInfo.cpp \
-	Thumb1RegisterInfo.cpp \
 	Thumb2ITBlockPass.cpp \
 	Thumb2InstrInfo.cpp \
-	Thumb2RegisterInfo.cpp \
-	Thumb2SizeReduction.cpp
+	Thumb2SizeReduction.cpp \
+	ThumbRegisterInfo.cpp
 
 TGHDRS=	ARMGenAsmWriter \
 	ARMGenCallingConv \
diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile
index d5d8e43..522b707 100644
--- a/lib/clang/libllvmcodegen/Makefile
+++ b/lib/clang/libllvmcodegen/Makefile
@@ -15,6 +15,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	CallingConvLower.cpp \
 	CodeGen.cpp \
 	CodeGenPrepare.cpp \
+	CoreCLRGC.cpp \
 	CriticalAntiDepBreaker.cpp \
 	DFAPacketizer.cpp \
 	DeadMachineInstructionElim.cpp \
@@ -25,16 +26,15 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	ExecutionDepsFix.cpp \
 	ExpandISelPseudos.cpp \
 	ExpandPostRAPseudos.cpp \
-	ForwardControlFlowIntegrity.cpp \
 	GCMetadata.cpp \
 	GCMetadataPrinter.cpp \
+	GCRootLowering.cpp \
 	GCStrategy.cpp \
 	GlobalMerge.cpp \
 	IfConversion.cpp \
 	InlineSpiller.cpp \
 	InterferenceCache.cpp \
 	IntrinsicLowering.cpp \
-	JumpInstrTables.cpp \
 	LLVMTargetMachine.cpp \
 	LatencyPriorityQueue.cpp \
 	LexicalScopes.cpp \
@@ -101,6 +101,8 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	ScheduleDAGPrinter.cpp \
 	ScoreboardHazardRecognizer.cpp \
 	ShadowStackGC.cpp \
+	ShadowStackGCLowering.cpp \
+	ShrinkWrap.cpp \
 	SjLjEHPrepare.cpp \
 	SlotIndexes.cpp \
 	SpillPlacement.cpp \
@@ -121,7 +123,8 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	TargetSchedule.cpp \
 	TwoAddressInstructionPass.cpp \
 	UnreachableBlockElim.cpp \
-	VirtRegMap.cpp
+	VirtRegMap.cpp \
+	WinEHPrepare.cpp
 
 TGHDRS=	Intrinsics
 
diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile
index 921d0be..52cf1d0 100644
--- a/lib/clang/libllvmcore/Makefile
+++ b/lib/clang/libllvmcore/Makefile
@@ -17,6 +17,7 @@ SRCS=	AsmWriter.cpp \
 	DIBuilder.cpp \
 	DataLayout.cpp \
 	DebugInfo.cpp \
+	DebugInfoMetadata.cpp \
 	DebugLoc.cpp \
 	DiagnosticInfo.cpp \
 	DiagnosticPrinter.cpp \
@@ -39,6 +40,7 @@ SRCS=	AsmWriter.cpp \
 	Metadata.cpp \
 	MetadataTracking.cpp \
 	Module.cpp \
+	Operator.cpp \
 	Pass.cpp \
 	PassManager.cpp \
 	PassRegistry.cpp \
@@ -46,7 +48,6 @@ SRCS=	AsmWriter.cpp \
 	Type.cpp \
 	TypeFinder.cpp \
 	Use.cpp \
-	UseListOrder.cpp \
 	User.cpp \
 	Value.cpp \
 	ValueSymbolTable.cpp \
diff --git a/lib/clang/libllvmdebuginfo/Makefile b/lib/clang/libllvmdebuginfodwarf/Makefile
index 3cee40e..5f52f33 100644
--- a/lib/clang/libllvmdebuginfo/Makefile
+++ b/lib/clang/libllvmdebuginfodwarf/Makefile
@@ -2,11 +2,11 @@
 
 .include <src.opts.mk>
 
-LIB=	llvmdebuginfo
+LIB=	llvmdebuginfodwarf
 
-SRCDIR=	lib/DebugInfo
-SRCS=	DIContext.cpp \
-	DWARFAbbreviationDeclaration.cpp \
+SRCDIR=	lib/DebugInfo/DWARF
+SRCS=	DWARFAbbreviationDeclaration.cpp \
+	DWARFAcceleratorTable.cpp \
 	DWARFCompileUnit.cpp \
 	DWARFContext.cpp \
 	DWARFDebugAbbrev.cpp \
@@ -19,11 +19,7 @@ SRCS=	DIContext.cpp \
 	DWARFDebugRangeList.cpp \
 	DWARFFormValue.cpp \
 	DWARFTypeUnit.cpp \
-	DWARFUnit.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	DWARFAcceleratorTable.cpp \
+	DWARFUnit.cpp \
 	SyntaxHighlighting.cpp
-.endif
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmdebuginfopdb/Makefile b/lib/clang/libllvmdebuginfopdb/Makefile
new file mode 100644
index 0000000..1b694db
--- /dev/null
+++ b/lib/clang/libllvmdebuginfopdb/Makefile
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+LIB=	llvmdebuginfopdb
+
+SRCDIR=	lib/DebugInfo/PDB
+SRCS=	IPDBSourceFile.cpp \
+	PDB.cpp \
+	PDBContext.cpp \
+	PDBExtras.cpp \
+	PDBInterfaceAnchors.cpp \
+	PDBSymDumper.cpp \
+	PDBSymbol.cpp \
+	PDBSymbolAnnotation.cpp \
+	PDBSymbolBlock.cpp \
+	PDBSymbolCompiland.cpp \
+	PDBSymbolCompilandDetails.cpp \
+	PDBSymbolCompilandEnv.cpp \
+	PDBSymbolCustom.cpp \
+	PDBSymbolData.cpp \
+	PDBSymbolExe.cpp \
+	PDBSymbolFunc.cpp \
+	PDBSymbolFuncDebugEnd.cpp \
+	PDBSymbolFuncDebugStart.cpp \
+	PDBSymbolLabel.cpp \
+	PDBSymbolPublicSymbol.cpp \
+	PDBSymbolThunk.cpp \
+	PDBSymbolTypeArray.cpp \
+	PDBSymbolTypeBaseClass.cpp \
+	PDBSymbolTypeBuiltin.cpp \
+	PDBSymbolTypeCustom.cpp \
+	PDBSymbolTypeDimension.cpp \
+	PDBSymbolTypeEnum.cpp \
+	PDBSymbolTypeFriend.cpp \
+	PDBSymbolTypeFunctionArg.cpp \
+	PDBSymbolTypeFunctionSig.cpp \
+	PDBSymbolTypeManaged.cpp \
+	PDBSymbolTypePointer.cpp \
+	PDBSymbolTypeTypedef.cpp \
+	PDBSymbolTypeUDT.cpp \
+	PDBSymbolTypeVTable.cpp \
+	PDBSymbolTypeVTableShape.cpp \
+	PDBSymbolUnknown.cpp \
+	PDBSymbolUsingNamespace.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmexecutionengine/Makefile b/lib/clang/libllvmexecutionengine/Makefile
index 5a7e6c3..13855a0 100644
--- a/lib/clang/libllvmexecutionengine/Makefile
+++ b/lib/clang/libllvmexecutionengine/Makefile
@@ -8,6 +8,7 @@ SRCDIR=	lib/ExecutionEngine
 SRCS=	ExecutionEngine.cpp \
 	ExecutionEngineBindings.cpp \
 	GDBRegistrationListener.cpp \
+	SectionMemoryManager.cpp \
 	TargetSelect.cpp
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile
index 85af036..8bd2169 100644
--- a/lib/clang/libllvmipo/Makefile
+++ b/lib/clang/libllvmipo/Makefile
@@ -19,6 +19,7 @@ SRCS=	ArgumentPromotion.cpp \
 	Inliner.cpp \
 	Internalize.cpp \
 	LoopExtractor.cpp \
+	LowerBitSets.cpp \
 	MergeFunctions.cpp \
 	PartialInlining.cpp \
 	PassManagerBuilder.cpp \
diff --git a/lib/clang/libllvmlto/Makefile b/lib/clang/libllvmlto/Makefile
new file mode 100644
index 0000000..776c45f
--- /dev/null
+++ b/lib/clang/libllvmlto/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+LIB=	llvmlto
+
+SRCDIR=	lib/LTO
+SRCS=	LTOCodeGenerator.cpp \
+	LTOModule.cpp
+
+TGHDRS=	Intrinsics
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
index f4582c2..d88eebe 100644
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@@ -25,6 +25,7 @@ SRCS=	ConstantPools.cpp \
 	MCInst.cpp \
 	MCInstPrinter.cpp \
 	MCInstrAnalysis.cpp \
+	MCInstrDesc.cpp \
 	MCLabel.cpp \
 	MCLinkerOptimizationHint.cpp \
 	MCMachOStreamer.cpp \
diff --git a/lib/clang/libllvmmcjit/Makefile b/lib/clang/libllvmmcjit/Makefile
index ea3cf07..207fd81 100644
--- a/lib/clang/libllvmmcjit/Makefile
+++ b/lib/clang/libllvmmcjit/Makefile
@@ -5,7 +5,6 @@
 LIB=	llvmmcjit
 
 SRCDIR=	lib/ExecutionEngine/MCJIT
-SRCS=	MCJIT.cpp \
-	SectionMemoryManager.cpp
+SRCS=	MCJIT.cpp
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmobjcarcopts/Makefile b/lib/clang/libllvmobjcarcopts/Makefile
index ee3ca83..308e11a 100644
--- a/lib/clang/libllvmobjcarcopts/Makefile
+++ b/lib/clang/libllvmobjcarcopts/Makefile
@@ -5,16 +5,17 @@
 LIB=	llvmobjcarcopts
 
 SRCDIR=	lib/Transforms/ObjCARC
-SRCS=	ObjCARC.cpp \
-	ObjCARCOpts.cpp \
-	ObjCARCExpand.cpp \
+SRCS=	ARCInstKind.cpp \
+	DependencyAnalysis.cpp \
+	ObjCARC.cpp \
 	ObjCARCAPElim.cpp \
 	ObjCARCAliasAnalysis.cpp \
-	ObjCARCUtil.cpp \
 	ObjCARCContract.cpp \
-	DependencyAnalysis.cpp \
+	ObjCARCExpand.cpp \
+	ObjCARCOpts.cpp \
 	ProvenanceAnalysis.cpp \
-	ProvenanceAnalysisEvaluator.cpp
+	ProvenanceAnalysisEvaluator.cpp \
+	PtrState.cpp
 
 TGHDRS=	Intrinsics
 
diff --git a/lib/clang/libllvmorcjit/Makefile b/lib/clang/libllvmorcjit/Makefile
new file mode 100644
index 0000000..84621de
--- /dev/null
+++ b/lib/clang/libllvmorcjit/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	llvmorcjit
+
+SRCDIR=	lib/ExecutionEngine/Orc
+SRCS=	ExecutionUtils.cpp \
+	IndirectionUtils.cpp \
+	OrcMCJITReplacement.cpp \
+	OrcTargetSupport.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpasses/Makefile b/lib/clang/libllvmpasses/Makefile
new file mode 100644
index 0000000..ed4e20d
--- /dev/null
+++ b/lib/clang/libllvmpasses/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+LIB=	llvmpasses
+
+SRCDIR=	lib/Passes
+SRCS=	PassBuilder.cpp
+
+TGHDRS=	Intrinsics
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile b/lib/clang/libllvmpowerpccodegen/Makefile
index 211bc22..dc05068 100644
--- a/lib/clang/libllvmpowerpccodegen/Makefile
+++ b/lib/clang/libllvmpowerpccodegen/Makefile
@@ -8,20 +8,28 @@ SRCDIR=	lib/Target/PowerPC
 SRCS=	PPCAsmPrinter.cpp \
 	PPCBranchSelector.cpp \
 	PPCCTRLoops.cpp \
+	PPCEarlyReturn.cpp \
  	PPCFastISel.cpp \
 	PPCFrameLowering.cpp \
 	PPCHazardRecognizers.cpp \
 	PPCISelDAGToDAG.cpp \
 	PPCISelLowering.cpp \
 	PPCInstrInfo.cpp \
+	PPCLoopDataPrefetch.cpp \
+	PPCLoopPreIncPrep.cpp \
 	PPCMCInstLower.cpp \
 	PPCMachineFunctionInfo.cpp \
 	PPCRegisterInfo.cpp \
 	PPCSelectionDAGInfo.cpp \
 	PPCSubtarget.cpp \
+	PPCTLSDynamicCall.cpp \
+	PPCTOCRegDeps.cpp \
 	PPCTargetMachine.cpp \
 	PPCTargetObjectFile.cpp \
-	PPCTargetTransformInfo.cpp
+	PPCTargetTransformInfo.cpp \
+	PPCVSXCopy.cpp \
+	PPCVSXFMAMutate.cpp \
+	PPCVSXSwapRemoval.cpp
 
 TGHDRS=	Intrinsics \
 	PPCGenCallingConv \
diff --git a/lib/clang/libllvmruntimedyld/Makefile b/lib/clang/libllvmruntimedyld/Makefile
index 75eb843..a4326b5 100644
--- a/lib/clang/libllvmruntimedyld/Makefile
+++ b/lib/clang/libllvmruntimedyld/Makefile
@@ -7,6 +7,7 @@ LIB=	llvmruntimedyld
 SRCDIR=	lib/ExecutionEngine/RuntimeDyld
 SRCS=	RTDyldMemoryManager.cpp \
 	RuntimeDyld.cpp \
+	RuntimeDyldCOFF.cpp \
 	RuntimeDyldChecker.cpp \
 	RuntimeDyldELF.cpp \
 	RuntimeDyldMachO.cpp
diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile
index bb8dc96..8579df9 100644
--- a/lib/clang/libllvmscalaropts/Makefile
+++ b/lib/clang/libllvmscalaropts/Makefile
@@ -7,6 +7,7 @@ LIB=	llvmscalaropts
 SRCDIR=	lib/Transforms/Scalar
 SRCS=	ADCE.cpp \
 	AlignmentFromAssumptions.cpp \
+	BDCE.cpp \
 	ConstantHoisting.cpp \
 	ConstantProp.cpp \
 	CorrelatedValuePropagation.cpp \
@@ -14,24 +15,32 @@ SRCS=	ADCE.cpp \
 	DeadStoreElimination.cpp \
 	EarlyCSE.cpp \
 	FlattenCFGPass.cpp \
+	Float2Int.cpp \
 	GVN.cpp \
 	IndVarSimplify.cpp \
+	InductiveRangeCheckElimination.cpp \
 	JumpThreading.cpp \
 	LICM.cpp \
 	LoadCombine.cpp \
 	LoopDeletion.cpp \
+	LoopDistribute.cpp \
 	LoopIdiomRecognize.cpp \
+	LoopInterchange.cpp \
 	LoopRerollPass.cpp \
 	LoopRotation.cpp \
 	LoopStrengthReduce.cpp \
 	LoopUnrollPass.cpp \
 	LoopUnswitch.cpp \
 	LowerAtomic.cpp \
+	LowerExpectIntrinsic.cpp \
 	MemCpyOptimizer.cpp \
 	MergedLoadStoreMotion.cpp \
+	NaryReassociate.cpp \
 	PartiallyInlineLibCalls.cpp \
+	PlaceSafepoints.cpp \
 	Reassociate.cpp \
 	Reg2Mem.cpp \
+	RewriteStatepointsForGC.cpp \
 	SCCP.cpp \
 	SROA.cpp \
 	SampleProfile.cpp \
@@ -40,6 +49,8 @@ SRCS=	ADCE.cpp \
 	SeparateConstOffsetFromGEP.cpp \
 	SimplifyCFGPass.cpp \
 	Sink.cpp \
+	SpeculativeExecution.cpp \
+	StraightLineStrengthReduce.cpp \
 	StructurizeCFG.cpp \
 	TailRecursionElimination.cpp
 
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index f325b15..e21103d 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -14,6 +14,7 @@ SRCS=	APFloat.cpp \
 	Atomic.cpp \
 	BlockFrequency.cpp \
 	BranchProbability.cpp \
+	COM.cpp \
 	CommandLine.cpp \
 	Compression.cpp \
 	ConvertUTF.c \
@@ -36,8 +37,6 @@ SRCS=	APFloat.cpp \
 	IntEqClasses.cpp \
 	IntervalMap.cpp \
 	IntrusiveRefCntPtr.cpp \
-	IsInf.cpp \
-	IsNAN.cpp \
 	LEB128.cpp \
 	LineIterator.cpp \
 	Locale.cpp \
@@ -71,6 +70,7 @@ SRCS=	APFloat.cpp \
 	StringMap.cpp \
 	StringPool.cpp \
 	StringRef.cpp \
+	TargetParser.cpp \
 	TargetRegistry.cpp \
 	ThreadLocal.cpp \
 	Threading.cpp \
diff --git a/lib/clang/libllvmtablegen/Makefile b/lib/clang/libllvmtablegen/Makefile
index fb0c5b8..be5e521 100644
--- a/lib/clang/libllvmtablegen/Makefile
+++ b/lib/clang/libllvmtablegen/Makefile
@@ -10,8 +10,8 @@ SRCS=	Error.cpp \
 	Record.cpp \
 	SetTheory.cpp \
 	StringMatcher.cpp \
-	TableGenBackend.cpp \
 	TGLexer.cpp \
-	TGParser.cpp
+	TGParser.cpp \
+	TableGenBackend.cpp
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtarget/Makefile b/lib/clang/libllvmtarget/Makefile
index 3f9619b..5567695 100644
--- a/lib/clang/libllvmtarget/Makefile
+++ b/lib/clang/libllvmtarget/Makefile
@@ -7,10 +7,11 @@ LIB=	llvmtarget
 SRCDIR=	lib/Target
 SRCS=	Target.cpp \
 	TargetIntrinsicInfo.cpp \
-	TargetLibraryInfo.cpp \
 	TargetLoweringObjectFile.cpp \
 	TargetMachine.cpp \
 	TargetMachineC.cpp \
 	TargetSubtargetInfo.cpp
 
+TGHDRS=	Intrinsics
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile
index a3cf212..2c0d7c5 100644
--- a/lib/clang/libllvmtransformutils/Makefile
+++ b/lib/clang/libllvmtransformutils/Makefile
@@ -27,7 +27,7 @@ SRCS=	ASanStackFrameLayout.cpp \
 	LoopSimplify.cpp \
 	LoopUnroll.cpp \
 	LoopUnrollRuntime.cpp \
-	LowerExpectIntrinsic.cpp \
+	LoopUtils.cpp \
 	LowerInvoke.cpp \
 	LowerSwitch.cpp \
 	Mem2Reg.cpp \
diff --git a/lib/clang/libllvmx86codegen/Makefile b/lib/clang/libllvmx86codegen/Makefile
index b030b1f..0f6776a 100644
--- a/lib/clang/libllvmx86codegen/Makefile
+++ b/lib/clang/libllvmx86codegen/Makefile
@@ -7,6 +7,7 @@ LIB=	llvmx86codegen
 SRCDIR=	lib/Target/X86
 SRCS=	X86AsmPrinter.cpp \
 	X86CallFrameOptimization.cpp \
+	X86ExpandPseudo.cpp \
 	X86FastISel.cpp \
 	X86FixupLEAs.cpp \
 	X86FloatingPoint.cpp \
@@ -23,7 +24,8 @@ SRCS=	X86AsmPrinter.cpp \
 	X86TargetMachine.cpp \
 	X86TargetObjectFile.cpp \
 	X86TargetTransformInfo.cpp \
-	X86VZeroUpper.cpp
+	X86VZeroUpper.cpp \
+	X86WinEHState.cpp
 
 TGHDRS=	Intrinsics \
 	X86GenCallingConv \