17 files changed, 118 insertions, 45 deletions

diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index c47f4d997dcd..6219da0cfd4b 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -29,7 +29,7 @@
             ..
             lib
                 clang
-                    4.0.0
+                    5.0.0
                         lib
                             freebsd
                             ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 318351716c42..efa5aef0b01d 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -25,7 +25,7 @@
         aout
         ..
         clang
-            4.0.0
+            5.0.0
                 include
                     sanitizer
                     ..
diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h
index 084b823a1246..80436920e1e4 100644
--- a/lib/clang/freebsd_cc_version.h
+++ b/lib/clang/freebsd_cc_version.h
@@ -1,3 +1,3 @@
 /* $FreeBSD$ */
 
-#define	FREEBSD_CC_VERSION		1200006
+#define	FREEBSD_CC_VERSION		1200007
diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
index be03a70e2c64..3237639b3790 100644
--- a/lib/clang/headers/Makefile
+++ b/lib/clang/headers/Makefile
@@ -4,7 +4,7 @@
 
 .PATH:		${CLANG_SRCS}/lib/Headers
 
-INCSDIR=	${LIBDIR}/clang/4.0.0/include
+INCSDIR=	${LIBDIR}/clang/5.0.0/include
 
 GENINCS+=	arm_neon.h
 
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index 24fdb8b16039..cf7c05296744 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			4.0.0
-#define	CLANG_VERSION_STRING		"4.0.0"
-#define	CLANG_VERSION_MAJOR		4
+#define	CLANG_VERSION			5.0.0
+#define	CLANG_VERSION_STRING		"5.0.0"
+#define	CLANG_VERSION_MAJOR		5
 #define	CLANG_VERSION_MINOR		0
 #define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
 
-#define	SVN_REVISION			"297347"
+#define	SVN_REVISION			"300422"
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index 07f632520f6b..4441607aa63c 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -39,11 +39,14 @@
 /* Define if we have libxml2 */
 /* #undef CLANG_HAVE_LIBXML */
 
+/* Define if we have z3 and want to build it */
+/* #undef CLANG_ANALYZER_WITH_Z3 */
+
 /* Define if we have sys/resource.h (rlimits) */
 #define CLANG_HAVE_RLIMITS 1
 
 /* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 4.0.0"
+#define BACKEND_PACKAGE_STRING "LLVM 5.0.0svn"
 
 /* Linker version detected at compile time. */
 /* #undef HOST_LINK_VERSION */
diff --git a/lib/clang/include/lld/Config/Version.inc b/lib/clang/include/lld/Config/Version.inc
index 49ce2cac4907..795d8cb0da43 100644
--- a/lib/clang/include/lld/Config/Version.inc
+++ b/lib/clang/include/lld/Config/Version.inc
@@ -1,8 +1,8 @@
 // $FreeBSD$
 
-#define LLD_VERSION 4.0.0
-#define LLD_VERSION_STRING "4.0.0"
-#define LLD_VERSION_MAJOR 4
+#define LLD_VERSION 5.0.0
+#define LLD_VERSION_STRING "5.0.0"
+#define LLD_VERSION_MAJOR 5
 #define LLD_VERSION_MINOR 0
-#define LLD_REVISION_STRING "297347"
+#define LLD_REVISION_STRING "300422"
 #define LLD_REPOSITORY_STRING "FreeBSD"
diff --git a/lib/clang/include/llvm/Config/abi-breaking.h b/lib/clang/include/llvm/Config/abi-breaking.h
index 39c4162e30db..7069166cda12 100644
--- a/lib/clang/include/llvm/Config/abi-breaking.h
+++ b/lib/clang/include/llvm/Config/abi-breaking.h
@@ -16,9 +16,8 @@
 /* Define to enable checks that alter the LLVM C++ ABI */
 #define LLVM_ENABLE_ABI_BREAKING_CHECKS 1
 
-/* Define to disable the link-time checking of mismatch for
-   LLVM_ENABLE_ABI_BREAKING_CHECKS */
-#define LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING 0
+/* Allow selectively disabling link-time mismatch checking so that header-only
+   ADT content from LLVM can be used without linking libSupport. */
 #if !LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING
 
 // ABI_BREAKING_CHECKS protection: provides link-time failure when clients build
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 3cf13f128e8c..765f3b674f4a 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -12,13 +12,17 @@
 #define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
 
 /* Define to 1 to enable backtraces, and to 0 otherwise. */
-#define ENABLE_BACKTRACES 1
+#define ENABLE_BACKTRACES 0
 
 /* Define to 1 to enable crash overrides, and to 0 otherwise. */
 #define ENABLE_CRASH_OVERRIDES 1
 
+#if __FreeBSD_version >= 1000052
 /* Define to 1 if you have the `backtrace' function. */
-/* #undef HAVE_BACKTRACE */
+#define HAVE_BACKTRACE TRUE
+
+#define BACKTRACE_HEADER <execinfo.h>
+#endif
 
 /* Define to 1 if you have the <CrashReporterClient.h> header file. */
 /* #undef HAVE_CRASHREPORTERCLIENT_H */
@@ -55,13 +59,14 @@
 /* Define if dlopen() is available on this platform. */
 #define HAVE_DLOPEN 1
 
+/* Define if dladdr() is available on this platform. */
+#define HAVE_DLADDR 1
+
 /* Define to 1 if you have the <errno.h> header file. */
 #define HAVE_ERRNO_H 1
 
 /* Define to 1 if you have the <execinfo.h> header file. */
-#if __FreeBSD_version >= 1000052
-#define HAVE_EXECINFO_H 1
-#endif
+/* #undef HAVE_EXECINFO_H */
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
@@ -383,9 +388,6 @@
 /* Define if this is Win32ish platform */
 /* #undef LLVM_ON_WIN32 */
 
-/* Installation prefix directory */
-#define LLVM_PREFIX "/usr"
-
 /* Define if we have the Intel JIT API runtime support library */
 #define LLVM_USE_INTEL_JITEVENTS 0
 
@@ -396,7 +398,7 @@
 /* #undef LLVM_VERSION_INFO */
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 4
+#define LLVM_VERSION_MAJOR 5
 
 /* Minor version of the LLVM API */
 #define LLVM_VERSION_MINOR 0
@@ -405,7 +407,7 @@
 #define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "4.0.0"
+#define LLVM_VERSION_STRING "5.0.0svn"
 
 /* Define to the extension used for shared libraries, say, ".so". */
 #define LTDL_SHLIB_EXT ".so"
@@ -417,13 +419,13 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 4.0.0"
+#define PACKAGE_STRING "LLVM 5.0.0svn"
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.0.0"
+#define PACKAGE_VERSION "5.0.0svn"
 
 /* Define to the vendor of this package. */
 /* #undef PACKAGE_VENDOR */
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index 755017fbee06..f92265584cf3 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -57,9 +57,6 @@
 /* Define if this is Win32ish platform */
 /* #undef LLVM_ON_WIN32 */
 
-/* Installation prefix directory */
-#define LLVM_PREFIX "/usr"
-
 /* Define if we have the Intel JIT API runtime support library */
 #define LLVM_USE_INTEL_JITEVENTS 0
 
@@ -67,7 +64,7 @@
 #define LLVM_USE_OPROFILE 0
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 4
+#define LLVM_VERSION_MAJOR 5
 
 /* Minor version of the LLVM API */
 #define LLVM_VERSION_MINOR 0
@@ -76,6 +73,6 @@
 #define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "4.0.0"
+#define LLVM_VERSION_STRING "5.0.0svn"
 
 #endif
diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h
new file mode 100644
index 000000000000..c36904c385b6
--- /dev/null
+++ b/lib/clang/include/llvm/Support/VCSRevision.h
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#define LLVM_REVISION "svn-r300422"
diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index 54fb0d7738d8..ba40e54071d9 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -7,6 +7,7 @@ LIB=		clang
 
 CFLAGS+=	-I${.OBJDIR}
 CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
+CFLAGS+=	-I${CLANG_SRCS}/lib/Driver
 
 # Ensure FREEBSD_CC_VERSION is defined for Basic/Targets.cpp
 CFLAGS.Targets.cpp+= -include ../freebsd_cc_version.h
@@ -77,6 +78,7 @@ SRCS_MIN+=	AST/MicrosoftCXXABI.cpp
 SRCS_MIN+=	AST/MicrosoftMangle.cpp
 SRCS_MIN+=	AST/NSAPI.cpp
 SRCS_MIN+=	AST/NestedNameSpecifier.cpp
+SRCS_MIN+=	AST/ODRHash.cpp
 SRCS_MIN+=	AST/OpenMPClause.cpp
 SRCS_MIN+=	AST/ParentMap.cpp
 SRCS_MIN+=	AST/RawCommentList.cpp
@@ -141,6 +143,7 @@ SRCS_MIN+=	Basic/FileManager.cpp
 SRCS_MIN+=	Basic/FileSystemStatCache.cpp
 SRCS_MIN+=	Basic/IdentifierTable.cpp
 SRCS_MIN+=	Basic/LangOptions.cpp
+SRCS_MIN+=	Basic/MemoryBufferCache.cpp
 SRCS_MIN+=	Basic/Module.cpp
 SRCS_MIN+=	Basic/ObjCRuntime.cpp
 SRCS_MIN+=	Basic/OpenMPKinds.cpp
@@ -156,11 +159,11 @@ SRCS_MIN+=	Basic/Version.cpp
 SRCS_MIN+=	Basic/VersionTuple.cpp
 SRCS_MIN+=	Basic/VirtualFileSystem.cpp
 SRCS_MIN+=	Basic/Warnings.cpp
+SRCS_MIN+=	Basic/XRayLists.cpp
 SRCS_MIN+=	CodeGen/BackendUtil.cpp
 SRCS_MIN+=	CodeGen/CGAtomic.cpp
 SRCS_MIN+=	CodeGen/CGBlocks.cpp
 SRCS_MIN+=	CodeGen/CGBuiltin.cpp
-SRCS_MIN+=	CodeGen/CGCUDABuiltin.cpp
 SRCS_MIN+=	CodeGen/CGCUDANV.cpp
 SRCS_MIN+=	CodeGen/CGCUDARuntime.cpp
 SRCS_MIN+=	CodeGen/CGCXX.cpp
@@ -179,6 +182,7 @@ SRCS_MIN+=	CodeGen/CGExprCXX.cpp
 SRCS_MIN+=	CodeGen/CGExprComplex.cpp
 SRCS_MIN+=	CodeGen/CGExprConstant.cpp
 SRCS_MIN+=	CodeGen/CGExprScalar.cpp
+SRCS_MIN+=	CodeGen/CGGPUBuiltin.cpp
 SRCS_MIN+=	CodeGen/CGLoopInfo.cpp
 SRCS_MIN+=	CodeGen/CGObjC.cpp
 SRCS_MIN+=	CodeGen/CGObjCGNU.cpp
@@ -199,8 +203,10 @@ SRCS_MIN+=	CodeGen/CodeGenModule.cpp
 SRCS_MIN+=	CodeGen/CodeGenPGO.cpp
 SRCS_MIN+=	CodeGen/CodeGenTBAA.cpp
 SRCS_MIN+=	CodeGen/CodeGenTypes.cpp
+SRCS_MIN+=	CodeGen/ConstantInitBuilder.cpp
 SRCS_MIN+=	CodeGen/CoverageMappingGen.cpp
 SRCS_MIN+=	CodeGen/ItaniumCXXABI.cpp
+SRCS_MIN+=	CodeGen/MacroPPCallbacks.cpp
 SRCS_MIN+=	CodeGen/MicrosoftCXXABI.cpp
 SRCS_MIN+=	CodeGen/ModuleBuilder.cpp
 SRCS_MIN+=	CodeGen/ObjectFilePCHContainerOperations.cpp
@@ -210,21 +216,54 @@ SRCS_MIN+=	CodeGen/TargetInfo.cpp
 SRCS_MIN+=	CodeGen/VarBypassDetector.cpp
 SRCS_MIN+=	Driver/Action.cpp
 SRCS_MIN+=	Driver/Compilation.cpp
-SRCS_MIN+=	Driver/CrossWindowsToolChain.cpp
 SRCS_MIN+=	Driver/Distro.cpp
 SRCS_MIN+=	Driver/Driver.cpp
 SRCS_MIN+=	Driver/DriverOptions.cpp
 SRCS_MIN+=	Driver/Job.cpp
-SRCS_MIN+=	Driver/MSVCToolChain.cpp
-SRCS_MIN+=	Driver/MinGWToolChain.cpp
 SRCS_MIN+=	Driver/Multilib.cpp
 SRCS_MIN+=	Driver/Phases.cpp
 SRCS_MIN+=	Driver/SanitizerArgs.cpp
 SRCS_MIN+=	Driver/Tool.cpp
 SRCS_MIN+=	Driver/ToolChain.cpp
-SRCS_MIN+=	Driver/ToolChains.cpp
-SRCS_MIN+=	Driver/Tools.cpp
+SRCS_MIN+=	Driver/ToolChains/AMDGPU.cpp
+SRCS_MIN+=	Driver/ToolChains/AVR.cpp
+SRCS_MIN+=	Driver/ToolChains/Arch/AArch64.cpp
+SRCS_MIN+=	Driver/ToolChains/Arch/ARM.cpp
+SRCS_MIN+=	Driver/ToolChains/Arch/Mips.cpp
+SRCS_MIN+=	Driver/ToolChains/Arch/PPC.cpp
+SRCS_MIN+=	Driver/ToolChains/Arch/Sparc.cpp
+SRCS_MIN+=	Driver/ToolChains/Arch/SystemZ.cpp
+SRCS_MIN+=	Driver/ToolChains/Arch/X86.cpp
+SRCS_MIN+=	Driver/ToolChains/Bitrig.cpp
+SRCS_MIN+=	Driver/ToolChains/Clang.cpp
+SRCS_MIN+=	Driver/ToolChains/CloudABI.cpp
+SRCS_MIN+=	Driver/ToolChains/CommonArgs.cpp
+SRCS_MIN+=	Driver/ToolChains/Contiki.cpp
+SRCS_MIN+=	Driver/ToolChains/CrossWindows.cpp
+SRCS_MIN+=	Driver/ToolChains/Cuda.cpp
+SRCS_MIN+=	Driver/ToolChains/Darwin.cpp
+SRCS_MIN+=	Driver/ToolChains/DragonFly.cpp
+SRCS_MIN+=	Driver/ToolChains/FreeBSD.cpp
+SRCS_MIN+=	Driver/ToolChains/Fuchsia.cpp
+SRCS_MIN+=	Driver/ToolChains/Gnu.cpp
+SRCS_MIN+=	Driver/ToolChains/Haiku.cpp
+SRCS_MIN+=	Driver/ToolChains/Hexagon.cpp
+SRCS_MIN+=	Driver/ToolChains/Linux.cpp
+SRCS_MIN+=	Driver/ToolChains/MSVC.cpp
+SRCS_MIN+=	Driver/ToolChains/MinGW.cpp
+SRCS_MIN+=	Driver/ToolChains/Minix.cpp
+SRCS_MIN+=	Driver/ToolChains/MipsLinux.cpp
+SRCS_MIN+=	Driver/ToolChains/Myriad.cpp
+SRCS_MIN+=	Driver/ToolChains/NaCl.cpp
+SRCS_MIN+=	Driver/ToolChains/NetBSD.cpp
+SRCS_MIN+=	Driver/ToolChains/OpenBSD.cpp
+SRCS_MIN+=	Driver/ToolChains/PS4CPU.cpp
+SRCS_MIN+=	Driver/ToolChains/Solaris.cpp
+SRCS_MIN+=	Driver/ToolChains/TCE.cpp
+SRCS_MIN+=	Driver/ToolChains/WebAssembly.cpp
+SRCS_MIN+=	Driver/ToolChains/XCore.cpp
 SRCS_MIN+=	Driver/Types.cpp
+SRCS_MIN+=	Driver/XRayArgs.cpp
 SRCS_MIN+=	Edit/Commit.cpp
 SRCS_MIN+=	Edit/EditedSource.cpp
 SRCS_MIN+=	Edit/RewriteObjCFoundationAPI.cpp
diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 1ec73bd8adbc..7ae5dd9bc191 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -67,6 +67,8 @@ SRCS_MIN+=	Analysis/MemDerefPrinter.cpp
 SRCS_MIN+=	Analysis/MemoryBuiltins.cpp
 SRCS_MIN+=	Analysis/MemoryDependenceAnalysis.cpp
 SRCS_MIN+=	Analysis/MemoryLocation.cpp
+SRCS_MIN+=	Analysis/MemorySSA.cpp
+SRCS_MIN+=	Analysis/MemorySSAUpdater.cpp
 SRCS_MIN+=	Analysis/ModuleDebugInfoPrinter.cpp
 SRCS_MIN+=	Analysis/ModuleSummaryAnalysis.cpp
 SRCS_MIN+=	Analysis/ObjCARCAliasAnalysis.cpp
@@ -134,6 +136,7 @@ SRCS_MIN+=	CodeGen/AsmPrinter/OcamlGCPrinter.cpp
 SRCS_MIN+=	CodeGen/AsmPrinter/WinException.cpp
 SRCS_MIN+=	CodeGen/AtomicExpandPass.cpp
 SRCS_MIN+=	CodeGen/BasicTargetTransformInfo.cpp
+SRCS_MIN+=	CodeGen/BranchCoalescing.cpp
 SRCS_MIN+=	CodeGen/BranchFolding.cpp
 SRCS_MIN+=	CodeGen/BranchRelaxation.cpp
 SRCS_MIN+=	CodeGen/BuiltinGCs.cpp
@@ -152,6 +155,7 @@ SRCS_MIN+=	CodeGen/EdgeBundles.cpp
 SRCS_MIN+=	CodeGen/ExecutionDepsFix.cpp
 SRCS_MIN+=	CodeGen/ExpandISelPseudos.cpp
 SRCS_MIN+=	CodeGen/ExpandPostRAPseudos.cpp
+SRCS_MIN+=	CodeGen/FEntryInserter.cpp
 SRCS_MIN+=	CodeGen/FaultMaps.cpp
 SRCS_MIN+=	CodeGen/FuncletLayout.cpp
 SRCS_MIN+=	CodeGen/GCMetadata.cpp
@@ -168,6 +172,7 @@ SRCS_MIN+=	CodeGen/InterleavedAccessPass.cpp
 SRCS_MIN+=	CodeGen/IntrinsicLowering.cpp
 SRCS_MIN+=	CodeGen/LLVMTargetMachine.cpp
 SRCS_MIN+=	CodeGen/LatencyPriorityQueue.cpp
+SRCS_MIN+=	CodeGen/LazyMachineBlockFrequencyInfo.cpp
 SRCS_MIN+=	CodeGen/LexicalScopes.cpp
 SRCS_MIN+=	CodeGen/LiveDebugValues.cpp
 SRCS_MIN+=	CodeGen/LiveDebugVariables.cpp
@@ -178,6 +183,7 @@ SRCS_MIN+=	CodeGen/LivePhysRegs.cpp
 SRCS_MIN+=	CodeGen/LiveRangeCalc.cpp
 SRCS_MIN+=	CodeGen/LiveRangeEdit.cpp
 SRCS_MIN+=	CodeGen/LiveRegMatrix.cpp
+SRCS_MIN+=	CodeGen/LiveRegUnits.cpp
 SRCS_MIN+=	CodeGen/LiveStackAnalysis.cpp
 SRCS_MIN+=	CodeGen/LiveVariables.cpp
 SRCS_MIN+=	CodeGen/LocalStackSlotAllocation.cpp
@@ -206,6 +212,8 @@ SRCS_MIN+=	CodeGen/MachineLICM.cpp
 SRCS_MIN+=	CodeGen/MachineLoopInfo.cpp
 SRCS_MIN+=	CodeGen/MachineModuleInfo.cpp
 SRCS_MIN+=	CodeGen/MachineModuleInfoImpls.cpp
+SRCS_MIN+=	CodeGen/MachineOptimizationRemarkEmitter.cpp
+SRCS_MIN+=	CodeGen/MachineOutliner.cpp
 SRCS_MIN+=	CodeGen/MachinePassRegistry.cpp
 SRCS_MIN+=	CodeGen/MachinePipeliner.cpp
 SRCS_MIN+=	CodeGen/MachinePostDominators.cpp
@@ -306,6 +314,7 @@ SRCS_MIN+=	DebugInfo/CodeView/CVTypeVisitor.cpp
 SRCS_MIN+=	DebugInfo/CodeView/CodeViewError.cpp
 SRCS_MIN+=	DebugInfo/CodeView/CodeViewRecordIO.cpp
 SRCS_EXT+=	DebugInfo/CodeView/EnumTables.cpp
+SRCS_MIN+=	DebugInfo/CodeView/Formatters.cpp
 SRCS_MIN+=	DebugInfo/CodeView/Line.cpp
 SRCS_MIN+=	DebugInfo/CodeView/ModuleSubstream.cpp
 SRCS_MIN+=	DebugInfo/CodeView/ModuleSubstreamVisitor.cpp
@@ -315,7 +324,6 @@ SRCS_MIN+=	DebugInfo/CodeView/SymbolRecordMapping.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeDatabase.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeDatabaseVisitor.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeDumpVisitor.cpp
-SRCS_MIN+=	DebugInfo/CodeView/TypeRecord.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeRecordMapping.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeSerializer.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeStreamMerger.cpp
@@ -344,8 +352,6 @@ SRCS_MIN+=	DebugInfo/MSF/MSFBuilder.cpp
 SRCS_MIN+=	DebugInfo/MSF/MSFCommon.cpp
 SRCS_MIN+=	DebugInfo/MSF/MSFError.cpp
 SRCS_MIN+=	DebugInfo/MSF/MappedBlockStream.cpp
-SRCS_MIN+=	DebugInfo/MSF/StreamReader.cpp
-SRCS_MIN+=	DebugInfo/MSF/StreamWriter.cpp
 SRCS_EXT+=	DebugInfo/PDB/GenericError.cpp
 SRCS_EXT+=	DebugInfo/PDB/IPDBSourceFile.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDB.cpp
@@ -487,7 +493,7 @@ SRCS_MIN+=	IR/ValueTypes.cpp
 SRCS_MIN+=	IR/Verifier.cpp
 SRCS_MIN+=	IRReader/IRReader.cpp
 SRCS_EXL+=	LTO/Caching.cpp
-SRCS_EXL+=	LTO/LTO.cpp
+SRCS_MIN+=	LTO/LTO.cpp
 SRCS_MIN+=	LTO/LTOBackend.cpp
 SRCS_EXL+=	LTO/LTOCodeGenerator.cpp
 SRCS_EXL+=	LTO/LTOModule.cpp
@@ -545,12 +551,14 @@ SRCS_MIN+=	MC/MCSection.cpp
 SRCS_MIN+=	MC/MCSectionCOFF.cpp
 SRCS_MIN+=	MC/MCSectionELF.cpp
 SRCS_MIN+=	MC/MCSectionMachO.cpp
+SRCS_MIN+=	MC/MCSectionWasm.cpp
 SRCS_MIN+=	MC/MCStreamer.cpp
 SRCS_MIN+=	MC/MCSubtargetInfo.cpp
 SRCS_MIN+=	MC/MCSymbol.cpp
 SRCS_MIN+=	MC/MCSymbolELF.cpp
 SRCS_MIN+=	MC/MCTargetOptions.cpp
 SRCS_MIN+=	MC/MCValue.cpp
+SRCS_MIN+=	MC/MCWasmStreamer.cpp
 SRCS_MIN+=	MC/MCWin64EH.cpp
 SRCS_MIN+=	MC/MCWinEH.cpp
 SRCS_MIN+=	MC/MachObjectWriter.cpp
@@ -567,6 +575,7 @@ SRCS_MIN+=	Object/ELF.cpp
 SRCS_MIN+=	Object/ELFObjectFile.cpp
 SRCS_MIN+=	Object/Error.cpp
 SRCS_MIN+=	Object/IRObjectFile.cpp
+SRCS_MIN+=	Object/IRSymtab.cpp
 SRCS_MIN+=	Object/MachOObjectFile.cpp
 SRCS_MIN+=	Object/MachOUniversal.cpp
 SRCS_MIN+=	Object/ModuleSummaryIndexObjectFile.cpp
@@ -599,9 +608,13 @@ SRCS_EXT+=	ProfileData/SampleProfWriter.cpp
 SRCS_MIN+=	Support/APFloat.cpp
 SRCS_MIN+=	Support/APInt.cpp
 SRCS_MIN+=	Support/APSInt.cpp
+SRCS_MIN+=	Support/ARMAttributeParser.cpp
 SRCS_MIN+=	Support/ARMBuildAttrs.cpp
 SRCS_MIN+=	Support/Allocator.cpp
 SRCS_MIN+=	Support/Atomic.cpp
+SRCS_MIN+=	Support/BinaryStreamError.cpp
+SRCS_MIN+=	Support/BinaryStreamReader.cpp
+SRCS_MIN+=	Support/BinaryStreamWriter.cpp
 SRCS_MIN+=	Support/BlockFrequency.cpp
 SRCS_MIN+=	Support/BranchProbability.cpp
 SRCS_EXT+=	Support/COM.cpp
@@ -615,6 +628,7 @@ SRCS_MIN+=	Support/CrashRecoveryContext.cpp
 SRCS_MIN+=	Support/DAGDeltaAlgorithm.cpp
 SRCS_MIN+=	Support/DataExtractor.cpp
 SRCS_MIN+=	Support/Debug.cpp
+SRCS_MIN+=	Support/DebugCounter.cpp
 SRCS_MIN+=	Support/DeltaAlgorithm.cpp
 SRCS_MIN+=	Support/Dwarf.cpp
 SRCS_MIN+=	Support/DynamicLibrary.cpp
@@ -637,6 +651,7 @@ SRCS_MIN+=	Support/LEB128.cpp
 SRCS_MIN+=	Support/LineIterator.cpp
 SRCS_MIN+=	Support/Locale.cpp
 SRCS_MIN+=	Support/LockFileManager.cpp
+SRCS_MIN+=	Support/LowLevelType.cpp
 SRCS_MIN+=	Support/MD5.cpp
 SRCS_MIN+=	Support/ManagedStatic.cpp
 SRCS_MIN+=	Support/MathExtras.cpp
@@ -718,6 +733,7 @@ SRCS_MIN+=	Target/AArch64/AArch64ISelLowering.cpp
 SRCS_MIN+=	Target/AArch64/AArch64InstrInfo.cpp
 SRCS_MIN+=	Target/AArch64/AArch64LoadStoreOptimizer.cpp
 SRCS_MIN+=	Target/AArch64/AArch64MCInstLower.cpp
+SRCS_MIN+=	Target/AArch64/AArch64MacroFusion.cpp
 SRCS_MIN+=	Target/AArch64/AArch64PBQPRegAlloc.cpp
 SRCS_MIN+=	Target/AArch64/AArch64PromoteConstant.cpp
 SRCS_MIN+=	Target/AArch64/AArch64RedundantCopyElimination.cpp
@@ -858,6 +874,7 @@ SRCS_MIN+=	Target/PowerPC/PPCBranchSelector.cpp
 SRCS_MIN+=	Target/PowerPC/PPCCCState.cpp
 SRCS_MIN+=	Target/PowerPC/PPCCTRLoops.cpp
 SRCS_MIN+=	Target/PowerPC/PPCEarlyReturn.cpp
+SRCS_MIN+=	Target/PowerPC/PPCExpandISEL.cpp
 SRCS_MIN+=	Target/PowerPC/PPCFastISel.cpp
 SRCS_MIN+=	Target/PowerPC/PPCFrameLowering.cpp
 SRCS_MIN+=	Target/PowerPC/PPCHazardRecognizers.cpp
@@ -944,6 +961,7 @@ SRCS_MIN+=	Target/X86/X86InstrInfo.cpp
 SRCS_MIN+=	Target/X86/X86InterleavedAccess.cpp
 SRCS_MIN+=	Target/X86/X86MCInstLower.cpp
 SRCS_MIN+=	Target/X86/X86MachineFunctionInfo.cpp
+SRCS_MIN+=	Target/X86/X86MacroFusion.cpp
 SRCS_MIN+=	Target/X86/X86OptimizeLEAs.cpp
 SRCS_MIN+=	Target/X86/X86PadShortFunction.cpp
 SRCS_MIN+=	Target/X86/X86RegisterInfo.cpp
@@ -1056,6 +1074,7 @@ SRCS_MIN+=	Transforms/Scalar/LoopInstSimplify.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopInterchange.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopLoadElimination.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopPassManager.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopPredication.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopRerollPass.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopRotation.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopSimplifyCFG.cpp
@@ -1121,10 +1140,10 @@ SRCS_MIN+=	Transforms/Utils/LoopVersioning.cpp
 SRCS_MIN+=	Transforms/Utils/LowerInvoke.cpp
 SRCS_MIN+=	Transforms/Utils/LowerSwitch.cpp
 SRCS_MIN+=	Transforms/Utils/Mem2Reg.cpp
-SRCS_MIN+=	Transforms/Utils/MemorySSA.cpp
 SRCS_MIN+=	Transforms/Utils/MetaRenamer.cpp
 SRCS_MIN+=	Transforms/Utils/ModuleUtils.cpp
 SRCS_MIN+=	Transforms/Utils/NameAnonGlobals.cpp
+SRCS_MIN+=	Transforms/Utils/PredicateInfo.cpp
 SRCS_MIN+=	Transforms/Utils/PromoteMemoryToRegister.cpp
 SRCS_MIN+=	Transforms/Utils/SSAUpdater.cpp
 SRCS_MIN+=	Transforms/Utils/SanitizerStats.cpp
@@ -1138,6 +1157,7 @@ SRCS_MIN+=	Transforms/Utils/StripNonLineTableDebugInfo.cpp
 SRCS_MIN+=	Transforms/Utils/SymbolRewriter.cpp
 SRCS_MIN+=	Transforms/Utils/UnifyFunctionExitNodes.cpp
 SRCS_EXT+=	Transforms/Utils/Utils.cpp
+SRCS_MIN+=	Transforms/Utils/VNCoercion.cpp
 SRCS_MIN+=	Transforms/Utils/ValueMapper.cpp
 SRCS_MIN+=	Transforms/Vectorize/BBVectorize.cpp
 SRCS_MIN+=	Transforms/Vectorize/LoadStoreVectorizer.cpp
@@ -1207,10 +1227,12 @@ TGHDRS+=	Options.inc
 	CodeEmitter/-gen-emitter \
 	DAGISel/-gen-dag-isel \
 	DisassemblerTables/-gen-disassembler \
+	EVEX2VEXTables/-gen-x86-EVEX2VEX-tables \
 	FastISel/-gen-fast-isel \
 	InstrInfo/-gen-instr-info \
 	MCCodeEmitter/-gen-emitter \
 	MCPseudoLowering/-gen-pseudo-lowering \
+	RegisterBank/-gen-register-bank \
 	RegisterInfo/-gen-register-info \
 	SubtargetInfo/-gen-subtarget \
 	SystemOperands/-gen-searchable-tables
@@ -1231,6 +1253,7 @@ TGHDRS+=	AArch64GenFastISel.inc
 TGHDRS+=	AArch64GenInstrInfo.inc
 TGHDRS+=	AArch64GenMCCodeEmitter.inc
 TGHDRS+=	AArch64GenMCPseudoLowering.inc
+TGHDRS+=	AArch64GenRegisterBank.inc
 TGHDRS+=	AArch64GenRegisterInfo.inc
 TGHDRS+=	AArch64GenSubtargetInfo.inc
 TGHDRS+=	AArch64GenSystemOperands.inc
@@ -1243,6 +1266,7 @@ TGHDRS+=	ARMGenFastISel.inc
 TGHDRS+=	ARMGenInstrInfo.inc
 TGHDRS+=	ARMGenMCCodeEmitter.inc
 TGHDRS+=	ARMGenMCPseudoLowering.inc
+TGHDRS+=	ARMGenRegisterBank.inc
 TGHDRS+=	ARMGenRegisterInfo.inc
 TGHDRS+=	ARMGenSubtargetInfo.inc
 TGHDRS+=	MipsGenAsmMatcher.inc
@@ -1281,8 +1305,10 @@ TGHDRS+=	X86GenAsmWriter1.inc
 TGHDRS+=	X86GenCallingConv.inc
 TGHDRS+=	X86GenDAGISel.inc
 TGHDRS+=	X86GenDisassemblerTables.inc
+TGHDRS+=	X86GenEVEX2VEXTables.inc
 TGHDRS+=	X86GenFastISel.inc
 TGHDRS+=	X86GenInstrInfo.inc
+TGHDRS+=	X86GenRegisterBank.inc
 TGHDRS+=	X86GenRegisterInfo.inc
 TGHDRS+=	X86GenSubtargetInfo.inc
 
diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile
index fc16034eda84..29cc43da6d01 100644
--- a/lib/clang/libllvmminimal/Makefile
+++ b/lib/clang/libllvmminimal/Makefile
@@ -6,6 +6,7 @@ LIB=		llvmminimal
 INTERNALLIB=
 
 SRCDIR=		lib
+SRCS+=		Support/APFloat.cpp
 SRCS+=		Support/APInt.cpp
 SRCS+=		Support/Atomic.cpp
 SRCS+=		Support/CommandLine.cpp
@@ -21,6 +22,7 @@ SRCS+=		Support/Hashing.cpp
 SRCS+=		Support/Host.cpp
 SRCS+=		Support/IntEqClasses.cpp
 SRCS+=		Support/Locale.cpp
+SRCS+=		Support/MD5.cpp
 SRCS+=		Support/ManagedStatic.cpp
 SRCS+=		Support/MemoryBuffer.cpp
 SRCS+=		Support/Mutex.cpp
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index 08ab48f46771..f7687ef3376b 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -7,7 +7,7 @@ CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 .PATH:		${CRTSRC}/lib
 
-CLANGDIR=	/usr/lib/clang/4.0.0
+CLANGDIR=	/usr/lib/clang/5.0.0
 LIBDIR=		${CLANGDIR}/lib/freebsd
 
 NO_PIC=
diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile
index 8d6df0822656..b341aa22b7f4 100644
--- a/usr.bin/clang/clang-tblgen/Makefile
+++ b/usr.bin/clang/clang-tblgen/Makefile
@@ -10,6 +10,7 @@ SRCS+=		ClangCommentCommandInfoEmitter.cpp
 SRCS+=		ClangCommentHTMLNamedCharacterReferenceEmitter.cpp
 SRCS+=		ClangCommentHTMLTagsEmitter.cpp
 SRCS+=		ClangDiagnosticsEmitter.cpp
+SRCS+=		ClangOptionDocEmitter.cpp
 SRCS+=		ClangSACheckersEmitter.cpp
 SRCS+=		NeonEmitter.cpp
 SRCS+=		TableGen.cpp
diff --git a/usr.bin/clang/llvm-tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile
index 075b3e546c52..58c15a37d065 100644
--- a/usr.bin/clang/llvm-tblgen/Makefile
+++ b/usr.bin/clang/llvm-tblgen/Makefile
@@ -30,6 +30,7 @@ SRCS+=		InstrInfoEmitter.cpp
 SRCS+=		IntrinsicEmitter.cpp
 SRCS+=		OptParserEmitter.cpp
 SRCS+=		PseudoLoweringEmitter.cpp
+SRCS+=		RegisterBankEmitter.cpp
 SRCS+=		RegisterInfoEmitter.cpp
 SRCS+=		SearchableTableEmitter.cpp
 SRCS+=		SubtargetEmitter.cpp
@@ -37,6 +38,7 @@ SRCS+=		SubtargetFeatureInfo.cpp
 SRCS+=		TableGen.cpp
 SRCS+=		Types.cpp
 SRCS+=		X86DisassemblerTables.cpp
+SRCS+=		X86EVEX2VEXTablesEmitter.cpp
 SRCS+=		X86ModRMFilters.cpp
 SRCS+=		X86RecognizableInstr.cpp