21 files changed, 484 insertions, 501 deletions

diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h
index 4551d36e653c..084b823a1246 100644
--- a/lib/clang/freebsd_cc_version.h
+++ b/lib/clang/freebsd_cc_version.h
@@ -1,3 +1,3 @@
 /* $FreeBSD$ */
 
-#define	FREEBSD_CC_VERSION		1200005
+#define	FREEBSD_CC_VERSION		1200006
diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
index 819974adaf3e..be03a70e2c64 100644
--- a/lib/clang/headers/Makefile
+++ b/lib/clang/headers/Makefile
@@ -4,11 +4,13 @@
 
 .PATH:		${CLANG_SRCS}/lib/Headers
 
-INCSDIR=	${LIBDIR}/clang/3.9.1/include
+INCSDIR=	${LIBDIR}/clang/4.0.0/include
 
 GENINCS+=	arm_neon.h
 
+INCS+=		__clang_cuda_builtin_vars.h
 INCS+=		__clang_cuda_cmath.h
+INCS+=		__clang_cuda_complex_builtins.h
 INCS+=		__clang_cuda_intrinsics.h
 INCS+=		__clang_cuda_math_forward_declares.h
 INCS+=		__clang_cuda_runtime_wrapper.h
@@ -19,6 +21,7 @@ INCS+=		adxintrin.h
 INCS+=		altivec.h
 INCS+=		ammintrin.h
 INCS+=		arm_acle.h
+INCS+=		armintr.h
 INCS+=		avx2intrin.h
 INCS+=		avx512bwintrin.h
 INCS+=		avx512cdintrin.h
@@ -39,7 +42,6 @@ INCS+=		bmi2intrin.h
 INCS+=		bmiintrin.h
 INCS+=		clflushoptintrin.h
 INCS+=		cpuid.h
-INCS+=		cuda_builtin_vars.h
 INCS+=		emmintrin.h
 INCS+=		f16cintrin.h
 INCS+=		fma4intrin.h
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index b9d37e10f845..a2ee67d54b46 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,10 +1,11 @@
 /* $FreeBSD$ */
 
-#define	CLANG_VERSION			3.9.1
-#define	CLANG_VERSION_MAJOR		3
-#define	CLANG_VERSION_MINOR		9
-#define	CLANG_VERSION_PATCHLEVEL	1
+#define	CLANG_VERSION			4.0.0
+#define	CLANG_VERSION_STRING		"4.0.0"
+#define	CLANG_VERSION_MAJOR		4
+#define	CLANG_VERSION_MINOR		0
+#define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
 
-#define	SVN_REVISION			"289601"
+#define	SVN_REVISION			"296509"
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index 76c17ab8c870..07f632520f6b 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -9,9 +9,15 @@
 /* Bug report URL. */
 #define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
 
+/* Default linker to use. */
+#define CLANG_DEFAULT_LINKER ""
+
 /* Default C++ stdlib to use. */
 #define CLANG_DEFAULT_CXX_STDLIB ""
 
+/* Default runtime library to use. */
+#define CLANG_DEFAULT_RTLIB ""
+
 /* Default OpenMP runtime used by -fopenmp. */
 #define CLANG_DEFAULT_OPENMP_RUNTIME "libomp"
 
@@ -33,8 +39,11 @@
 /* Define if we have libxml2 */
 /* #undef CLANG_HAVE_LIBXML */
 
+/* Define if we have sys/resource.h (rlimits) */
+#define CLANG_HAVE_RLIMITS 1
+
 /* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING "LLVM 3.9.1"
+#define BACKEND_PACKAGE_STRING "LLVM 4.0.0"
 
 /* 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 42ac849c7719..d793782adee0 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 3.9
-#define LLD_VERSION_MAJOR 3
-#define LLD_VERSION_MINOR 9
-#define LLD_REVISION_STRING "3.9"
+#define LLD_VERSION 4.0.0
+#define LLD_VERSION_STRING "4.0.0"
+#define LLD_VERSION_MAJOR 4
+#define LLD_VERSION_MINOR 0
+#define LLD_REVISION_STRING "296509"
 #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
new file mode 100644
index 000000000000..39c4162e30db
--- /dev/null
+++ b/lib/clang/include/llvm/Config/abi-breaking.h
@@ -0,0 +1,49 @@
+/* $FreeBSD$ */
+/*===------- llvm/Config/abi-breaking.h - llvm configuration -------*- C -*-===*/
+/*                                                                            */
+/*                     The LLVM Compiler Infrastructure                       */
+/*                                                                            */
+/* This file is distributed under the University of Illinois Open Source      */
+/* License. See LICENSE.TXT for details.                                      */
+/*                                                                            */
+/*===----------------------------------------------------------------------===*/
+
+/* This file controls the C++ ABI break introduced in LLVM public header. */
+
+#ifndef LLVM_ABI_BREAKING_CHECKS_H
+#define LLVM_ABI_BREAKING_CHECKS_H
+
+/* 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
+#if !LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING
+
+// ABI_BREAKING_CHECKS protection: provides link-time failure when clients build
+// mismatch with LLVM
+#if defined(_MSC_VER)
+// Use pragma with MSVC
+#define LLVM_XSTR(s) LLVM_STR(s)
+#define LLVM_STR(s) #s
+#pragma detect_mismatch("LLVM_ENABLE_ABI_BREAKING_CHECKS", LLVM_XSTR(LLVM_ENABLE_ABI_BREAKING_CHECKS))
+#undef LLVM_XSTR
+#undef LLVM_STR
+#elif defined(_WIN32) || defined(__CYGWIN__) // Win32 w/o #pragma detect_mismatch
+// FIXME: Implement checks without weak.
+#elif defined(__cplusplus)
+namespace llvm {
+#if LLVM_ENABLE_ABI_BREAKING_CHECKS
+extern int EnableABIBreakingChecks;
+__attribute__((weak, visibility ("hidden"))) int *VerifyEnableABIBreakingChecks = &EnableABIBreakingChecks;
+#else
+extern int DisableABIBreakingChecks;
+__attribute__((weak, visibility ("hidden"))) int *VerifyDisableABIBreakingChecks = &DisableABIBreakingChecks;
+#endif
+}
+#endif // _MSC_VER
+
+#endif // LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING
+
+#endif
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 63efb266ea9f..3cf13f128e8c 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -11,62 +11,50 @@
 /* Bug report URL. */
 #define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
 
-/* Define if you want backtraces on crash */
-#define ENABLE_BACKTRACES
+/* Define to 1 to enable backtraces, and to 0 otherwise. */
+#define ENABLE_BACKTRACES 1
 
-/* Define to enable crash overrides */
-#define ENABLE_CRASH_OVERRIDES
-
-/* Define if position independent code is enabled */
-#define ENABLE_PIC
-
-/* Define to 1 if you have the `arc4random' function. */
-#define HAVE_DECL_ARC4RANDOM 1
+/* Define to 1 to enable crash overrides, and to 0 otherwise. */
+#define ENABLE_CRASH_OVERRIDES 1
 
 /* Define to 1 if you have the `backtrace' function. */
 /* #undef HAVE_BACKTRACE */
 
-/* Define to 1 if you have the `bcopy' function. */
-#undef HAVE_BCOPY
+/* Define to 1 if you have the <CrashReporterClient.h> header file. */
+/* #undef HAVE_CRASHREPORTERCLIENT_H */
 
-/* Define to 1 if you have the `closedir' function. */
-#define HAVE_CLOSEDIR 1
+/* can use __crashreporter_info__ */
+#define HAVE_CRASHREPORTER_INFO 0
 
-/* Define to 1 if you have the <cxxabi.h> header file. */
-#define HAVE_CXXABI_H 1
+/* Define to 1 if you have the declaration of `arc4random', and to 0 if you
+   don't. */
+#define HAVE_DECL_ARC4RANDOM 1
 
-/* Define to 1 if you have the <CrashReporterClient.h> header file. */
-#undef HAVE_CRASHREPORTERCLIENT_H
+/* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you
+   don't. */
+#define HAVE_DECL_FE_ALL_EXCEPT 1
 
-/* can use __crashreporter_info__ */
-#undef HAVE_CRASHREPORTER_INFO
+/* Define to 1 if you have the declaration of `FE_INEXACT', and to 0 if you
+   don't. */
+#define HAVE_DECL_FE_INEXACT 1
 
 /* Define to 1 if you have the declaration of `strerror_s', and to 0 if you
    don't. */
 #define HAVE_DECL_STRERROR_S 0
 
 /* Define to 1 if you have the DIA SDK installed, and to 0 if you don't. */
-/* #undef HAVE_DIA_SDK */
+#define LLVM_ENABLE_DIA_SDK 0
 
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #define HAVE_DIRENT_H 1
 
-/* Define if you have the GNU dld library. */
-#undef HAVE_DLD
-
-/* Define to 1 if you have the `dlerror' function. */
-#define HAVE_DLERROR 1
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
 /* Define if dlopen() is available on this platform. */
 #define HAVE_DLOPEN 1
 
-/* Define if you have the _dyld_func_lookup function. */
-#undef HAVE_DYLD
-
 /* Define to 1 if you have the <errno.h> header file. */
 #define HAVE_ERRNO_H 1
 
@@ -90,14 +78,14 @@
 /* Define to 1 if you have the <ffi.h> header file. */
 /* #undef HAVE_FFI_H */
 
-/* Define to 1 if you have the `futimes' function. */
-#define HAVE_FUTIMES 1
-
-/* Define to 1 if you have the `futimens' function */
+/* Define to 1 if you have the `futimens' function. */
 #if __FreeBSD_version >= 1100056
 #define HAVE_FUTIMENS 1
 #endif
 
+/* Define to 1 if you have the `futimes' function. */
+#define HAVE_FUTIMES 1
+
 /* Define to 1 if you have the `getcwd' function. */
 #define HAVE_GETCWD 1
 
@@ -122,14 +110,8 @@
 /* Define to 1 if you have the `isatty' function. */
 #define HAVE_ISATTY 1
 
-/* Define if you have the libdl library or equivalent. */
-/* #undef HAVE_LIBDL */
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the `ole32' library (-lole32). */
-#undef HAVE_LIBOLE32
+/* Define to 1 if you have the `edit' library (-ledit). */
+#define HAVE_LIBEDIT 1
 
 /* Define to 1 if you have the `psapi' library (-lpsapi). */
 /* #undef HAVE_LIBPSAPI */
@@ -140,35 +122,22 @@
 /* Define to 1 if you have the `shell32' library (-lshell32). */
 /* #undef HAVE_LIBSHELL32 */
 
-/* Define to 1 if you have the 'z' library (-lz). */
+/* Define to 1 if you have the `z' library (-lz). */
 #define HAVE_LIBZ 1
 
-/* Define to 1 if you have the 'edit' library (-ledit). */
-#define HAVE_LIBEDIT 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
 /* Define to 1 if you have the <link.h> header file. */
 #define HAVE_LINK_H 1
 
-/* Define if you can use -rdynamic. */
-#define HAVE_LINK_EXPORT_DYNAMIC 1
-
-/* Define if you can use -Wl,-R. to pass -R. to the linker, in order to add
-   the current directory to the dynamic linker search path. */
-#undef HAVE_LINK_R
-
-/* Define to 1 if you have the `longjmp' function. */
-/* #undef HAVE_LONGJMP */
+/* Define to 1 if you have the `lseek64' function. */
+/* #undef HAVE_LSEEK64 */
 
 /* Define to 1 if you have the <mach/mach.h> header file. */
 /* #undef HAVE_MACH_MACH_H */
 
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-/* #undef HAVE_MACH_O_DYLD_H */
+/* Define to 1 if you have the `mallctl' function. */
+#define HAVE_MALLCTL 1
 
-/* Define if mallinfo() is available on this platform. */
+/* Define to 1 if you have the `mallinfo' function. */
 /* #undef HAVE_MALLINFO */
 
 /* Define to 1 if you have the <malloc.h> header file. */
@@ -180,9 +149,6 @@
 /* Define to 1 if you have the `malloc_zone_statistics' function. */
 /* #undef HAVE_MALLOC_ZONE_STATISTICS */
 
-/* Define to 1 if you have the `mallctl` function. */
-#define HAVE_MALLCTL 1
-
 /* Define to 1 if you have the `mkdtemp' function. */
 #define HAVE_MKDTEMP 1
 
@@ -192,21 +158,11 @@
 /* Define to 1 if you have the `mktemp' function. */
 #define HAVE_MKTEMP 1
 
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if
-   it uses MAP_ANON */
-#undef HAVE_MMAP_ANONYMOUS
-
-/* Define if mmap() can map files into memory */
-#undef HAVE_MMAP_FILE
-
 /* 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 `opendir' function. */
-#define HAVE_OPENDIR 1
+/* Define to 1 if you have the `posix_fallocate' function. */
+#define HAVE_POSIX_FALLOCATE 1
 
 /* Define to 1 if you have the `posix_spawn' function. */
 #define HAVE_POSIX_SPAWN 1
@@ -214,12 +170,6 @@
 /* Define to 1 if you have the `pread' function. */
 #define HAVE_PREAD 1
 
-/* Define if libtool can extract symbol lists from object files. */
-#undef HAVE_PRELOADED_SYMBOLS
-
-/* Define to have the %a format string */
-#undef HAVE_PRINTF_A
-
 /* Have pthread_getspecific */
 #define HAVE_PTHREAD_GETSPECIFIC 1
 
@@ -232,12 +182,6 @@
 /* Have pthread_rwlock_init */
 #define HAVE_PTHREAD_RWLOCK_INIT 1
 
-/* Define to 1 if srand48/lrand48/drand48 exist in <stdlib.h> */
-#define HAVE_RAND48 1
-
-/* Define to 1 if you have the `readdir' function. */
-#define HAVE_READDIR 1
-
 /* Define to 1 if you have the `realpath' function. */
 #define HAVE_REALPATH 1
 
@@ -247,39 +191,18 @@
 /* Define to 1 if you have the `setenv' function. */
 #define HAVE_SETENV 1
 
-/* Define to 1 if you have the `setjmp' function. */
-/* #undef HAVE_SETJMP */
-
 /* Define to 1 if you have the `setrlimit' function. */
 #define HAVE_SETRLIMIT 1
 
-/* Define if you have the shl_load function. */
-#undef HAVE_SHL_LOAD
-
 /* Define to 1 if you have the `sigaltstack' function. */
 #define HAVE_SIGALTSTACK 1
 
-/* Define to 1 if you have the `siglongjmp' function. */
-/* #undef HAVE_SIGLONGJMP */
-
 /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1
 
-/* Define to 1 if you have the `sigsetjmp' function. */
-/* #undef HAVE_SIGSETJMP */
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
-/* Set to 1 if the std::isinf function is found in <cmath> */
-#undef HAVE_STD_ISINF_IN_CMATH
-
-/* Set to 1 if the std::isnan function is found in <cmath> */
-#undef HAVE_STD_ISNAN_IN_CMATH
-
-/* Define to 1 if you have the `strdup' function. */
-/* #undef HAVE_STRDUP */
-
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
@@ -289,11 +212,8 @@
 /* Define to 1 if you have the `strtoll' function. */
 #define HAVE_STRTOLL 1
 
-/* Define to 1 if you have the `strtoq' function. */
-#define HAVE_STRTOQ 1
-
 /* Define to 1 if you have the `sysconf' function. */
-#undef HAVE_SYSCONF
+#define HAVE_SYSCONF 1
 
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
@@ -303,7 +223,7 @@
 #define HAVE_SYS_IOCTL_H 1
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 
+#define HAVE_SYS_MMAN_H 1
 
 /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
    */
@@ -342,12 +262,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define to 1 if you have the `_Unwind_Backtrace' function. */
-/* #undef HAVE_UNWIND_BACKTRACE */
-
-/* Define to 1 if you have the <utime.h> header file. */
-#define HAVE_UTIME_H 1
-
 /* Define to 1 if the system has the type `u_int64_t'. */
 #define HAVE_U_INT64_T 1
 
@@ -363,6 +277,12 @@
 /* Have host's _alloca */
 /* #undef HAVE__ALLOCA */
 
+/* Define to 1 if you have the `_chsize_s' function. */
+/* #undef HAVE__CHSIZE_S */
+
+/* Define to 1 if you have the `_Unwind_Backtrace' function. */
+/* #undef HAVE__UNWIND_BACKTRACE */
+
 /* Have host's __alloca */
 /* #undef HAVE___ALLOCA */
 
@@ -384,9 +304,6 @@
 /* Have host's __divdi3 */
 /* #undef HAVE___DIVDI3 */
 
-/* Define to 1 if you have the `__dso_handle' function. */
-#undef HAVE___DSO_HANDLE
-
 /* Have host's __fixdfdi */
 /* #undef HAVE___FIXDFDI */
 
@@ -418,53 +335,27 @@
 /* #undef HAVE____CHKSTK_MS */
 
 /* Linker version detected at compile time. */
-#undef HOST_LINK_VERSION
-
-/* Installation directory for binary executables */
-/* #undef LLVM_BINDIR */
+/* #undef HOST_LINK_VERSION */
 
-/* Time at which LLVM was configured */
-/* #undef LLVM_CONFIGTIME */
-
-/* Installation directory for data files */
-/* #undef LLVM_DATADIR */
+/* Define if we link Polly to the tools */
+/* #undef LINK_POLLY_INTO_TOOLS */
 
-/* Target triple LLVM will generate code for by default
- * Doesn't use `cmakedefine` because it is allowed to be empty.
- */
+/* Target triple LLVM will generate code for by default */
+/* Doesn't use `cmakedefine` because it is allowed to be empty. */
 /* #undef LLVM_DEFAULT_TARGET_TRIPLE */
 
-/* Installation directory for documentation */
-/* #undef LLVM_DOCSDIR */
-
-/* Define if LLVM is built with asserts and checks that change the layout of
-   client-visible data structures.  */
-#define LLVM_ENABLE_ABI_BREAKING_CHECKS
-
 /* Define if threads enabled */
 #define LLVM_ENABLE_THREADS 1
 
 /* Define if zlib compression is available */
 #define LLVM_ENABLE_ZLIB 1
 
-/* Installation directory for config files */
-/* #undef LLVM_ETCDIR */
-
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1
 
 /* Host triple LLVM will be executed on */
 /* #undef LLVM_HOST_TRIPLE */
 
-/* Installation directory for include files */
-/* #undef LLVM_INCLUDEDIR */
-
-/* Installation directory for .info files */
-/* #undef LLVM_INFODIR */
-
-/* Installation directory for man pages */
-/* #undef LLVM_MANDIR */
-
 /* LLVM architecture name for the native architecture, if available */
 #define LLVM_NATIVE_ARCH X86
 
@@ -496,49 +387,29 @@
 #define LLVM_PREFIX "/usr"
 
 /* Define if we have the Intel JIT API runtime support library */
-/* #undef LLVM_USE_INTEL_JITEVENTS */
+#define LLVM_USE_INTEL_JITEVENTS 0
 
 /* Define if we have the oprofile JIT-support library */
-/* #undef LLVM_USE_OPROFILE */
+#define LLVM_USE_OPROFILE 0
+
+/* LLVM version information */
+/* #undef LLVM_VERSION_INFO */
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 3
+#define LLVM_VERSION_MAJOR 4
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 9
+#define LLVM_VERSION_MINOR 0
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "3.9.1"
-
-/* LLVM version information */
-/* #undef LLVM_VERSION_INFO */
-
-/* Define if we link Polly to the tools */
-/* #undef LINK_POLLY_INTO_TOOLS */
-
-/* Define if the OS needs help to load dependent libraries for dlopen(). */
-/* #undef LTDL_DLOPEN_DEPLIBS */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LTDL_OBJDIR
+#define LLVM_VERSION_STRING "4.0.0"
 
 /* Define to the extension used for shared libraries, say, ".so". */
 #define LTDL_SHLIB_EXT ".so"
 
-/* Define to the system default library search path. */
-/* #undef LTDL_SYSSEARCHPATH */
-
-/* Define if /dev/zero should be used when mapping RWX memory, or undefine if
-   its not necessary */
-#undef NEED_DEV_ZERO_FOR_MMAP
-
-/* Define if dlsym() requires a leading underscore in symbol names. */
-#undef NEED_USCORE
-
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "https://bugs.freebsd.org/submit/"
 
@@ -546,13 +417,13 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 3.9.1"
+#define PACKAGE_STRING "LLVM 4.0.0"
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.9.1"
+#define PACKAGE_VERSION "4.0.0"
 
 /* Define to the vendor of this package. */
 /* #undef PACKAGE_VENDOR */
@@ -560,24 +431,6 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-#undef STAT_MACROS_BROKEN
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
 /* Define to a function replacing strtoll */
 /* #undef strtoll */
 
@@ -590,7 +443,4 @@
 /* Define to a function implementing strdup */
 /* #undef strdup */
 
-/* Define to 1 if you have the `_chsize_s' function. */
-/* #undef HAVE__CHSIZE_S */
-
 #endif
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index c54e34500b26..755017fbee06 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -15,46 +15,21 @@
 #ifndef LLVM_CONFIG_H
 #define LLVM_CONFIG_H
 
-/* Installation directory for binary executables */
-/* #undef LLVM_BINDIR */
-
-/* Time at which LLVM was configured */
-/* #undef LLVM_CONFIGTIME */
-
-/* Installation directory for data files */
-/* #undef LLVM_DATADIR */
+/* Define if we link Polly to the tools */
+/* #undef LINK_POLLY_INTO_TOOLS */
 
 /* Target triple LLVM will generate code for by default */
 /* #undef LLVM_DEFAULT_TARGET_TRIPLE */
 
-/* Installation directory for documentation */
-/* #undef LLVM_DOCSDIR */
-
-/* Define if LLVM is built with asserts and checks that change the layout of
-   client-visible data structures.  */
-#define LLVM_ENABLE_ABI_BREAKING_CHECKS
-
 /* Define if threads enabled */
 #define LLVM_ENABLE_THREADS 1
 
-/* Installation directory for config files */
-/* #undef LLVM_ETCDIR */
-
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1
 
 /* Host triple LLVM will be executed on */
 /* #undef LLVM_HOST_TRIPLE */
 
-/* Installation directory for include files */
-/* #undef LLVM_INCLUDEDIR */
-
-/* Installation directory for .info files */
-/* #undef LLVM_INFODIR */
-
-/* Installation directory for man pages */
-/* #undef LLVM_MANDIR */
-
 /* LLVM architecture name for the native architecture, if available */
 #define LLVM_NATIVE_ARCH X86
 
@@ -86,24 +61,21 @@
 #define LLVM_PREFIX "/usr"
 
 /* Define if we have the Intel JIT API runtime support library */
-/* #undef LLVM_USE_INTEL_JITEVENTS */
+#define LLVM_USE_INTEL_JITEVENTS 0
 
 /* Define if we have the oprofile JIT-support library */
-/* #undef LLVM_USE_OPROFILE */
+#define LLVM_USE_OPROFILE 0
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 3
+#define LLVM_VERSION_MAJOR 4
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 9
+#define LLVM_VERSION_MINOR 0
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "3.9.1"
-
-/* Define if we link Polly to the tools */
-/* #undef LINK_POLLY_INTO_TOOLS */
+#define LLVM_VERSION_STRING "4.0.0"
 
 #endif
diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index b2d0ffcd94b9..54fb0d7738d8 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -101,19 +101,23 @@ SRCS_MIN+=	AST/VTableBuilder.cpp
 SRCS_MIN+=	ASTMatchers/ASTMatchFinder.cpp
 SRCS_MIN+=	ASTMatchers/ASTMatchersInternal.cpp
 SRCS_MIN+=	ASTMatchers/Dynamic/Diagnostics.cpp
+SRCS_MIN+=	ASTMatchers/Dynamic/Parser.cpp
 SRCS_MIN+=	ASTMatchers/Dynamic/Registry.cpp
+SRCS_MIN+=	ASTMatchers/Dynamic/VariantValue.cpp
 SRCS_MIN+=	Analysis/AnalysisDeclContext.cpp
 SRCS_MIN+=	Analysis/BodyFarm.cpp
 SRCS_MIN+=	Analysis/CFG.cpp
 SRCS_MIN+=	Analysis/CFGReachabilityAnalysis.cpp
 SRCS_MIN+=	Analysis/CFGStmtMap.cpp
 SRCS_FUL+=	Analysis/CallGraph.cpp
+SRCS_MIN+=	Analysis/CloneDetection.cpp
 SRCS_MIN+=	Analysis/CocoaConventions.cpp
 SRCS_FUL+=	Analysis/CodeInjector.cpp
 SRCS_MIN+=	Analysis/Consumed.cpp
 SRCS_FUL+=	Analysis/Dominators.cpp
 SRCS_MIN+=	Analysis/FormatString.cpp
 SRCS_MIN+=	Analysis/LiveVariables.cpp
+SRCS_MIN+=	Analysis/OSLog.cpp
 SRCS_MIN+=	Analysis/ObjCNoReturn.cpp
 SRCS_MIN+=	Analysis/PostOrderCFGView.cpp
 SRCS_MIN+=	Analysis/PrintfFormatString.cpp
@@ -123,6 +127,7 @@ SRCS_MIN+=	Analysis/ReachableCode.cpp
 SRCS_MIN+=	Analysis/ScanfFormatString.cpp
 SRCS_MIN+=	Analysis/ThreadSafety.cpp
 SRCS_MIN+=	Analysis/ThreadSafetyCommon.cpp
+SRCS_MIN+=	Analysis/ThreadSafetyLogical.cpp
 SRCS_MIN+=	Analysis/ThreadSafetyTIL.cpp
 SRCS_MIN+=	Analysis/UninitializedValues.cpp
 SRCS_MIN+=	Basic/Attributes.cpp
@@ -163,6 +168,7 @@ SRCS_MIN+=	CodeGen/CGCXXABI.cpp
 SRCS_MIN+=	CodeGen/CGCall.cpp
 SRCS_MIN+=	CodeGen/CGClass.cpp
 SRCS_MIN+=	CodeGen/CGCleanup.cpp
+SRCS_MIN+=	CodeGen/CGCoroutine.cpp
 SRCS_MIN+=	CodeGen/CGDebugInfo.cpp
 SRCS_MIN+=	CodeGen/CGDecl.cpp
 SRCS_MIN+=	CodeGen/CGDeclCXX.cpp
@@ -186,6 +192,7 @@ SRCS_MIN+=	CodeGen/CGStmt.cpp
 SRCS_MIN+=	CodeGen/CGStmtOpenMP.cpp
 SRCS_MIN+=	CodeGen/CGVTT.cpp
 SRCS_MIN+=	CodeGen/CGVTables.cpp
+SRCS_MIN+=	CodeGen/CodeGenABITypes.cpp
 SRCS_MIN+=	CodeGen/CodeGenAction.cpp
 SRCS_MIN+=	CodeGen/CodeGenFunction.cpp
 SRCS_MIN+=	CodeGen/CodeGenModule.cpp
@@ -200,9 +207,11 @@ SRCS_MIN+=	CodeGen/ObjectFilePCHContainerOperations.cpp
 SRCS_MIN+=	CodeGen/SanitizerMetadata.cpp
 SRCS_MIN+=	CodeGen/SwiftCallingConv.cpp
 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
@@ -221,6 +230,7 @@ SRCS_MIN+=	Edit/EditedSource.cpp
 SRCS_MIN+=	Edit/RewriteObjCFoundationAPI.cpp
 SRCS_EXT+=	Format/AffectedRangeManager.cpp
 SRCS_EXT+=	Format/BreakableToken.cpp
+SRCS_EXT+=	Format/Comments.cpp
 SRCS_EXT+=	Format/ContinuationIndenter.cpp
 SRCS_EXT+=	Format/Format.cpp
 SRCS_EXT+=	Format/FormatToken.cpp
@@ -262,6 +272,8 @@ SRCS_MIN+=	Frontend/Rewrite/FrontendActions.cpp
 SRCS_MIN+=	Frontend/Rewrite/HTMLPrint.cpp
 SRCS_MIN+=	Frontend/Rewrite/InclusionRewriter.cpp
 SRCS_MIN+=	Frontend/Rewrite/RewriteMacros.cpp
+SRCS_MIN+=	Frontend/Rewrite/RewriteModernObjC.cpp
+SRCS_MIN+=	Frontend/Rewrite/RewriteObjC.cpp
 SRCS_MIN+=	Frontend/Rewrite/RewriteTest.cpp
 SRCS_MIN+=	Frontend/SerializedDiagnosticPrinter.cpp
 SRCS_MIN+=	Frontend/SerializedDiagnosticReader.cpp
@@ -382,14 +394,17 @@ SRCS_MIN+=	Serialization/Module.cpp
 SRCS_MIN+=	Serialization/ModuleFileExtension.cpp
 SRCS_MIN+=	Serialization/ModuleManager.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/AllocationDiagnostics.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/AnalysisOrderChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ArrayBoundChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/BlockInCriticalSectionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/BoolAssignmentChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CStringChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CXXSelfAssignmentChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CastSizeChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CastToStructChecker.cpp
@@ -397,8 +412,11 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/CheckObjCDealloc.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/CheckSizeofPointer.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CheckerDocumentation.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ChrootChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ClangCheckers.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CloneChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ConversionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/DeadStoresChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/DebugCheckers.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/DereferenceChecker.cpp
@@ -408,8 +426,10 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/DynamicTypeChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/DynamicTypePropagation.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ExprInspectionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/FixedAddressChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/GTestChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/GenericTaintChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/IdenticalExprChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/IteratorPastEndChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/LocalizationChecker.cpp
@@ -426,10 +446,12 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/NSErrorChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NonNullParamChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/NullabilityChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/NumberObjectConversionChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCContainersChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCMissingSuperCallChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCPropertyChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCSuperDeallocChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCUnusedIVarsChecker.cpp
@@ -442,6 +464,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/SimpleStreamChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/StdLibraryFunctionsChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/StreamChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/TaintTesterChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/TestAfterDivZeroChecker.cpp
@@ -454,6 +477,7 @@ SRCS_FUL+=	StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UnixAPIChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/VLASizeChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ValistChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/VforkChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Checkers/VirtualCallChecker.cpp
 SRCS_FUL+=	StaticAnalyzer/Core/APSIntType.cpp
@@ -505,9 +529,11 @@ SRCS_FUL+=	StaticAnalyzer/Frontend/ModelInjector.cpp
 SRCS_MIN+=	Tooling/ArgumentsAdjusters.cpp
 SRCS_MIN+=	Tooling/CommonOptionsParser.cpp
 SRCS_MIN+=	Tooling/CompilationDatabase.cpp
+SRCS_MIN+=	Tooling/Core/Lookup.cpp
 SRCS_EXT+=	Tooling/Core/QualTypeNames.cpp
 SRCS_EXT+=	Tooling/Core/Replacement.cpp
 SRCS_MIN+=	Tooling/FileMatchTrie.cpp
+SRCS_MIN+=	Tooling/FixIt.cpp
 SRCS_MIN+=	Tooling/JSONCompilationDatabase.cpp
 SRCS_MIN+=	Tooling/Refactoring.cpp
 SRCS_MIN+=	Tooling/RefactoringCallbacks.cpp
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index 1e52d40fccab..189119a49979 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -53,6 +53,7 @@ SRCS+=		API/SBSection.cpp
 SRCS+=		API/SBSourceManager.cpp
 SRCS+=		API/SBStream.cpp
 SRCS+=		API/SBStringList.cpp
+SRCS+=		API/SBStructuredData.cpp
 SRCS+=		API/SBSymbol.cpp
 SRCS+=		API/SBSymbolContext.cpp
 SRCS+=		API/SBSymbolContextList.cpp
@@ -134,9 +135,7 @@ SRCS+=		Core/Baton.cpp
 SRCS+=		Core/Broadcaster.cpp
 SRCS+=		Core/Communication.cpp
 SRCS+=		Core/Connection.cpp
-SRCS+=		Core/ConnectionSharedMemory.cpp
 SRCS+=		Core/ConstString.cpp
-SRCS+=		Core/CxaDemangle.cpp
 SRCS+=		Core/DataBufferHeap.cpp
 SRCS+=		Core/DataBufferMemoryMap.cpp
 SRCS+=		Core/DataEncoder.cpp
@@ -226,7 +225,6 @@ SRCS+=		Expression/Materializer.cpp
 SRCS+=		Expression/REPL.cpp
 SRCS+=		Expression/UserExpression.cpp
 SRCS+=		Expression/UtilityFunction.cpp
-SRCS+=		Host/common/Condition.cpp
 SRCS+=		Host/common/Editline.cpp
 SRCS+=		Host/common/File.cpp
 SRCS+=		Host/common/FileCache.cpp
@@ -240,7 +238,6 @@ SRCS+=		Host/common/HostThread.cpp
 SRCS+=		Host/common/IOObject.cpp
 SRCS+=		Host/common/LockFileBase.cpp
 SRCS+=		Host/common/MonitoringProcessLauncher.cpp
-SRCS+=		Host/common/Mutex.cpp
 SRCS+=		Host/common/NativeBreakpointList.cpp
 SRCS+=		Host/common/NativeWatchpointList.cpp
 SRCS+=		Host/common/OptionParser.cpp
@@ -254,7 +251,6 @@ SRCS+=		Host/common/TCPSocket.cpp
 SRCS+=		Host/common/Terminal.cpp
 SRCS+=		Host/common/ThisThread.cpp
 SRCS+=		Host/common/ThreadLauncher.cpp
-SRCS+=		Host/common/TimeValue.cpp
 SRCS+=		Host/common/UDPSocket.cpp
 SRCS+=		Host/common/XML.cpp
 SRCS+=		Host/freebsd/Host.cpp
@@ -297,7 +293,6 @@ SRCS+=		Interpreter/OptionGroupVariable.cpp
 SRCS+=		Interpreter/OptionGroupWatchpoint.cpp
 SRCS+=		Interpreter/OptionValue.cpp
 SRCS+=		Interpreter/OptionValueArch.cpp
-SRCS+=		Interpreter/OptionValueArgs.cpp
 SRCS+=		Interpreter/OptionValueArray.cpp
 SRCS+=		Interpreter/OptionValueBoolean.cpp
 SRCS+=		Interpreter/OptionValueChar.cpp
@@ -407,7 +402,6 @@ SRCS+=		Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextDummy.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_arm.cpp
-SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_arm64.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp
@@ -415,7 +409,6 @@ SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextHistory.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextLLDB.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextLinux_arm.cpp
-SRCS+=		Plugins/Process/Utility/RegisterContextLinux_arm64.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextLinux_i386.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextLinux_mips.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
@@ -427,6 +420,7 @@ SRCS+=		Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextPOSIX_powerpc.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp
 SRCS+=		Plugins/Process/Utility/RegisterContextThreadMemory.cpp
+SRCS+=		Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp
 SRCS+=		Plugins/Process/Utility/StopInfoMachException.cpp
 SRCS+=		Plugins/Process/Utility/ThreadMemory.cpp
 SRCS+=		Plugins/Process/Utility/UnwindLLDB.cpp
@@ -438,6 +432,7 @@ SRCS+=		Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp
 SRCS+=		Plugins/Process/elf-core/RegisterContextPOSIXCore_powerpc.cpp
 SRCS+=		Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp
 SRCS+=		Plugins/Process/elf-core/ThreadElfCore.cpp
+SRCS+=		Plugins/Process/gdb-remote/GDBRemoteClientBase.cpp
 SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
 SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
 SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
@@ -481,6 +476,7 @@ SRCS+=		Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
 SRCS+=		Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
 SRCS+=		Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
 SRCS+=		Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
+SRCS+=		Plugins/UnwindAssembly/x86/x86AssemblyInspectionEngine.cpp
 SRCS+=		Symbol/ArmUnwindInfo.cpp
 SRCS+=		Symbol/Block.cpp
 SRCS+=		Symbol/ClangASTContext.cpp
@@ -570,7 +566,6 @@ SRCS+=		Target/ThreadPlanTracer.cpp
 SRCS+=		Target/ThreadSpec.cpp
 SRCS+=		Target/UnixSignals.cpp
 SRCS+=		Target/UnwindAssembly.cpp
-SRCS+=		Utility/ARM64_DWARF_Registers.cpp
 SRCS+=		Utility/ARM_DWARF_Registers.cpp
 SRCS+=		Utility/ConvertEnum.cpp
 SRCS+=		Utility/JSON.cpp
@@ -579,6 +574,7 @@ SRCS+=		Utility/ModuleCache.cpp
 SRCS+=		Utility/NameMatches.cpp
 SRCS+=		Utility/PseudoTerminal.cpp
 SRCS+=		Utility/RegisterNumber.cpp
+SRCS+=		Utility/SelectHelper.cpp
 SRCS+=		Utility/SharingPtr.cpp
 SRCS+=		Utility/StringExtractor.cpp
 SRCS+=		Utility/StringExtractorGDBRemote.cpp
diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 04f6f06f2370..1ec73bd8adbc 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -52,14 +52,15 @@ SRCS_MIN+=	Analysis/Interval.cpp
 SRCS_MIN+=	Analysis/IntervalPartition.cpp
 SRCS_MIN+=	Analysis/IteratedDominanceFrontier.cpp
 SRCS_MIN+=	Analysis/LazyBlockFrequencyInfo.cpp
+SRCS_MIN+=	Analysis/LazyBranchProbabilityInfo.cpp
 SRCS_MIN+=	Analysis/LazyCallGraph.cpp
 SRCS_MIN+=	Analysis/LazyValueInfo.cpp
 SRCS_MIN+=	Analysis/Lint.cpp
 SRCS_MIN+=	Analysis/Loads.cpp
 SRCS_MIN+=	Analysis/LoopAccessAnalysis.cpp
+SRCS_MIN+=	Analysis/LoopAnalysisManager.cpp
 SRCS_MIN+=	Analysis/LoopInfo.cpp
 SRCS_MIN+=	Analysis/LoopPass.cpp
-SRCS_MIN+=	Analysis/LoopPassManager.cpp
 SRCS_MIN+=	Analysis/LoopUnrollAnalyzer.cpp
 SRCS_MIN+=	Analysis/MemDepPrinter.cpp
 SRCS_MIN+=	Analysis/MemDerefPrinter.cpp
@@ -88,6 +89,7 @@ SRCS_MIN+=	Analysis/ScopedNoAliasAA.cpp
 SRCS_MIN+=	Analysis/SparsePropagation.cpp
 SRCS_MIN+=	Analysis/TargetLibraryInfo.cpp
 SRCS_MIN+=	Analysis/TargetTransformInfo.cpp
+SRCS_MIN+=	Analysis/Trace.cpp
 SRCS_MIN+=	Analysis/TypeBasedAliasAnalysis.cpp
 SRCS_MIN+=	Analysis/TypeMetadataUtils.cpp
 SRCS_MIN+=	Analysis/ValueTracking.cpp
@@ -95,8 +97,12 @@ SRCS_MIN+=	Analysis/VectorUtils.cpp
 SRCS_MIN+=	AsmParser/LLLexer.cpp
 SRCS_MIN+=	AsmParser/LLParser.cpp
 SRCS_MIN+=	AsmParser/Parser.cpp
+SRCS_MIN+=	Bitcode/Reader/BitReader.cpp
 SRCS_MIN+=	Bitcode/Reader/BitcodeReader.cpp
 SRCS_MIN+=	Bitcode/Reader/BitstreamReader.cpp
+SRCS_MIN+=	Bitcode/Reader/MetadataLoader.cpp
+SRCS_MIN+=	Bitcode/Reader/ValueList.cpp
+SRCS_MIN+=	Bitcode/Writer/BitWriter.cpp
 SRCS_MIN+=	Bitcode/Writer/BitcodeWriter.cpp
 SRCS_MIN+=	Bitcode/Writer/BitcodeWriterPass.cpp
 SRCS_MIN+=	Bitcode/Writer/ValueEnumerator.cpp
@@ -129,11 +135,13 @@ SRCS_MIN+=	CodeGen/AsmPrinter/WinException.cpp
 SRCS_MIN+=	CodeGen/AtomicExpandPass.cpp
 SRCS_MIN+=	CodeGen/BasicTargetTransformInfo.cpp
 SRCS_MIN+=	CodeGen/BranchFolding.cpp
+SRCS_MIN+=	CodeGen/BranchRelaxation.cpp
 SRCS_MIN+=	CodeGen/BuiltinGCs.cpp
 SRCS_MIN+=	CodeGen/CalcSpillWeights.cpp
 SRCS_MIN+=	CodeGen/CallingConvLower.cpp
 SRCS_MIN+=	CodeGen/CodeGen.cpp
 SRCS_MIN+=	CodeGen/CodeGenPrepare.cpp
+SRCS_MIN+=	CodeGen/CountingFunctionInserter.cpp
 SRCS_MIN+=	CodeGen/CriticalAntiDepBreaker.cpp
 SRCS_MIN+=	CodeGen/DFAPacketizer.cpp
 SRCS_MIN+=	CodeGen/DeadMachineInstructionElim.cpp
@@ -147,9 +155,9 @@ SRCS_MIN+=	CodeGen/ExpandPostRAPseudos.cpp
 SRCS_MIN+=	CodeGen/FaultMaps.cpp
 SRCS_MIN+=	CodeGen/FuncletLayout.cpp
 SRCS_MIN+=	CodeGen/GCMetadata.cpp
-SRCS_EXT+=	CodeGen/GCMetadataPrinter.cpp
+SRCS_MIN+=	CodeGen/GCMetadataPrinter.cpp
 SRCS_MIN+=	CodeGen/GCRootLowering.cpp
-SRCS_EXT+=	CodeGen/GCStrategy.cpp
+SRCS_MIN+=	CodeGen/GCStrategy.cpp
 SRCS_MIN+=	CodeGen/GlobalISel/GlobalISel.cpp
 SRCS_MIN+=	CodeGen/GlobalMerge.cpp
 SRCS_MIN+=	CodeGen/IfConversion.cpp
@@ -173,6 +181,7 @@ SRCS_MIN+=	CodeGen/LiveRegMatrix.cpp
 SRCS_MIN+=	CodeGen/LiveStackAnalysis.cpp
 SRCS_MIN+=	CodeGen/LiveVariables.cpp
 SRCS_MIN+=	CodeGen/LocalStackSlotAllocation.cpp
+SRCS_MIN+=	CodeGen/LowLevelType.cpp
 SRCS_MIN+=	CodeGen/LowerEmuTLS.cpp
 SRCS_EXT+=	CodeGen/MIRParser/MILexer.cpp
 SRCS_EXT+=	CodeGen/MIRParser/MIParser.cpp
@@ -189,7 +198,6 @@ SRCS_MIN+=	CodeGen/MachineCopyPropagation.cpp
 SRCS_MIN+=	CodeGen/MachineDominanceFrontier.cpp
 SRCS_MIN+=	CodeGen/MachineDominators.cpp
 SRCS_MIN+=	CodeGen/MachineFunction.cpp
-SRCS_MIN+=	CodeGen/MachineFunctionAnalysis.cpp
 SRCS_MIN+=	CodeGen/MachineFunctionPass.cpp
 SRCS_MIN+=	CodeGen/MachineFunctionPrinterPass.cpp
 SRCS_MIN+=	CodeGen/MachineInstr.cpp
@@ -199,6 +207,7 @@ SRCS_MIN+=	CodeGen/MachineLoopInfo.cpp
 SRCS_MIN+=	CodeGen/MachineModuleInfo.cpp
 SRCS_MIN+=	CodeGen/MachineModuleInfoImpls.cpp
 SRCS_MIN+=	CodeGen/MachinePassRegistry.cpp
+SRCS_MIN+=	CodeGen/MachinePipeliner.cpp
 SRCS_MIN+=	CodeGen/MachinePostDominators.cpp
 SRCS_MIN+=	CodeGen/MachineRegionInfo.cpp
 SRCS_MIN+=	CodeGen/MachineRegisterInfo.cpp
@@ -232,6 +241,7 @@ SRCS_MIN+=	CodeGen/RegisterPressure.cpp
 SRCS_MIN+=	CodeGen/RegisterScavenging.cpp
 SRCS_MIN+=	CodeGen/RegisterUsageInfo.cpp
 SRCS_MIN+=	CodeGen/RenameIndependentSubregs.cpp
+SRCS_MIN+=	CodeGen/ResetMachineFunctionPass.cpp
 SRCS_MIN+=	CodeGen/SafeStack.cpp
 SRCS_MIN+=	CodeGen/SafeStackColoring.cpp
 SRCS_MIN+=	CodeGen/SafeStackLayout.cpp
@@ -284,30 +294,31 @@ SRCS_MIN+=	CodeGen/TargetOptionsImpl.cpp
 SRCS_MIN+=	CodeGen/TargetPassConfig.cpp
 SRCS_MIN+=	CodeGen/TargetRegisterInfo.cpp
 SRCS_MIN+=	CodeGen/TargetSchedule.cpp
+SRCS_MIN+=	CodeGen/TargetSubtargetInfo.cpp
 SRCS_MIN+=	CodeGen/TwoAddressInstructionPass.cpp
 SRCS_MIN+=	CodeGen/UnreachableBlockElim.cpp
 SRCS_MIN+=	CodeGen/VirtRegMap.cpp
 SRCS_MIN+=	CodeGen/WinEHPrepare.cpp
 SRCS_MIN+=	CodeGen/XRayInstrumentation.cpp
-SRCS_MIN+=	DebugInfo/CodeView/ByteStream.cpp
+SRCS_MIN+=	DebugInfo/CodeView/CVSymbolVisitor.cpp
+SRCS_MIN+=	DebugInfo/CodeView/CVTypeDumper.cpp
 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/FieldListRecordBuilder.cpp
 SRCS_MIN+=	DebugInfo/CodeView/Line.cpp
-SRCS_MIN+=	DebugInfo/CodeView/ListRecordBuilder.cpp
-SRCS_MIN+=	DebugInfo/CodeView/MemoryTypeTableBuilder.cpp
 SRCS_MIN+=	DebugInfo/CodeView/ModuleSubstream.cpp
 SRCS_MIN+=	DebugInfo/CodeView/ModuleSubstreamVisitor.cpp
 SRCS_MIN+=	DebugInfo/CodeView/RecordSerialization.cpp
-SRCS_MIN+=	DebugInfo/CodeView/StreamReader.cpp
-SRCS_MIN+=	DebugInfo/CodeView/StreamWriter.cpp
 SRCS_MIN+=	DebugInfo/CodeView/SymbolDumper.cpp
-SRCS_MIN+=	DebugInfo/CodeView/TypeDumper.cpp
+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/TypeRecordBuilder.cpp
+SRCS_MIN+=	DebugInfo/CodeView/TypeRecordMapping.cpp
+SRCS_MIN+=	DebugInfo/CodeView/TypeSerializer.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeStreamMerger.cpp
-SRCS_MIN+=	DebugInfo/CodeView/TypeTableBuilder.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFAcceleratorTable.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFCompileUnit.cpp
@@ -320,13 +331,23 @@ SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLine.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLoc.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugMacro.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugPubTable.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugRangeList.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDie.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFFormValue.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFGdbIndex.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFTypeUnit.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFUnit.cpp
 SRCS_MIW+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
 SRCS_MIW+=	DebugInfo/DWARF/SyntaxHighlighting.cpp
+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
 SRCS_EXT+=	DebugInfo/PDB/PDBContext.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDBExtras.cpp
@@ -367,15 +388,13 @@ SRCS_EXT+=	DebugInfo/PDB/PDBSymbolUsingNamespace.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/DbiStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/DbiStreamBuilder.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/EnumTables.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/GSI.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/GlobalsStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/Hash.cpp
-SRCS_EXT+=	DebugInfo/PDB/Raw/IndexedStreamData.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/InfoStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/InfoStreamBuilder.cpp
-SRCS_EXT+=	DebugInfo/PDB/Raw/MappedBlockStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/ModInfo.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/ModStream.cpp
-SRCS_EXT+=	DebugInfo/PDB/Raw/MsfBuilder.cpp
-SRCS_EXT+=	DebugInfo/PDB/Raw/MsfCommon.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/NameHashTable.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/NameMap.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/NameMapBuilder.cpp
@@ -385,10 +404,13 @@ SRCS_EXT+=	DebugInfo/PDB/Raw/PublicsStream.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/RawError.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/RawSession.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/SymbolStream.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/TpiHashing.cpp
 SRCS_EXT+=	DebugInfo/PDB/Raw/TpiStream.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/TpiStreamBuilder.cpp
 SRCS_EXT+=	DebugInfo/Symbolize/DIPrinter.cpp
-SRCS_EXT+=	DebugInfo/Symbolize/SymbolizableObjectFile.cpp
-SRCS_EXT+=	DebugInfo/Symbolize/Symbolize.cpp
+SRCS_MIW+=	DebugInfo/Symbolize/SymbolizableObjectFile.cpp
+SRCS_MIW+=	DebugInfo/Symbolize/Symbolize.cpp
+SRCS_MIN+=	Demangle/ItaniumDemangle.cpp
 SRCS_XDB+=	ExecutionEngine/ExecutionEngine.cpp
 SRCS_XDB+=	ExecutionEngine/ExecutionEngineBindings.cpp
 SRCS_XDB+=	ExecutionEngine/GDBRegistrationListener.cpp
@@ -403,12 +425,14 @@ SRCS_EXT+=	ExecutionEngine/Orc/OrcABISupport.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcCBindings.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcError.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcMCJITReplacement.cpp
+SRCS_XDB+=	ExecutionEngine/RuntimeDyld/JITSymbol.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
+SRCS_XDB+=	ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldELFMips.cpp
 SRCS_XDB+=	ExecutionEngine/SectionMemoryManager.cpp
 SRCS_XDB+=	ExecutionEngine/TargetSelect.cpp
 SRCS_MIN+=	IR/AsmWriter.cpp
@@ -462,11 +486,13 @@ SRCS_MIN+=	IR/ValueSymbolTable.cpp
 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/LTOBackend.cpp
 SRCS_EXL+=	LTO/LTOCodeGenerator.cpp
 SRCS_EXL+=	LTO/LTOModule.cpp
 SRCS_EXL+=	LTO/ThinLTOCodeGenerator.cpp
-SRCS_EXL+=	LTO/UpdateCompilerUsed.cpp
+SRCS_MIN+=	LTO/UpdateCompilerUsed.cpp
 SRCS_EXL+=	LibDriver/LibDriver.cpp
 SRCS_MIN+=	LineEditor/LineEditor.cpp
 SRCS_MIN+=	Linker/IRMover.cpp
@@ -536,6 +562,7 @@ SRCS_MIN+=	Object/Archive.cpp
 SRCS_MIN+=	Object/ArchiveWriter.cpp
 SRCS_MIN+=	Object/Binary.cpp
 SRCS_MIN+=	Object/COFFObjectFile.cpp
+SRCS_MIN+=	Object/Decompressor.cpp
 SRCS_MIN+=	Object/ELF.cpp
 SRCS_MIN+=	Object/ELFObjectFile.cpp
 SRCS_MIN+=	Object/Error.cpp
@@ -543,19 +570,22 @@ SRCS_MIN+=	Object/IRObjectFile.cpp
 SRCS_MIN+=	Object/MachOObjectFile.cpp
 SRCS_MIN+=	Object/MachOUniversal.cpp
 SRCS_MIN+=	Object/ModuleSummaryIndexObjectFile.cpp
+SRCS_MIN+=	Object/ModuleSymbolTable.cpp
 SRCS_EXT+=	Object/Object.cpp
 SRCS_MIN+=	Object/ObjectFile.cpp
 SRCS_MIN+=	Object/RecordStreamer.cpp
-SRCS_EXT+=	Object/SymbolSize.cpp
+SRCS_MIW+=	Object/SymbolSize.cpp
 SRCS_MIN+=	Object/SymbolicFile.cpp
+SRCS_MIN+=	Object/WasmObjectFile.cpp
 SRCS_MIN+=	ObjectYAML/COFFYAML.cpp
+SRCS_MIN+=	ObjectYAML/DWARFYAML.cpp
 SRCS_MIN+=	ObjectYAML/ELFYAML.cpp
 SRCS_MIN+=	ObjectYAML/MachOYAML.cpp
 SRCS_MIN+=	Option/Arg.cpp
 SRCS_MIN+=	Option/ArgList.cpp
 SRCS_MIN+=	Option/OptTable.cpp
 SRCS_MIN+=	Option/Option.cpp
-SRCS_EXL+=	Passes/PassBuilder.cpp
+SRCS_MIN+=	Passes/PassBuilder.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMapping.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMappingReader.cpp
 SRCS_MIN+=	ProfileData/Coverage/CoverageMappingWriter.cpp
@@ -576,14 +606,14 @@ SRCS_MIN+=	Support/BlockFrequency.cpp
 SRCS_MIN+=	Support/BranchProbability.cpp
 SRCS_EXT+=	Support/COM.cpp
 SRCS_MIN+=	Support/CachePruning.cpp
+SRCS_MIN+=	Support/Chrono.cpp
 SRCS_MIN+=	Support/CommandLine.cpp
 SRCS_MIN+=	Support/Compression.cpp
-SRCS_MIN+=	Support/ConvertUTF.c
+SRCS_MIN+=	Support/ConvertUTF.cpp
 SRCS_MIN+=	Support/ConvertUTFWrapper.cpp
 SRCS_MIN+=	Support/CrashRecoveryContext.cpp
 SRCS_MIN+=	Support/DAGDeltaAlgorithm.cpp
 SRCS_MIN+=	Support/DataExtractor.cpp
-SRCS_EXT+=	Support/DataStream.cpp
 SRCS_MIN+=	Support/Debug.cpp
 SRCS_MIN+=	Support/DeltaAlgorithm.cpp
 SRCS_MIN+=	Support/Dwarf.cpp
@@ -594,13 +624,14 @@ SRCS_MIN+=	Support/ErrorHandling.cpp
 SRCS_EXL+=	Support/FileOutputBuffer.cpp
 SRCS_EXT+=	Support/FileUtilities.cpp
 SRCS_MIN+=	Support/FoldingSet.cpp
+SRCS_MIN+=	Support/FormatVariadic.cpp
 SRCS_MIN+=	Support/FormattedStream.cpp
+SRCS_MIN+=	Support/GlobPattern.cpp
 SRCS_MIN+=	Support/GraphWriter.cpp
 SRCS_MIN+=	Support/Hashing.cpp
 SRCS_MIN+=	Support/Host.cpp
 SRCS_MIN+=	Support/IntEqClasses.cpp
 SRCS_MIN+=	Support/IntervalMap.cpp
-SRCS_FUL+=	Support/IntrusiveRefCntPtr.cpp
 SRCS_MIN+=	Support/JamCRC.cpp
 SRCS_MIN+=	Support/LEB128.cpp
 SRCS_MIN+=	Support/LineIterator.cpp
@@ -611,8 +642,8 @@ SRCS_MIN+=	Support/ManagedStatic.cpp
 SRCS_MIN+=	Support/MathExtras.cpp
 SRCS_XDB+=	Support/Memory.cpp
 SRCS_MIN+=	Support/MemoryBuffer.cpp
-SRCS_MIN+=	Support/MemoryObject.cpp
 SRCS_MIN+=	Support/Mutex.cpp
+SRCS_MIN+=	Support/NativeFormatting.cpp
 SRCS_MIN+=	Support/Options.cpp
 SRCS_MIN+=	Support/Path.cpp
 SRCS_MIN+=	Support/PluginLoader.cpp
@@ -632,20 +663,20 @@ SRCS_MIN+=	Support/SmallVector.cpp
 SRCS_MIN+=	Support/SourceMgr.cpp
 SRCS_MIN+=	Support/SpecialCaseList.cpp
 SRCS_MIN+=	Support/Statistic.cpp
-SRCS_MIN+=	Support/StreamingMemoryObject.cpp
 SRCS_MIN+=	Support/StringExtras.cpp
 SRCS_MIN+=	Support/StringMap.cpp
 SRCS_MIN+=	Support/StringRef.cpp
 SRCS_MIN+=	Support/StringSaver.cpp
 SRCS_EXT+=	Support/SystemUtils.cpp
+SRCS_LLD+=	Support/TarWriter.cpp
 SRCS_MIN+=	Support/TargetParser.cpp
 SRCS_MIN+=	Support/TargetRegistry.cpp
 SRCS_MIN+=	Support/ThreadLocal.cpp
-SRCS_EXL+=	Support/ThreadPool.cpp
+SRCS_MIN+=	Support/ThreadPool.cpp
 SRCS_MIN+=	Support/Threading.cpp
-SRCS_MIN+=	Support/TimeValue.cpp
 SRCS_MIN+=	Support/Timer.cpp
 SRCS_MIN+=	Support/ToolOutputFile.cpp
+SRCS_MIN+=	Support/TrigramIndex.cpp
 SRCS_MIN+=	Support/Triple.cpp
 SRCS_MIN+=	Support/Twine.cpp
 SRCS_MIN+=	Support/Unicode.cpp
@@ -660,6 +691,7 @@ SRCS_MIN+=	Support/regerror.c
 SRCS_MIN+=	Support/regexec.c
 SRCS_MIN+=	Support/regfree.c
 SRCS_MIN+=	Support/regstrlcpy.c
+SRCS_LLD+=	Support/xxhash.cpp
 SRCS_MIN+=	TableGen/Error.cpp
 SRCS_MIN+=	TableGen/Main.cpp
 SRCS_MIN+=	TableGen/Record.cpp
@@ -673,7 +705,6 @@ SRCS_MIN+=	Target/AArch64/AArch64A57FPLoadBalancing.cpp
 SRCS_MIN+=	Target/AArch64/AArch64AddressTypePromotion.cpp
 SRCS_MIN+=	Target/AArch64/AArch64AdvSIMDScalarPass.cpp
 SRCS_MIN+=	Target/AArch64/AArch64AsmPrinter.cpp
-SRCS_MIN+=	Target/AArch64/AArch64BranchRelaxation.cpp
 SRCS_MIN+=	Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp
 SRCS_MIN+=	Target/AArch64/AArch64CollectLOH.cpp
 SRCS_MIN+=	Target/AArch64/AArch64ConditionOptimizer.cpp
@@ -697,6 +728,7 @@ SRCS_MIN+=	Target/AArch64/AArch64Subtarget.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetMachine.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetObjectFile.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetTransformInfo.cpp
+SRCS_MIN+=	Target/AArch64/AArch64VectorByElementOpt.cpp
 SRCS_MIN+=	Target/AArch64/AsmParser/AArch64AsmParser.cpp
 SRCS_XDW+=	Target/AArch64/Disassembler/AArch64Disassembler.cpp
 SRCS_XDW+=	Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp
@@ -716,6 +748,7 @@ SRCS_MIN+=	Target/ARM/A15SDOptimizer.cpp
 SRCS_MIN+=	Target/ARM/ARMAsmPrinter.cpp
 SRCS_MIN+=	Target/ARM/ARMBaseInstrInfo.cpp
 SRCS_MIN+=	Target/ARM/ARMBaseRegisterInfo.cpp
+SRCS_MIN+=	Target/ARM/ARMComputeBlockSize.cpp
 SRCS_MIN+=	Target/ARM/ARMConstantIslandPass.cpp
 SRCS_MIN+=	Target/ARM/ARMConstantPoolValue.cpp
 SRCS_MIN+=	Target/ARM/ARMExpandPseudoInsts.cpp
@@ -872,11 +905,10 @@ SRCS_MIN+=	Target/Sparc/SparcTargetMachine.cpp
 SRCS_MIN+=	Target/Sparc/SparcTargetObjectFile.cpp
 SRCS_MIN+=	Target/Sparc/TargetInfo/SparcTargetInfo.cpp
 SRCS_MIN+=	Target/Target.cpp
+SRCS_MIN+=	Target/TargetIntrinsicInfo.cpp
 SRCS_MIN+=	Target/TargetLoweringObjectFile.cpp
 SRCS_MIN+=	Target/TargetMachine.cpp
 SRCS_MIN+=	Target/TargetMachineC.cpp
-SRCS_MIN+=	Target/TargetRecip.cpp
-SRCS_MIN+=	Target/TargetSubtargetInfo.cpp
 SRCS_MIN+=	Target/X86/AsmParser/X86AsmInstrumentation.cpp
 SRCS_MIN+=	Target/X86/AsmParser/X86AsmParser.cpp
 SRCS_XDW+=	Target/X86/Disassembler/X86Disassembler.cpp
@@ -896,6 +928,8 @@ SRCS_MIN+=	Target/X86/TargetInfo/X86TargetInfo.cpp
 SRCS_MIN+=	Target/X86/Utils/X86ShuffleDecode.cpp
 SRCS_MIN+=	Target/X86/X86AsmPrinter.cpp
 SRCS_MIN+=	Target/X86/X86CallFrameOptimization.cpp
+SRCS_MIN+=	Target/X86/X86CallingConv.cpp
+SRCS_MIN+=	Target/X86/X86EvexToVex.cpp
 SRCS_MIN+=	Target/X86/X86ExpandPseudo.cpp
 SRCS_MIN+=	Target/X86/X86FastISel.cpp
 SRCS_MIN+=	Target/X86/X86FixupBWInsts.cpp
@@ -905,7 +939,9 @@ SRCS_MIN+=	Target/X86/X86FloatingPoint.cpp
 SRCS_MIN+=	Target/X86/X86FrameLowering.cpp
 SRCS_MIN+=	Target/X86/X86ISelDAGToDAG.cpp
 SRCS_MIN+=	Target/X86/X86ISelLowering.cpp
+SRCS_MIN+=	Target/X86/X86InstrFMA3Info.cpp
 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/X86OptimizeLEAs.cpp
@@ -920,6 +956,13 @@ SRCS_MIN+=	Target/X86/X86TargetTransformInfo.cpp
 SRCS_MIN+=	Target/X86/X86VZeroUpper.cpp
 SRCS_MIN+=	Target/X86/X86WinAllocaExpander.cpp
 SRCS_MIN+=	Target/X86/X86WinEHState.cpp
+SRCS_MIN+=	Transforms/Coroutines/CoroCleanup.cpp
+SRCS_MIN+=	Transforms/Coroutines/CoroEarly.cpp
+SRCS_MIN+=	Transforms/Coroutines/CoroElide.cpp
+SRCS_MIN+=	Transforms/Coroutines/CoroFrame.cpp
+SRCS_MIN+=	Transforms/Coroutines/CoroSplit.cpp
+SRCS_MIN+=	Transforms/Coroutines/Coroutines.cpp
+SRCS_MIN+=	Transforms/IPO/AlwaysInliner.cpp
 SRCS_MIN+=	Transforms/IPO/ArgumentPromotion.cpp
 SRCS_MIN+=	Transforms/IPO/BarrierNoopPass.cpp
 SRCS_MIN+=	Transforms/IPO/ConstantMerge.cpp
@@ -932,10 +975,10 @@ SRCS_MIN+=	Transforms/IPO/FunctionAttrs.cpp
 SRCS_MIN+=	Transforms/IPO/FunctionImport.cpp
 SRCS_MIN+=	Transforms/IPO/GlobalDCE.cpp
 SRCS_MIN+=	Transforms/IPO/GlobalOpt.cpp
+SRCS_MIN+=	Transforms/IPO/GlobalSplit.cpp
 SRCS_MIN+=	Transforms/IPO/IPConstantPropagation.cpp
 SRCS_EXT+=	Transforms/IPO/IPO.cpp
 SRCS_MIN+=	Transforms/IPO/InferFunctionAttrs.cpp
-SRCS_MIN+=	Transforms/IPO/InlineAlways.cpp
 SRCS_MIN+=	Transforms/IPO/InlineSimple.cpp
 SRCS_MIN+=	Transforms/IPO/Inliner.cpp
 SRCS_MIN+=	Transforms/IPO/Internalize.cpp
@@ -948,6 +991,7 @@ SRCS_MIN+=	Transforms/IPO/PruneEH.cpp
 SRCS_MIN+=	Transforms/IPO/SampleProfile.cpp
 SRCS_MIN+=	Transforms/IPO/StripDeadPrototypes.cpp
 SRCS_MIN+=	Transforms/IPO/StripSymbols.cpp
+SRCS_MIN+=	Transforms/IPO/ThinLTOBitcodeWriter.cpp
 SRCS_MIN+=	Transforms/IPO/WholeProgramDevirt.cpp
 SRCS_MIN+=	Transforms/InstCombine/InstCombineAddSub.cpp
 SRCS_MIN+=	Transforms/InstCombine/InstCombineAndOrXor.cpp
@@ -997,21 +1041,25 @@ SRCS_MIN+=	Transforms/Scalar/Float2Int.cpp
 SRCS_MIN+=	Transforms/Scalar/GVN.cpp
 SRCS_MIN+=	Transforms/Scalar/GVNHoist.cpp
 SRCS_MIN+=	Transforms/Scalar/GuardWidening.cpp
+SRCS_MIN+=	Transforms/Scalar/IVUsersPrinter.cpp
 SRCS_MIN+=	Transforms/Scalar/IndVarSimplify.cpp
 SRCS_MIN+=	Transforms/Scalar/InductiveRangeCheckElimination.cpp
 SRCS_MIN+=	Transforms/Scalar/JumpThreading.cpp
 SRCS_MIN+=	Transforms/Scalar/LICM.cpp
 SRCS_MIN+=	Transforms/Scalar/LoadCombine.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopAccessAnalysisPrinter.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopDataPrefetch.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopDeletion.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopDistribute.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopIdiomRecognize.cpp
-SRCS_EXL+=	Transforms/Scalar/LoopInstSimplify.cpp
+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/LoopRerollPass.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopRotation.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopSimplifyCFG.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopSink.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopStrengthReduce.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopUnrollPass.cpp
 SRCS_MIN+=	Transforms/Scalar/LoopUnswitch.cpp
@@ -1022,6 +1070,7 @@ SRCS_MIN+=	Transforms/Scalar/LowerGuardIntrinsic.cpp
 SRCS_MIN+=	Transforms/Scalar/MemCpyOptimizer.cpp
 SRCS_MIN+=	Transforms/Scalar/MergedLoadStoreMotion.cpp
 SRCS_MIN+=	Transforms/Scalar/NaryReassociate.cpp
+SRCS_MIN+=	Transforms/Scalar/NewGVN.cpp
 SRCS_MIN+=	Transforms/Scalar/PartiallyInlineLibCalls.cpp
 SRCS_MIN+=	Transforms/Scalar/PlaceSafepoints.cpp
 SRCS_MIN+=	Transforms/Scalar/Reassociate.cpp
@@ -1050,17 +1099,22 @@ SRCS_MIN+=	Transforms/Utils/CmpInstAnalysis.cpp
 SRCS_MIN+=	Transforms/Utils/CodeExtractor.cpp
 SRCS_MIN+=	Transforms/Utils/CtorUtils.cpp
 SRCS_MIN+=	Transforms/Utils/DemoteRegToStack.cpp
+SRCS_MIN+=	Transforms/Utils/EscapeEnumerator.cpp
 SRCS_MIN+=	Transforms/Utils/Evaluator.cpp
 SRCS_MIN+=	Transforms/Utils/FlattenCFG.cpp
+SRCS_MIN+=	Transforms/Utils/FunctionComparator.cpp
 SRCS_MIN+=	Transforms/Utils/FunctionImportUtils.cpp
 SRCS_MIN+=	Transforms/Utils/GlobalStatus.cpp
+SRCS_MIN+=	Transforms/Utils/ImportedFunctionsInliningStatistics.cpp
 SRCS_MIN+=	Transforms/Utils/InlineFunction.cpp
 SRCS_MIN+=	Transforms/Utils/InstructionNamer.cpp
 SRCS_MIN+=	Transforms/Utils/IntegerDivision.cpp
 SRCS_MIN+=	Transforms/Utils/LCSSA.cpp
+SRCS_MIN+=	Transforms/Utils/LibCallsShrinkWrap.cpp
 SRCS_MIN+=	Transforms/Utils/Local.cpp
 SRCS_MIN+=	Transforms/Utils/LoopSimplify.cpp
 SRCS_MIN+=	Transforms/Utils/LoopUnroll.cpp
+SRCS_MIN+=	Transforms/Utils/LoopUnrollPeel.cpp
 SRCS_MIN+=	Transforms/Utils/LoopUnrollRuntime.cpp
 SRCS_MIN+=	Transforms/Utils/LoopUtils.cpp
 SRCS_MIN+=	Transforms/Utils/LoopVersioning.cpp
@@ -1070,7 +1124,7 @@ 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/NameAnonFunctions.cpp
+SRCS_MIN+=	Transforms/Utils/NameAnonGlobals.cpp
 SRCS_MIN+=	Transforms/Utils/PromoteMemoryToRegister.cpp
 SRCS_MIN+=	Transforms/Utils/SSAUpdater.cpp
 SRCS_MIN+=	Transforms/Utils/SanitizerStats.cpp
@@ -1079,6 +1133,8 @@ SRCS_MIN+=	Transforms/Utils/SimplifyIndVar.cpp
 SRCS_MIN+=	Transforms/Utils/SimplifyInstructions.cpp
 SRCS_MIN+=	Transforms/Utils/SimplifyLibCalls.cpp
 SRCS_MIN+=	Transforms/Utils/SplitModule.cpp
+SRCS_MIN+=	Transforms/Utils/StripGCRelocates.cpp
+SRCS_MIN+=	Transforms/Utils/StripNonLineTableDebugInfo.cpp
 SRCS_MIN+=	Transforms/Utils/SymbolRewriter.cpp
 SRCS_MIN+=	Transforms/Utils/UnifyFunctionExitNodes.cpp
 SRCS_EXT+=	Transforms/Utils/Utils.cpp
@@ -1090,7 +1146,7 @@ SRCS_MIN+=	Transforms/Vectorize/SLPVectorizer.cpp
 SRCS_EXT+=	Transforms/Vectorize/Vectorize.cpp
 
 SRCS_ALL+=	${SRCS_MIN}
-.if !defined(TOOLS_PREFIX)
+.if !defined(TOOLS_PREFIX) || ${MK_LLD_IS_LD} != "no"
 SRCS_ALL+=	${SRCS_MIW}
 .endif
 .if ${MK_CLANG_EXTRAS} != "no"
@@ -1102,6 +1158,9 @@ SRCS_ALL+=	${SRCS_FUL}
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLD} != "no"
 SRCS_ALL+=	${SRCS_EXL}
 .endif
+.if ${MK_LLD} != "no"
+SRCS_ALL+=	${SRCS_LLD}
+.endif
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SRCS_ALL+=	${SRCS_XDB}
 .endif
@@ -1113,11 +1172,11 @@ SRCS_ALL+=	${SRCS_XDW}
 .endif
 SRCS+=		${SRCS_ALL:O}
 
-llvm/IR/Attributes.inc: ${LLVM_SRCS}/include/llvm/IR/Attributes.td
+llvm/IR/Attributes.gen: ${LLVM_SRCS}/include/llvm/IR/Attributes.td
 	${LLVM_TBLGEN} -gen-attrs \
 	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/include/llvm/IR/Attributes.td
-TGHDRS+=	llvm/IR/Attributes.inc
+TGHDRS+=	llvm/IR/Attributes.gen
 
 llvm/IR/Intrinsics.gen: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
 	${LLVM_TBLGEN} -gen-intrinsic \
diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile
index 445e91e45cc4..fc16034eda84 100644
--- a/lib/clang/libllvmminimal/Makefile
+++ b/lib/clang/libllvmminimal/Makefile
@@ -7,14 +7,13 @@ INTERNALLIB=
 
 SRCDIR=		lib
 SRCS+=		Support/APInt.cpp
-.if ${MACHINE_ARCH:Mpowerpc*} != ""
 SRCS+=		Support/Atomic.cpp
-.endif
 SRCS+=		Support/CommandLine.cpp
-SRCS+=		Support/ConvertUTF.c
+SRCS+=		Support/ConvertUTF.cpp
 SRCS+=		Support/ConvertUTFWrapper.cpp
 SRCS+=		Support/Debug.cpp
 SRCS+=		Support/Errno.cpp
+SRCS+=		Support/Error.cpp
 SRCS+=		Support/ErrorHandling.cpp
 SRCS+=		Support/FoldingSet.cpp
 SRCS+=		Support/FormattedStream.cpp
@@ -25,6 +24,7 @@ SRCS+=		Support/Locale.cpp
 SRCS+=		Support/ManagedStatic.cpp
 SRCS+=		Support/MemoryBuffer.cpp
 SRCS+=		Support/Mutex.cpp
+SRCS+=		Support/NativeFormatting.cpp
 SRCS+=		Support/Path.cpp
 SRCS+=		Support/PrettyStackTrace.cpp
 SRCS+=		Support/Process.cpp
@@ -34,13 +34,14 @@ SRCS+=		Support/Signals.cpp
 SRCS+=		Support/SmallPtrSet.cpp
 SRCS+=		Support/SmallVector.cpp
 SRCS+=		Support/SourceMgr.cpp
+SRCS+=		Support/Statistic.cpp
 SRCS+=		Support/StringExtras.cpp
 SRCS+=		Support/StringMap.cpp
 SRCS+=		Support/StringRef.cpp
 SRCS+=		Support/StringSaver.cpp
 SRCS+=		Support/TargetParser.cpp
 SRCS+=		Support/Threading.cpp
-SRCS+=		Support/TimeValue.cpp
+SRCS+=		Support/Timer.cpp
 SRCS+=		Support/ToolOutputFile.cpp
 SRCS+=		Support/Triple.cpp
 SRCS+=		Support/Twine.cpp
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index 62a21d84468f..d73640810fef 100644
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -46,5 +46,6 @@ CXXFLAGS+=	-fno-rtti
 CXXFLAGS.clang+= -stdlib=libc++
 
 .if ${MACHINE_CPUARCH} == "arm"
+STATIC_CFLAGS+= -mlong-calls
 STATIC_CXXFLAGS+= -mlong-calls
 .endif
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index 18e9462fbe2e..4cb8037dc05a 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -17,43 +17,44 @@ LIB=		c++
 SHLIB_MAJOR=	1
 SHLIB_LDSCRIPT=	libc++.ldscript
 
-SRCS+=		algorithm.cpp\
-		any.cpp\
-		bind.cpp\
-		chrono.cpp\
-		condition_variable.cpp\
-		debug.cpp\
-		exception.cpp\
-		future.cpp\
-		hash.cpp\
-		ios.cpp\
-		iostream.cpp\
-		locale.cpp\
-		memory.cpp\
-		mutex.cpp\
-		new.cpp\
-		optional.cpp\
-		random.cpp\
-		regex.cpp\
-		shared_mutex.cpp\
-		stdexcept.cpp\
-		string.cpp\
-		strstream.cpp\
-		system_error.cpp\
-		thread.cpp\
-		typeinfo.cpp\
-		utility.cpp\
-		valarray.cpp
+SRCS+=		algorithm.cpp
+SRCS+=		any.cpp
+SRCS+=		bind.cpp
+SRCS+=		chrono.cpp
+SRCS+=		condition_variable.cpp
+SRCS+=		debug.cpp
+SRCS+=		exception.cpp
+SRCS+=		future.cpp
+SRCS+=		hash.cpp
+SRCS+=		ios.cpp
+SRCS+=		iostream.cpp
+SRCS+=		locale.cpp
+SRCS+=		memory.cpp
+SRCS+=		mutex.cpp
+SRCS+=		new.cpp
+SRCS+=		optional.cpp
+SRCS+=		random.cpp
+SRCS+=		regex.cpp
+SRCS+=		shared_mutex.cpp
+SRCS+=		stdexcept.cpp
+SRCS+=		string.cpp
+SRCS+=		strstream.cpp
+SRCS+=		system_error.cpp
+SRCS+=		thread.cpp
+SRCS+=		typeinfo.cpp
+SRCS+=		utility.cpp
+SRCS+=		valarray.cpp
+SRCS+=		variant.cpp
 
-CXXRT_SRCS+=	libelftc_dem_gnu3.c\
-		terminate.cc\
-		dynamic_cast.cc\
-		memory.cc\
-		auxhelper.cc\
-		exception.cc\
-		stdexcept.cc\
-		typeinfo.cc\
-		guard.cc
+CXXRT_SRCS+=	auxhelper.cc
+CXXRT_SRCS+=	dynamic_cast.cc
+CXXRT_SRCS+=	exception.cc
+CXXRT_SRCS+=	guard.cc
+CXXRT_SRCS+=	libelftc_dem_gnu3.c
+CXXRT_SRCS+=	memory.cc
+CXXRT_SRCS+=	stdexcept.cc
+CXXRT_SRCS+=	terminate.cc
+CXXRT_SRCS+=	typeinfo.cc
 
 .for _S in ${CXXRT_SRCS}
 CLEANFILES+=	cxxrt_${_S}
@@ -63,7 +64,7 @@ cxxrt_${_S}: ${_LIBCXXRTDIR}/${_S} .NOMETA
 .endfor
 
 WARNS=		0
-CFLAGS+=	-isystem ${HDRDIR} -isystem ${_LIBCXXRTDIR} -nostdinc++ -nostdlib -DLIBCXXRT
+CFLAGS+=	-isystem ${HDRDIR} -isystem ${_LIBCXXRTDIR} -nostdinc++ -nostdlib -D_LIBCPP_BUILDING_LIBRARY -DLIBCXXRT
 .if empty(CXXFLAGS:M-std=*)
 CXXFLAGS+=	-std=c++11
 .endif
@@ -71,124 +72,133 @@ CXXFLAGS+=	-std=c++11
 LIBADD+=	cxxrt
 INCSGROUPS=	STD EXP EXT
 
-STD_HEADERS=	__bit_reference\
-		__bsd_locale_defaults.h\
-		__bsd_locale_fallbacks.h\
-		__config\
-		__debug\
-		__functional_03\
-		__functional_base\
-		__functional_base_03\
-		__hash_table\
-		__locale\
-		__mutex_base\
-		__nullptr\
-		__refstring\
-		__split_buffer\
-		__sso_allocator\
-		__std_stream\
-		__threading_support\
-		__tree\
-		__tuple\
-		__undef___deallocate\
-		__undef_min_max\
-		algorithm\
-		array\
-		atomic\
-		bitset\
-		cassert\
-		ccomplex\
-		cctype\
-		cerrno\
-		cfenv\
-		cfloat\
-		chrono\
-		cinttypes\
-		ciso646\
-		climits\
-		clocale\
-		cmath\
-		codecvt\
-		complex\
-		complex.h\
-		condition_variable\
-		csetjmp\
-		csignal\
-		cstdarg\
-		cstdbool\
-		cstddef\
-		cstdint\
-		cstdio\
-		cstdlib\
-		cstring\
-		ctgmath\
-		ctime\
-		ctype.h\
-		cwchar\
-		cwctype\
-		deque\
-		errno.h\
-		exception\
-		float.h\
-		forward_list\
-		fstream\
-		functional\
-		future\
-		initializer_list\
-		inttypes.h\
-		iomanip\
-		ios\
-		iosfwd\
-		iostream\
-		istream\
-		iterator\
-		limits\
-		list\
-		locale\
-		map\
-		math.h\
-		memory\
-		mutex\
-		new\
-		numeric\
-		ostream\
-		queue\
-		random\
-		ratio\
-		regex\
-		scoped_allocator\
-		set\
-		setjmp.h\
-		shared_mutex\
-		sstream\
-		stack\
-		stdbool.h\
-		stddef.h\
-		stdexcept\
-		stdio.h\
-		stdlib.h\
-		streambuf\
-		string\
-		string.h\
-		strstream\
-		system_error\
-		tgmath.h\
-		thread\
-		tuple\
-		type_traits\
-		typeindex\
-		typeinfo\
-		unordered_map\
-		unordered_set\
-		utility\
-		valarray\
-		vector\
-		wchar.h\
-		wctype.h
-RT_HEADERS=	cxxabi.h\
-		unwind.h\
-		unwind-arm.h\
-		unwind-itanium.h
+STD_HEADERS+=	__bit_reference
+STD_HEADERS+=	__bsd_locale_defaults.h
+STD_HEADERS+=	__bsd_locale_fallbacks.h
+STD_HEADERS+=	__config
+STD_HEADERS+=	__debug
+STD_HEADERS+=	__functional_03
+STD_HEADERS+=	__functional_base
+STD_HEADERS+=	__functional_base_03
+STD_HEADERS+=	__hash_table
+STD_HEADERS+=	__libcpp_version
+STD_HEADERS+=	__locale
+STD_HEADERS+=	__mutex_base
+STD_HEADERS+=	__nullptr
+STD_HEADERS+=	__refstring
+STD_HEADERS+=	__split_buffer
+STD_HEADERS+=	__sso_allocator
+STD_HEADERS+=	__std_stream
+STD_HEADERS+=	__string
+STD_HEADERS+=	__threading_support
+STD_HEADERS+=	__tree
+STD_HEADERS+=	__tuple
+STD_HEADERS+=	__undef_min_max
+STD_HEADERS+=	algorithm
+STD_HEADERS+=	any
+STD_HEADERS+=	array
+STD_HEADERS+=	atomic
+STD_HEADERS+=	bitset
+STD_HEADERS+=	cassert
+STD_HEADERS+=	ccomplex
+STD_HEADERS+=	cctype
+STD_HEADERS+=	cerrno
+STD_HEADERS+=	cfenv
+STD_HEADERS+=	cfloat
+STD_HEADERS+=	chrono
+STD_HEADERS+=	cinttypes
+STD_HEADERS+=	ciso646
+STD_HEADERS+=	climits
+STD_HEADERS+=	clocale
+STD_HEADERS+=	cmath
+STD_HEADERS+=	codecvt
+STD_HEADERS+=	complex
+STD_HEADERS+=	complex.h
+STD_HEADERS+=	condition_variable
+STD_HEADERS+=	csetjmp
+STD_HEADERS+=	csignal
+STD_HEADERS+=	cstdarg
+STD_HEADERS+=	cstdbool
+STD_HEADERS+=	cstddef
+STD_HEADERS+=	cstdint
+STD_HEADERS+=	cstdio
+STD_HEADERS+=	cstdlib
+STD_HEADERS+=	cstring
+STD_HEADERS+=	ctgmath
+STD_HEADERS+=	ctime
+STD_HEADERS+=	ctype.h
+STD_HEADERS+=	cwchar
+STD_HEADERS+=	cwctype
+STD_HEADERS+=	deque
+STD_HEADERS+=	errno.h
+STD_HEADERS+=	exception
+STD_HEADERS+=	float.h
+STD_HEADERS+=	forward_list
+STD_HEADERS+=	fstream
+STD_HEADERS+=	functional
+STD_HEADERS+=	future
+STD_HEADERS+=	initializer_list
+STD_HEADERS+=	inttypes.h
+STD_HEADERS+=	iomanip
+STD_HEADERS+=	ios
+STD_HEADERS+=	iosfwd
+STD_HEADERS+=	iostream
+STD_HEADERS+=	istream
+STD_HEADERS+=	iterator
+STD_HEADERS+=	limits
+STD_HEADERS+=	limits.h
+STD_HEADERS+=	list
+STD_HEADERS+=	locale
+STD_HEADERS+=	locale.h
+STD_HEADERS+=	map
+STD_HEADERS+=	math.h
+STD_HEADERS+=	memory
+STD_HEADERS+=	mutex
+STD_HEADERS+=	new
+STD_HEADERS+=	numeric
+STD_HEADERS+=	optional
+STD_HEADERS+=	ostream
+STD_HEADERS+=	queue
+STD_HEADERS+=	random
+STD_HEADERS+=	ratio
+STD_HEADERS+=	regex
+STD_HEADERS+=	scoped_allocator
+STD_HEADERS+=	set
+STD_HEADERS+=	setjmp.h
+STD_HEADERS+=	shared_mutex
+STD_HEADERS+=	sstream
+STD_HEADERS+=	stack
+STD_HEADERS+=	stdbool.h
+STD_HEADERS+=	stddef.h
+STD_HEADERS+=	stdexcept
+STD_HEADERS+=	stdint.h
+STD_HEADERS+=	stdio.h
+STD_HEADERS+=	stdlib.h
+STD_HEADERS+=	streambuf
+STD_HEADERS+=	string
+STD_HEADERS+=	string.h
+STD_HEADERS+=	string_view
+STD_HEADERS+=	strstream
+STD_HEADERS+=	system_error
+STD_HEADERS+=	tgmath.h
+STD_HEADERS+=	thread
+STD_HEADERS+=	tuple
+STD_HEADERS+=	type_traits
+STD_HEADERS+=	typeindex
+STD_HEADERS+=	typeinfo
+STD_HEADERS+=	unordered_map
+STD_HEADERS+=	unordered_set
+STD_HEADERS+=	utility
+STD_HEADERS+=	valarray
+STD_HEADERS+=	variant
+STD_HEADERS+=	vector
+STD_HEADERS+=	wchar.h
+STD_HEADERS+=	wctype.h
+
+RT_HEADERS+=	cxxabi.h
+RT_HEADERS+=	unwind-arm.h
+RT_HEADERS+=	unwind-itanium.h
+RT_HEADERS+=	unwind.h
 
 .for hdr in ${STD_HEADERS}
 STD+=		${HDRDIR}/${hdr}
@@ -199,43 +209,44 @@ STD+=		${_LIBCXXRTDIR}/${hdr}
 .endfor
 STDDIR=		${CXXINCLUDEDIR}
 
-EXP_HEADERS=	__config\
-		__memory\
-		algorithm\
-		any\
-		chrono\
-		deque\
-		dynarray\
-		filesystem\
-		forward_list\
-		functional\
-		iterator\
-		list\
-		map\
-		memory_resource\
-		optional\
-		propagate_const\
-		ratio\
-		regex\
-		set\
-		string\
-		string_view\
-		system_error\
-		tuple\
-		type_traits\
-		unordered_map\
-		unordered_set\
-		utility\
-		vector
+EXP_HEADERS+=	__config
+EXP_HEADERS+=	__memory
+EXP_HEADERS+=	algorithm
+EXP_HEADERS+=	any
+EXP_HEADERS+=	chrono
+EXP_HEADERS+=	deque
+EXP_HEADERS+=	dynarray
+EXP_HEADERS+=	filesystem
+EXP_HEADERS+=	forward_list
+EXP_HEADERS+=	functional
+EXP_HEADERS+=	iterator
+EXP_HEADERS+=	list
+EXP_HEADERS+=	map
+EXP_HEADERS+=	memory_resource
+EXP_HEADERS+=	numeric
+EXP_HEADERS+=	optional
+EXP_HEADERS+=	propagate_const
+EXP_HEADERS+=	ratio
+EXP_HEADERS+=	regex
+EXP_HEADERS+=	set
+EXP_HEADERS+=	string
+EXP_HEADERS+=	string_view
+EXP_HEADERS+=	system_error
+EXP_HEADERS+=	tuple
+EXP_HEADERS+=	type_traits
+EXP_HEADERS+=	unordered_map
+EXP_HEADERS+=	unordered_set
+EXP_HEADERS+=	utility
+EXP_HEADERS+=	vector
 
 .for hdr in ${EXP_HEADERS}
 EXP+=		${HDRDIR}/experimental/${hdr}
 .endfor
 EXPDIR=		${CXXINCLUDEDIR}/experimental
 
-EXT_HEADERS=	__hash\
-		hash_map\
-		hash_set
+EXT_HEADERS+=	__hash
+EXT_HEADERS+=	hash_map
+EXT_HEADERS+=	hash_set
 
 .for hdr in ${EXT_HEADERS}
 EXT+=		${HDRDIR}/ext/${hdr}
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
index 61dbf34adbae..c900a24e3899 100644
--- a/lib/libc/gdtoa/Makefile.inc
+++ b/lib/libc/gdtoa/Makefile.inc
@@ -17,4 +17,5 @@ MISRCS+=gdtoa_${src}
 CLEANFILES+=gdtoa_${src}
 gdtoa_${src}: ${SRCTOP}/contrib/gdtoa/${src} .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
+CFLAGS.gdtoa_${src}+=-fno-strict-aliasing
 .endfor
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index 47cd21b5cf79..08ab48f46771 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/3.9.1
+CLANGDIR=	/usr/lib/clang/4.0.0
 LIBDIR=		${CLANGDIR}/lib/freebsd
 
 NO_PIC=
diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 41578e4336a1..e8a98f584577 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -7,6 +7,8 @@ LIB=		clang_rt.asan-${CRTARCH}
 SRCS+=		asan/asan_activation.cc
 SRCS+=		asan/asan_allocator.cc
 SRCS+=		asan/asan_debugging.cc
+SRCS+=		asan/asan_descriptions.cc
+SRCS+=		asan/asan_errors.cc
 SRCS+=		asan/asan_fake_stack.cc
 SRCS+=		asan/asan_flags.cc
 SRCS+=		asan/asan_globals.cc
@@ -14,8 +16,6 @@ SRCS+=		asan/asan_interceptors.cc
 SRCS+=		asan/asan_linux.cc
 SRCS+=		asan/asan_mac.cc
 SRCS+=		asan/asan_malloc_linux.cc
-SRCS+=		asan/asan_malloc_mac.cc
-SRCS+=		asan/asan_malloc_win.cc
 SRCS+=		asan/asan_memory_profile.cc
 SRCS+=		asan/asan_poisoning.cc
 SRCS+=		asan/asan_posix.cc
@@ -33,10 +33,12 @@ SRCS+=		interception/interception_type_test.cc
 SRCS+=		interception/interception_win.cc
 SRCS+=		lsan/lsan_common.cc
 SRCS+=		lsan/lsan_common_linux.cc
+SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index bc478815eb39..118fa1b2e968 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -8,6 +8,8 @@ SHLIB_NAME=	libclang_rt.asan-${CRTARCH}.so
 SRCS+=		asan/asan_activation.cc
 SRCS+=		asan/asan_allocator.cc
 SRCS+=		asan/asan_debugging.cc
+SRCS+=		asan/asan_descriptions.cc
+SRCS+=		asan/asan_errors.cc
 SRCS+=		asan/asan_fake_stack.cc
 SRCS+=		asan/asan_flags.cc
 SRCS+=		asan/asan_globals.cc
@@ -15,8 +17,6 @@ SRCS+=		asan/asan_interceptors.cc
 SRCS+=		asan/asan_linux.cc
 SRCS+=		asan/asan_mac.cc
 SRCS+=		asan/asan_malloc_linux.cc
-SRCS+=		asan/asan_malloc_mac.cc
-SRCS+=		asan/asan_malloc_win.cc
 SRCS+=		asan/asan_memory_profile.cc
 SRCS+=		asan/asan_new_delete.cc
 SRCS+=		asan/asan_poisoning.cc
@@ -34,10 +34,12 @@ SRCS+=		interception/interception_type_test.cc
 SRCS+=		interception/interception_win.cc
 SRCS+=		lsan/lsan_common.cc
 SRCS+=		lsan/lsan_common_linux.cc
+SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index 050b05c70338..661212075ab4 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -19,7 +19,6 @@ SRCS+=		sanitizer_common/sanitizer_flags.cc
 SRCS+=		sanitizer_common/sanitizer_libc.cc
 SRCS+=		sanitizer_common/sanitizer_libignore.cc
 SRCS+=		sanitizer_common/sanitizer_linux.cc
-SRCS+=		sanitizer_common/sanitizer_linux_s390.cc
 SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
 SRCS+=		sanitizer_common/sanitizer_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
index 7516ec4cb20e..84872811ea15 100644
--- a/lib/libclang_rt/stats/Makefile
+++ b/lib/libclang_rt/stats/Makefile
@@ -4,10 +4,12 @@
 
 LIB=		clang_rt.stats-${CRTARCH}
 
+SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
@@ -17,7 +19,6 @@ SRCS+=		sanitizer_common/sanitizer_libc.cc
 SRCS+=		sanitizer_common/sanitizer_libignore.cc
 SRCS+=		sanitizer_common/sanitizer_linux.cc
 SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_linux_s390.cc
 SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
 SRCS+=		sanitizer_common/sanitizer_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index c7c65fda5852..ed008e54ae2e 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -4,10 +4,12 @@
 
 LIB=		clang_rt.ubsan_standalone-${CRTARCH}
 
+SRCS+=		sanitizer_common/sancov_flags.cc
 SRCS+=		sanitizer_common/sanitizer_allocator.cc
 SRCS+=		sanitizer_common/sanitizer_common.cc
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep_new.cc
 SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
@@ -17,7 +19,6 @@ SRCS+=		sanitizer_common/sanitizer_libc.cc
 SRCS+=		sanitizer_common/sanitizer_libignore.cc
 SRCS+=		sanitizer_common/sanitizer_linux.cc
 SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cc
-SRCS+=		sanitizer_common/sanitizer_linux_s390.cc
 SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
 SRCS+=		sanitizer_common/sanitizer_mac.cc
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc