diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index a3b9fdcda0ec..342648529f3e 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,67 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150529: new clang import which bumps version from 3.6.1 to 3.7.0.
+OLD_FILES+=usr/lib/clang/3.6.1/include/__stddef_max_align_t.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_aes.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/adxintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/altivec.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/ammintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/arm_acle.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/arm_neon.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/avx512bwintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/avx512erintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/avx512fintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlbwintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/avxintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/bmiintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/cpuid.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/fma4intrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/fmaintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/ia32intrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/immintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/lzcntintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/mm3dnow.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/mm_malloc.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/mmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/module.modulemap
+OLD_FILES+=usr/lib/clang/3.6.1/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/pmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/popcntintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/prfchwintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/rdseedintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/rtmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/shaintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/wmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/x86intrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/xmmintrin.h
+OLD_FILES+=usr/lib/clang/3.6.1/include/xopintrin.h
+OLD_DIRS+=usr/lib/clang/3.6.1/include
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-i386.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-i386.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
+OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
+OLD_DIRS+=usr/lib/clang/3.6.1/lib
+OLD_DIRS+=usr/lib/clang/3.6.1
 # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1.
 OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
diff --git a/UPDATING b/UPDATING
index 637dc7826b44..d9d511905f26 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+2015mmdd:
+	Clang and llvm have been upgraded to 3.7.0.  Please see the
+	20141231 entry below for information about prerequisites and upgrading,
+	if you are not already using 3.5.0 or higher.
+
 20150525:
 	Clang and llvm have been upgraded to 3.6.1 release.  Please see the
 	20141231 entry below for information about prerequisites and upgrading,
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 7504a88f9b0f..703d5be0175e 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -23,7 +23,7 @@
             ..
             lib
                 clang
-                    3.6.1
+                    3.7.0
                         lib
                             freebsd
                             ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 5fad04021a16..3691a040ab25 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -19,7 +19,7 @@
         aout
         ..
         clang
-            3.6.1
+            3.7.0
                 include
                 ..
                 lib
diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index a7513c3a9ed4..7aa88374cc3f 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 5f973b13c573..e605a22ae482 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 e13af795a37f..7244e227b3d1 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 bb435f9de650..6f4923827b4e 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 7a4e7eae2d1f..992183605b27 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 a44de599a3b3..692bd4abb383 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 7c81c5bbe9bc..4d0485fd8b35 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 dc951e375dcb..6da61b9f12ec 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 d5d8e43f2906..522b707d325b 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 921d0bef2a6a..52cf1d0a79d5 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
similarity index 66%
rename from lib/clang/libllvmdebuginfo/Makefile
rename to lib/clang/libllvmdebuginfodwarf/Makefile
index 3cee40e40104..5f52f33d03e4 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 000000000000..1b694db2050b
--- /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 5a7e6c34bf57..13855a010ae7 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 85af0360244a..8bd216915a07 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 000000000000..776c45f573ca
--- /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 f4582c21f20e..d88eebe3752f 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 ea3cf078c896..207fd81725d4 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 ee3ca83ad11f..308e11a7d70f 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 000000000000..84621de80782
--- /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 000000000000..ed4e20dbf2b9
--- /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 211bc22cafa6..dc05068c1c49 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 75eb84338bab..a4326b52c6a2 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 bb8dc96bbccf..8579df910d26 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 f325b15e3ec7..e21103d50614 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 fb0c5b8763d2..be5e5212692d 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 3f9619bd4677..5567695686a1 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 a3cf212af667..2c0d7c58c3e2 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 b030b1fc2e98..0f6776a9e099 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 \
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index 03873f232d14..d9f0dcacc4a5 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -5,7 +5,7 @@
 CRTARCH=${MACHINE_CPUARCH:C/amd64/x86_64/}
 CRTSRC=${.CURDIR}/../../../contrib/compiler-rt
 
-LIBDIR=/usr/lib/clang/3.6.1/lib/freebsd
+LIBDIR=/usr/lib/clang/3.7.0/lib/freebsd
 
 NO_PIC=
 MK_PROFILE=no
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index ae415a99e3af..74878bf65f6c 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -841,66 +841,74 @@ 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/lib/clang/3.6.1/include/__stddef_max_align_t.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_aes.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_pclmul.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/adxintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/altivec.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/ammintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/arm_acle.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/arm_neon.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/avx2intrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/avx512bwintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/avx512erintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/avx512fintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlbwintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/avxintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/bmi2intrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/bmiintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/cpuid.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/emmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/f16cintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/fma4intrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/fmaintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/ia32intrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/immintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/lzcntintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/mm3dnow.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/mm_malloc.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/mmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/module.modulemap
-OLD_FILES+=usr/lib/clang/3.6.1/include/nmmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/pmmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/popcntintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/prfchwintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/rdseedintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/rtmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/shaintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/smmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/tbmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/tmmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/wmmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/x86intrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/xmmintrin.h
-OLD_FILES+=usr/lib/clang/3.6.1/include/xopintrin.h
-OLD_DIRS+=usr/lib/clang/3.6.1/include
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-i386.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-x86_64.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-arm.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-i386.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-x86_64.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-i386.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-x86_64.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-i386.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
-OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
-OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
-OLD_DIRS+=usr/lib/clang/3.6.1/lib
-OLD_DIRS+=usr/lib/clang/3.6.1
+OLD_FILES+=usr/lib/clang/3.7.0/include/Intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap
+OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
+OLD_DIRS+=usr/lib/clang/3.7.0/include
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.san-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.san-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
+OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
+OLD_DIRS+=usr/lib/clang/3.7.0/lib
+OLD_DIRS+=usr/lib/clang/3.7.0
 OLD_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
@@ -920,13 +928,17 @@ OLD_FILES+=usr/bin/lli
 OLD_FILES+=usr/bin/llvm-ar
 OLD_FILES+=usr/bin/llvm-as
 OLD_FILES+=usr/bin/llvm-bcanalyzer
+OLD_FILES+=usr/bin/llvm-cxxdump
 OLD_FILES+=usr/bin/llvm-diff
 OLD_FILES+=usr/bin/llvm-dis
+OLD_FILES+=usr/bin/llvm-dwarfdump
 OLD_FILES+=usr/bin/llvm-extract
 OLD_FILES+=usr/bin/llvm-link
+OLD_FILES+=usr/bin/llvm-lto
 OLD_FILES+=usr/bin/llvm-mc
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objdump
+OLD_FILES+=usr/bin/llvm-pdbdump
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/macho-dump
@@ -939,6 +951,7 @@ OLD_FILES+=usr/share/man/man1/llvm-as.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-bcanalyzer.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-diff.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-dwarfdump.1
 OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-link.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
@@ -3731,7 +3744,6 @@ OLD_FILES+=usr/lib32/private/libldns.so
 OLD_LIBS+=usr/lib32/private/libldns.so.5
 OLD_FILES+=usr/lib32/private/libldns_p.a
 .endif
-.endif
 
 .if ${MK_LDNS_UTILS} == no
 OLD_FILES+=usr/bin/drill
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index 4d4d2ecc8abd..c19f7b6efd32 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -12,14 +12,18 @@ SUBDIR+=bugpoint \
 	llvm-ar \
 	llvm-as \
 	llvm-bcanalyzer \
-	llvm-diff \
 	llvm-cov \
+	llvm-cxxdump \
+	llvm-diff \
 	llvm-dis \
+	llvm-dwarfdump \
 	llvm-extract \
 	llvm-link \
+	llvm-lto \
 	llvm-mc \
 	llvm-nm \
 	llvm-objdump \
+	llvm-pdbdump \
 	llvm-profdata \
 	llvm-rtdyld \
 	llvm-symbolizer \
diff --git a/usr.bin/clang/bugpoint/bugpoint.1 b/usr.bin/clang/bugpoint/bugpoint.1
index 9537d9eb9074..0590b79be43b 100644
--- a/usr.bin/clang/bugpoint/bugpoint.1
+++ b/usr.bin/clang/bugpoint/bugpoint.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "BUGPOINT" "1" "2015-03-14" "3.6" "LLVM"
+.TH "BUGPOINT" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 bugpoint \- automatic test case reduction tool
 .
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 201e494f3bbb..57051768f597 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -106,13 +106,13 @@ LIBDEPS=clangfrontendtool \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llc/llc.1 b/usr.bin/clang/llc/llc.1
index 02c2f9e91096..c355eb582bdf 100644
--- a/usr.bin/clang/llc/llc.1
+++ b/usr.bin/clang/llc/llc.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLC" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLC" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llc \- LLVM static compiler
 .
diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile
index b672acfb4d98..c3de8e671988 100644
--- a/usr.bin/clang/lli/Makefile
+++ b/usr.bin/clang/lli/Makefile
@@ -5,10 +5,11 @@
 PROG_CXX=lli
 
 SRCDIR=	tools/lli
-SRCS=	lli.cpp \
+SRCS=	OrcLazyJIT.cpp \
 	RemoteMemoryManager.cpp \
 	RemoteTarget.cpp \
-	RemoteTargetExternal.cpp
+	RemoteTargetExternal.cpp \
+	lli.cpp
 
 LIBDEPS=llvmx86disassembler \
 	llvmx86asmparser \
@@ -28,13 +29,14 @@ LIBDEPS=llvmx86disassembler \
 	llvmprofiledata \
 	llvminstcombine \
 	llvminstrumentation \
+	llvmorcjit \
 	llvmtransformutils \
 	llvmipa \
-	llvmanalysis \
 	llvmmcjit \
 	llvmtarget \
-	llvmruntimedyld \
+	llvmanalysis \
 	llvmexecutionengine \
+	llvmruntimedyld \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
diff --git a/usr.bin/clang/lli/lli.1 b/usr.bin/clang/lli/lli.1
index de9e30c45efd..9d571e9e52de 100644
--- a/usr.bin/clang/lli/lli.1
+++ b/usr.bin/clang/lli/lli.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLI" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLI" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 lli \- directly execute programs from LLVM bitcode
 .
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index 44586dc76da9..a73b1ce9fa76 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -44,13 +44,13 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-ar/llvm-ar.1 b/usr.bin/clang/llvm-ar/llvm-ar.1
index 729e2d4f2df6..3254954392d0 100644
--- a/usr.bin/clang/llvm-ar/llvm-ar.1
+++ b/usr.bin/clang/llvm-ar/llvm-ar.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-AR" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-AR" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-ar \- LLVM archiver
 .
diff --git a/usr.bin/clang/llvm-as/llvm-as.1 b/usr.bin/clang/llvm-as/llvm-as.1
index bda01da7eb3e..651136a04cfc 100644
--- a/usr.bin/clang/llvm-as/llvm-as.1
+++ b/usr.bin/clang/llvm-as/llvm-as.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-AS" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-AS" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-as \- LLVM assembler
 .
diff --git a/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1 b/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
index fef510d7cf40..6d59ddd125c3 100644
--- a/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
+++ b/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-BCANALYZER" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-BCANALYZER" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-bcanalyzer \- LLVM bitcode analyzer
 .
diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile
index 16834cf69b6a..f752034bda58 100644
--- a/usr.bin/clang/llvm-cov/Makefile
+++ b/usr.bin/clang/llvm-cov/Makefile
@@ -8,7 +8,6 @@ SRCDIR=	tools/llvm-cov
 SRCS=	CodeCoverage.cpp \
 	CoverageFilters.cpp \
 	CoverageReport.cpp \
-	CoverageSummary.cpp \
 	CoverageSummaryInfo.cpp \
 	SourceCoverageView.cpp \
 	TestingSupport.cpp \
diff --git a/usr.bin/clang/llvm-cov/llvm-cov.1 b/usr.bin/clang/llvm-cov/llvm-cov.1
index c76b7abc1e55..fdcb17ac5f0d 100644
--- a/usr.bin/clang/llvm-cov/llvm-cov.1
+++ b/usr.bin/clang/llvm-cov/llvm-cov.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-COV" "1" "2015-04-01" "3.6" "LLVM"
+.TH "LLVM-COV" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-cov \- emit coverage information
 .
@@ -33,16 +33,39 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .SH SYNOPSIS
 .sp
-\fBllvm\-cov\fP [options] SOURCEFILE
+\fBllvm\-cov\fP \fIcommand\fP [\fIargs...\fP]
 .SH DESCRIPTION
 .sp
-The \fBllvm\-cov\fP tool reads code coverage data files and displays the
-coverage information for a specified source file. It is compatible with the
-\fBgcov\fP tool from version 4.2 of \fBGCC\fP and may also be compatible with
-some later versions of \fBgcov\fP\&.
+The \fBllvm\-cov\fP tool shows code coverage information for
+programs that are instrumented to emit profile data. It can be used to
+work with \fBgcov\fP\-style coverage or with \fBclang\fP\(aqs instrumentation
+based profiling.
 .sp
-To use llvm\-cov, you must first build an instrumented version of your
-application that collects coverage data as it runs. Compile with the
+If the program is invoked with a base name of \fBgcov\fP, it will behave as if
+the \fBllvm\-cov gcov\fP command were called. Otherwise, a command should
+be provided.
+.SH COMMANDS
+.INDENT 0.0
+.IP \(bu 2
+\fI\%gcov\fP
+.IP \(bu 2
+\fI\%show\fP
+.IP \(bu 2
+\fI\%report\fP
+.UNINDENT
+.SH GCOV COMMAND
+.SS SYNOPSIS
+.sp
+\fBllvm\-cov gcov\fP [\fIoptions\fP] \fISOURCEFILE\fP
+.SS DESCRIPTION
+.sp
+The \fBllvm\-cov gcov\fP tool reads code coverage data files and displays
+the coverage information for a specified source file. It is compatible with the
+\fBgcov\fP tool from version 4.2 of \fBGCC\fP and may also be compatible with some
+later versions of \fBgcov\fP\&.
+.sp
+To use \fBllvm\-cov gcov\fP, you must first build an instrumented version
+of your application that collects coverage data as it runs. Compile with the
 \fB\-fprofile\-arcs\fP and \fB\-ftest\-coverage\fP options to add the
 instrumentation. (Alternatively, you can use the \fB\-\-coverage\fP option, which
 includes both of those other options.) You should compile with debugging
@@ -66,21 +89,21 @@ directories, the prefix from the \fBGCOV_PREFIX\fP variable is added. These
 environment variables allow you to run the instrumented program on a machine
 where the original object file directories are not accessible, but you will
 then need to copy the \fB\&.gcda\fP files back to the object file directories
-where llvm\-cov expects to find them.
+where \fBllvm\-cov gcov\fP expects to find them.
 .sp
-Once you have generated the coverage data files, run llvm\-cov for each main
-source file where you want to examine the coverage results. This should be run
-from the same directory where you previously ran the compiler. The results for
-the specified source file are written to a file named by appending a \fB\&.gcov\fP
-suffix. A separate output file is also created for each file included by the
-main source file, also with a \fB\&.gcov\fP suffix added.
+Once you have generated the coverage data files, run \fBllvm\-cov gcov\fP
+for each main source file where you want to examine the coverage results. This
+should be run from the same directory where you previously ran the
+compiler. The results for the specified source file are written to a file named
+by appending a \fB\&.gcov\fP suffix. A separate output file is also created for
+each file included by the main source file, also with a \fB\&.gcov\fP suffix added.
 .sp
-The basic content of an llvm\-cov output file is a copy of the source file with
+The basic content of an \fB\&.gcov\fP output file is a copy of the source file with
 an execution count and line number prepended to every line. The execution
 count is shown as \fB\-\fP if a line does not contain any executable code. If
 a line contains code but that code was never executed, the count is displayed
 as \fB#####\fP\&.
-.SH OPTIONS
+.SS OPTIONS
 .INDENT 0.0
 .TP
 .B \-a, \-\-all\-blocks
@@ -153,10 +176,141 @@ option.
 .B \-version
 Display the version of llvm\-cov.
 .UNINDENT
-.SH EXIT STATUS
+.SS EXIT STATUS
 .sp
-\fBllvm\-cov\fP returns 1 if it cannot read input files.  Otherwise, it
-exits with zero.
+\fBllvm\-cov gcov\fP returns 1 if it cannot read input files.  Otherwise,
+it exits with zero.
+.SH SHOW COMMAND
+.SS SYNOPSIS
+.sp
+\fBllvm\-cov show\fP [\fIoptions\fP] \-instr\-profile \fIPROFILE\fP \fIBIN\fP [\fISOURCES\fP]
+.SS DESCRIPTION
+.sp
+The \fBllvm\-cov show\fP command shows line by line coverage of a binary
+\fIBIN\fP using the profile data \fIPROFILE\fP\&. It can optionally be filtered to only
+show the coverage for the files listed in \fISOURCES\fP\&.
+.sp
+To use \fBllvm\-cov show\fP, you need a program that is compiled with
+instrumentation to emit profile and coverage data. To build such a program with
+\fBclang\fP use the \fB\-fprofile\-instr\-generate\fP and \fB\-fcoverage\-mapping\fP
+flags. If linking with the \fBclang\fP driver, pass \fB\-fprofile\-instr\-generate\fP
+to the link stage to make sure the necessary runtime libraries are linked in.
+.sp
+The coverage information is stored in the built executable or library itself,
+and this is what you should pass to \fBllvm\-cov show\fP as the \fIBIN\fP
+argument. The profile data is generated by running this instrumented program
+normally. When the program exits it will write out a raw profile file,
+typically called \fBdefault.profraw\fP, which can be converted to a format that
+is suitable for the \fIPROFILE\fP argument using the \fBllvm\-profdata merge\fP
+tool.
+.SS OPTIONS
+.INDENT 0.0
+.TP
+.B \-show\-line\-counts
+Show the execution counts for each line. This is enabled by default, unless
+another \fB\-show\fP option is used.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-show\-expansions
+Expand inclusions, such as preprocessor macros or textual inclusions, inline
+in the display of the source file.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-show\-instantiations
+For source regions that are instantiated multiple times, such as templates in
+\fBC++\fP, show each instantiation separately as well as the combined summary.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-show\-regions
+Show the execution counts for each region by displaying a caret that points to
+the character where the region starts.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-show\-line\-counts\-or\-regions
+Show the execution counts for each line if there is only one region on the
+line, but show the individual regions if there are multiple on the line.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-use\-color[=VALUE]
+Enable or disable color output. By default this is autodetected.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-arch=<name>
+If the covered binary is a universal binary, select the architecture to use.
+It is an error to specify an architecture that is not included in the
+universal binary or to use an architecture that does not match a
+non\-universal binary.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-name=<NAME>
+Show code coverage only for functions with the given name.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-name\-regex=<PATTERN>
+Show code coverage only for functions that match the given regular expression.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-line\-coverage\-gt=<N>
+Show code coverage only for functions with line coverage greater than the
+given threshold.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-line\-coverage\-lt=<N>
+Show code coverage only for functions with line coverage less than the given
+threshold.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-region\-coverage\-gt=<N>
+Show code coverage only for functions with region coverage greater than the
+given threshold.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-region\-coverage\-lt=<N>
+Show code coverage only for functions with region coverage less than the given
+threshold.
+.UNINDENT
+.SH REPORT COMMAND
+.SS SYNOPSIS
+.sp
+\fBllvm\-cov report\fP [\fIoptions\fP] \-instr\-profile \fIPROFILE\fP \fIBIN\fP [\fISOURCES\fP]
+.SS DESCRIPTION
+.sp
+The \fBllvm\-cov report\fP command displays a summary of the coverage of a
+binary \fIBIN\fP using the profile data \fIPROFILE\fP\&. It can optionally be filtered to
+only show the coverage for the files listed in \fISOURCES\fP\&.
+.sp
+If no source files are provided, a summary line is printed for each file in the
+coverage data. If any files are provided, summaries are shown for each function
+in the listed files instead.
+.sp
+For information on compiling programs for coverage and generating profile data,
+see \fI\%SHOW COMMAND\fP\&.
+.SS OPTIONS
+.INDENT 0.0
+.TP
+.B \-use\-color[=VALUE]
+Enable or disable color output. By default this is autodetected.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-arch=<name>
+If the covered binary is a universal binary, select the architecture to use.
+It is an error to specify an architecture that is not included in the
+universal binary or to use an architecture that does not match a
+non\-universal binary.
+.UNINDENT
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
diff --git a/usr.bin/clang/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile
new file mode 100644
index 000000000000..2ce33c1c08af
--- /dev/null
+++ b/usr.bin/clang/llvm-cxxdump/Makefile
@@ -0,0 +1,71 @@
+# $FreeBSD$
+
+MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-cxxdump
+
+SRCDIR=	tools/llvm-cxxdump
+SRCS=	Error.cpp \
+	llvm-cxxdump.cpp
+
+LIBDEPS=llvmaarch64disassembler \
+	llvmaarch64codegen \
+	llvmaarch64asmparser \
+	llvmaarch64desc \
+	llvmaarch64info \
+	llvmaarch64instprinter \
+	llvmaarch64utils \
+	llvmarmdisassembler \
+	llvmarmcodegen \
+	llvmarmasmparser \
+	llvmarmdesc \
+	llvmarminfo \
+	llvmarminstprinter \
+	llvmmipsdisassembler \
+	llvmmipscodegen \
+	llvmmipsasmparser \
+	llvmmipsdesc \
+	llvmmipsinfo \
+	llvmmipsinstprinter \
+	llvmpowerpcdisassembler \
+	llvmpowerpccodegen \
+	llvmpowerpcasmparser \
+	llvmpowerpcdesc \
+	llvmpowerpcinfo \
+	llvmpowerpcinstprinter \
+	llvmsparcdisassembler \
+	llvmsparccodegen \
+	llvmsparcasmparser \
+	llvmsparcdesc \
+	llvmsparcinfo \
+	llvmsparcinstprinter \
+	llvmx86disassembler \
+	llvmx86asmparser \
+	llvmx86codegen \
+	llvmselectiondag \
+	llvmasmprinter \
+	llvmcodegen \
+	llvmtarget \
+	llvmscalaropts \
+	llvmprofiledata \
+	llvminstcombine \
+	llvmtransformutils \
+	llvmipa \
+	llvmanalysis \
+	llvmx86desc \
+	llvmmcdisassembler \
+	llvmx86info \
+	llvmx86instprinter \
+	llvmx86utils \
+	llvmobject \
+	llvmmcparser \
+	llvmmc \
+	llvmbitreader \
+	llvmcore \
+	llvmsupport
+
+.include "../clang.prog.mk"
+
+DPADD+=	${LIBZ}
+LDADD+=	-lz
diff --git a/usr.bin/clang/llvm-diff/llvm-diff.1 b/usr.bin/clang/llvm-diff/llvm-diff.1
index 0fa5a01989ef..c15d6d8fc18d 100644
--- a/usr.bin/clang/llvm-diff/llvm-diff.1
+++ b/usr.bin/clang/llvm-diff/llvm-diff.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-DIFF" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-DIFF" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-diff \- LLVM structural 'diff'
 .
diff --git a/usr.bin/clang/llvm-dis/llvm-dis.1 b/usr.bin/clang/llvm-dis/llvm-dis.1
index bdf0bdb74e5b..21044fc64932 100644
--- a/usr.bin/clang/llvm-dis/llvm-dis.1
+++ b/usr.bin/clang/llvm-dis/llvm-dis.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-DIS" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-DIS" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-dis \- LLVM disassembler
 .
diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile
new file mode 100644
index 000000000000..d27a91e42159
--- /dev/null
+++ b/usr.bin/clang/llvm-dwarfdump/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-dwarfdump
+
+SRCDIR=	tools/llvm-dwarfdump
+SRCS=	llvm-dwarfdump.cpp
+
+LIBDEPS=llvmdebuginfodwarf \
+	llvmobject \
+	llvmmcparser \
+	llvmmc \
+	llvmbitreader \
+	llvmcore \
+	llvmsupport
+
+.include "../clang.prog.mk"
+
+DPADD+=	${LIBZ}
+LDADD+=	-lz
diff --git a/usr.bin/clang/llvm-dwarfdump/llvm-dwarfdump.1 b/usr.bin/clang/llvm-dwarfdump/llvm-dwarfdump.1
new file mode 100644
index 000000000000..cb6cf6404f48
--- /dev/null
+++ b/usr.bin/clang/llvm-dwarfdump/llvm-dwarfdump.1
@@ -0,0 +1,60 @@
+.\" $FreeBSD$
+.\" Man page generated from reStructuredText.
+.
+.TH "LLVM-DWARFDUMP" "1" "2015-05-30" "3.7" "LLVM"
+.SH NAME
+llvm-dwarfdump \- print contents of DWARF sections
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBllvm\-dwarfdump\fP [\fIoptions\fP] [\fIfilenames...\fP]
+.SH DESCRIPTION
+.sp
+\fBllvm\-dwarfdump\fP parses DWARF sections in the object files
+and prints their contents in human\-readable form.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-debug\-dump=section
+Specify the DWARF section to dump.
+For example, use \fBabbrev\fP to dump the contents of \fB\&.debug_abbrev\fP section,
+\fBloc.dwo\fP to dump the contents of \fB\&.debug_loc.dwo\fP etc.
+See \fBllvm\-dwarfdump \-\-help\fP for the complete list of supported sections.
+Use \fBall\fP to dump all DWARF sections. It is the default.
+.UNINDENT
+.SH EXIT STATUS
+.sp
+\fBllvm\-dwarfdump\fP returns 0. Other exit codes imply internal
+program error.
+.SH AUTHOR
+Maintained by The LLVM Team (http://llvm.org/).
+.SH COPYRIGHT
+2003-2014, LLVM Project
+.\" Generated by docutils manpage writer.
+.
diff --git a/usr.bin/clang/llvm-extract/llvm-extract.1 b/usr.bin/clang/llvm-extract/llvm-extract.1
index 6de6452fa962..6cad6ed22418 100644
--- a/usr.bin/clang/llvm-extract/llvm-extract.1
+++ b/usr.bin/clang/llvm-extract/llvm-extract.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-EXTRACT" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-EXTRACT" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-extract \- extract a function from an LLVM module
 .
diff --git a/usr.bin/clang/llvm-link/llvm-link.1 b/usr.bin/clang/llvm-link/llvm-link.1
index 136344ad26bd..9df31b12746d 100644
--- a/usr.bin/clang/llvm-link/llvm-link.1
+++ b/usr.bin/clang/llvm-link/llvm-link.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-LINK" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-LINK" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-link \- LLVM bitcode linker
 .
diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile
new file mode 100644
index 000000000000..d42472f6cd9f
--- /dev/null
+++ b/usr.bin/clang/llvm-lto/Makefile
@@ -0,0 +1,76 @@
+# $FreeBSD$
+
+MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-lto
+
+SRCDIR=	tools/llvm-lto
+SRCS=	llvm-lto.cpp
+
+LIBDEPS=llvmaarch64disassembler \
+	llvmaarch64codegen \
+	llvmaarch64asmparser \
+	llvmaarch64desc \
+	llvmaarch64info \
+	llvmaarch64instprinter \
+	llvmaarch64utils \
+	llvmarmdisassembler \
+	llvmarmcodegen \
+	llvmarmasmparser \
+	llvmarmdesc \
+	llvmarminfo \
+	llvmarminstprinter \
+	llvmmipsdisassembler \
+	llvmmipscodegen \
+	llvmmipsasmparser \
+	llvmmipsdesc \
+	llvmmipsinfo \
+	llvmmipsinstprinter \
+	llvmpowerpcdisassembler \
+	llvmpowerpccodegen \
+	llvmpowerpcasmparser \
+	llvmpowerpcdesc \
+	llvmpowerpcinfo \
+	llvmpowerpcinstprinter \
+	llvmsparcdisassembler \
+	llvmsparccodegen \
+	llvmsparcasmparser \
+	llvmsparcdesc \
+	llvmsparcinfo \
+	llvmsparcinstprinter \
+	llvmx86disassembler \
+	llvmx86asmparser \
+	llvmx86codegen \
+	llvmselectiondag \
+	llvmasmprinter \
+	llvmx86desc \
+	llvmx86info \
+	llvmx86instprinter \
+	llvmx86utils \
+	llvmmcdisassembler \
+	llvmlto \
+	llvmobjcarcopts \
+	llvmlinker \
+	llvmipo \
+	llvmvectorize \
+	llvmcodegen \
+	llvmtarget \
+	llvmscalaropts \
+	llvmprofiledata \
+	llvmobject \
+	llvmmcparser \
+	llvminstcombine \
+	llvmtransformutils \
+	llvmipa \
+	llvmmc \
+	llvmbitwriter \
+	llvmbitreader \
+	llvmanalysis \
+	llvmcore \
+	llvmsupport
+
+.include "../clang.prog.mk"
+
+DPADD+=	${LIBZ}
+LDADD+=	-lz
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index 6e8599326544..43168c35c2ea 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -6,8 +6,8 @@ MAN=
 PROG_CXX=llvm-mc
 
 SRCDIR=	tools/llvm-mc
-SRCS=	llvm-mc.cpp \
-	Disassembler.cpp
+SRCS=	Disassembler.cpp \
+	llvm-mc.cpp
 
 LIBDEPS=llvmaarch64disassembler \
 	llvmaarch64codegen \
@@ -46,13 +46,13 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 79afa5af2541..b73a1c0aa53c 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -44,13 +44,13 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-nm/llvm-nm.1 b/usr.bin/clang/llvm-nm/llvm-nm.1
index c20e7015a888..467bd21efbb6 100644
--- a/usr.bin/clang/llvm-nm/llvm-nm.1
+++ b/usr.bin/clang/llvm-nm/llvm-nm.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-NM" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-NM" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-nm \- list LLVM bitcode and object file's symbol table
 .
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index ccb7ed9c7938..272e62c274e1 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -11,7 +11,7 @@ SRCS=	llvm-objdump.cpp \
 	ELFDump.cpp \
 	MachODump.cpp
 
-LIBDEPS=llvmdebuginfo \
+LIBDEPS=llvmdebuginfodwarf \
 	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
@@ -49,13 +49,13 @@ LIBDEPS=llvmdebuginfo \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-pdbdump/Makefile b/usr.bin/clang/llvm-pdbdump/Makefile
new file mode 100644
index 000000000000..f557ccf1f3e9
--- /dev/null
+++ b/usr.bin/clang/llvm-pdbdump/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-pdbdump
+
+SRCDIR=	tools/llvm-pdbdump
+SRCS=	BuiltinDumper.cpp \
+	ClassDefinitionDumper.cpp \
+	CompilandDumper.cpp \
+	EnumDumper.cpp \
+	ExternalSymbolDumper.cpp \
+	FunctionDumper.cpp \
+	LinePrinter.cpp \
+	TypeDumper.cpp \
+	TypedefDumper.cpp \
+	VariableDumper.cpp \
+	llvm-pdbdump.cpp
+
+LIBDEPS=llvmdebuginfopdb \
+	llvmobject \
+	llvmmcparser \
+	llvmmc \
+	llvmbitreader \
+	llvmcore \
+	llvmsupport
+
+.include "../clang.prog.mk"
+
+DPADD+=	${LIBZ}
+LDADD+=	-lz
diff --git a/usr.bin/clang/llvm-profdata/llvm-profdata.1 b/usr.bin/clang/llvm-profdata/llvm-profdata.1
index 4f66e633a472..1c59b50e88f0 100644
--- a/usr.bin/clang/llvm-profdata/llvm-profdata.1
+++ b/usr.bin/clang/llvm-profdata/llvm-profdata.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-PROFDATA" "1" "2015-04-01" "3.6" "LLVM"
+.TH "LLVM-PROFDATA" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-profdata \- Profile data tool
 .
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index df74a5b1668c..727a1362a507 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -8,7 +8,7 @@ PROG_CXX=llvm-rtdyld
 SRCDIR=	tools/llvm-rtdyld
 SRCS=	llvm-rtdyld.cpp
 
-LIBDEPS=llvmdebuginfo \
+LIBDEPS=llvmdebuginfodwarf \
 	llvmmcjit \
 	llvmexecutionengine \
 	llvmruntimedyld \
diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile
index 9e3b5841ad7c..0c3c974d1e77 100644
--- a/usr.bin/clang/llvm-symbolizer/Makefile
+++ b/usr.bin/clang/llvm-symbolizer/Makefile
@@ -8,7 +8,8 @@ SRCDIR=	tools/llvm-symbolizer
 SRCS=	llvm-symbolizer.cpp \
 	LLVMSymbolize.cpp
 
-LIBDEPS=llvmdebuginfo \
+LIBDEPS=llvmdebuginfopdb \
+	llvmdebuginfodwarf \
 	llvmobject \
 	llvmmcparser \
 	llvmmc \
diff --git a/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1 b/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1
index 6372aed28a09..f05a5cedb21f 100644
--- a/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1
+++ b/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-SYMBOLIZER" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-SYMBOLIZER" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-symbolizer \- convert addresses into source code locations
 .
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index 075a7bd8b140..19313932d67c 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -10,12 +10,12 @@ SRCS=	AnalysisWrappers.cpp \
 	GraphPrinters.cpp \
 	NewPMDriver.cpp \
 	PassPrinters.cpp \
-	Passes.cpp \
 	PrintSCC.cpp \
 	opt.cpp
 
 TGHDRS=	Intrinsics
-LIBDEPS=llvmaarch64disassembler \
+LIBDEPS=llvmpasses \
+	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
 	llvmaarch64desc \
@@ -52,6 +52,7 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmx86desc \
 	llvmmcdisassembler \
 	llvmx86info \
@@ -68,9 +69,8 @@ LIBDEPS=llvmaarch64disassembler \
 	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
-	llvmanalysis \
-	llvmtarget \
 	llvmmc \
+	llvmanalysis \
 	llvmirreader \
 	llvmasmparser \
 	llvmbitwriter \
diff --git a/usr.bin/clang/opt/opt.1 b/usr.bin/clang/opt/opt.1
index bf357d922d15..e5bacdfee603 100644
--- a/usr.bin/clang/opt/opt.1
+++ b/usr.bin/clang/opt/opt.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "OPT" "1" "2015-03-14" "3.6" "LLVM"
+.TH "OPT" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 opt \- LLVM optimizer
 .
diff --git a/usr.bin/clang/tblgen/tblgen.1 b/usr.bin/clang/tblgen/tblgen.1
index 1f8dec0ce03f..9ee3841dc841 100644
--- a/usr.bin/clang/tblgen/tblgen.1
+++ b/usr.bin/clang/tblgen/tblgen.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "TBLGEN" "1" "2015-03-14" "3.6" "LLVM"
+.TH "TBLGEN" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 tblgen \- Target Description To C++ Code Generator
 .