MFH

Sponsored by: The FreeBSD Foundation
author: gjb <gjb@FreeBSD.org> 2016-03-06 04:13:17 +0000
committer: gjb <gjb@FreeBSD.org> 2016-03-06 04:13:17 +0000
commit: f4bd2481be4a57485def5a36b1489879e5d7a470 (patch)
tree: 7e556653474c7cbaf439c575734d098129e88b2b /lib
parent: 7f622b840367101a59fea39a608e273d9e888eae (diff)
parent: ffbdd975f04fc5e43744acfd92c1e69c6e4dbb14 (diff)
download: FreeBSD-src-f4bd2481be4a57485def5a36b1489879e5d7a470.zip
FreeBSD-src-f4bd2481be4a57485def5a36b1489879e5d7a470.tar.gz
119 files changed, 883 insertions, 445 deletions
diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index 905346a..71e5202 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -38,7 +38,6 @@ SUBDIR=	libclanganalysis \
 	libllvmcore \
 	libllvminstcombine \
 	libllvminstrumentation \
-	libllvmipa \
 	libllvmipo \
 	libllvmirreader \
 	libllvmlinker \
@@ -58,38 +57,36 @@ SUBDIR=	libclanganalysis \
 	libllvmvectorize \
 	\
 	libllvmaarch64asmparser \
+	libllvmaarch64asmprinter \
 	libllvmaarch64codegen \
 	libllvmaarch64desc \
 	libllvmaarch64info \
-	libllvmaarch64instprinter \
 	libllvmaarch64utils \
 	libllvmarmasmparser \
+	libllvmarmasmprinter \
 	libllvmarmcodegen \
 	libllvmarmdesc \
-	libllvmarmdisassembler \
 	libllvmarminfo \
-	libllvmarminstprinter \
 	libllvmmipsasmparser \
+	libllvmmipsasmprinter \
 	libllvmmipscodegen \
 	libllvmmipsdesc \
 	libllvmmipsinfo \
-	libllvmmipsinstprinter \
 	libllvmpowerpcasmparser \
+	libllvmpowerpcasmprinter \
 	libllvmpowerpccodegen \
 	libllvmpowerpcdesc \
-	libllvmpowerpcdisassembler \
 	libllvmpowerpcinfo \
-	libllvmpowerpcinstprinter \
 	libllvmsparcasmparser \
+	libllvmsparcasmprinter \
 	libllvmsparccodegen \
 	libllvmsparcdesc \
 	libllvmsparcinfo \
-	libllvmsparcinstprinter \
 	libllvmx86asmparser \
+	libllvmx86asmprinter \
 	libllvmx86codegen \
 	libllvmx86desc \
 	libllvmx86info \
-	libllvmx86instprinter \
 	libllvmx86utils
 
 .if ${MK_CLANG_EXTRAS} != "no"
@@ -99,14 +96,18 @@ SUBDIR+=libllvmdebuginfodwarf \
 	libllvmlto \
 	libllvmmirparser \
 	libllvmorcjit \
-	libllvmpasses
+	libllvmpasses \
+	libllvmsymbolize
 .endif # MK_CLANG_EXTRAS
+	
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SUBDIR+=libllvmaarch64disassembler \
-	libllvmexecutionengine \
+SUBDIR+=libllvmexecutionengine \
+	libllvmaarch64disassembler \
+	libllvmarmdisassembler \
 	libllvminterpreter \
 	libllvmmcjit \
 	libllvmmipsdisassembler \
+	libllvmpowerpcdisassembler \
 	libllvmruntimedyld \
 	libllvmsparcdisassembler \
 	libllvmx86disassembler
@@ -142,12 +143,16 @@ SUBDIR+=liblldb \
 	liblldbPluginDisassemblerLLVM \
 	liblldbPluginDynamicLoaderStatic \
 	liblldbPluginDynamicLoaderPosixDYLD \
+	liblldbPluginExpressionParserClang \
+	liblldbPluginExpressionParserGo \
 	liblldbPluginInstructionARM \
 	liblldbPluginInstructionARM64 \
 	liblldbPluginInstructionMIPS \
 	liblldbPluginInstructionMIPS64 \
 	liblldbPluginInstrumentationRuntimeAddressSanitizer \
 	liblldbPluginJITLoaderGDB \
+	liblldbPluginLanguageCPlusPlus \
+	liblldbPluginLanguageObjC \
 	liblldbPluginMemoryHistoryASan \
 	liblldbPluginObjectContainerBSDArchive \
 	liblldbPluginObjectFileELF \
@@ -159,6 +164,7 @@ SUBDIR+=liblldb \
 	liblldbPluginProcessGDBRemote \
 	liblldbPluginProcessPOSIX \
 	liblldbPluginProcessUtility \
+	liblldbPluginScriptInterpreterNone \
 	liblldbPluginSymbolFileDWARF \
 	liblldbPluginSymbolFileSymtab \
 	liblldbPluginSymbolVendorELF \
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 62cdb81..8ab2399 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -39,13 +39,24 @@ CXXFLAGS.clang+= -stdlib=libc++
 
 .PATH:	${LLVM_SRCS}/${SRCDIR}
 
-TBLGEN?=	tblgen
+LLVM_TBLGEN?=	llvm-tblgen
 CLANG_TBLGEN?=	clang-tblgen
 
+Attributes.inc.h: ${LLVM_SRCS}/include/llvm/IR/Attributes.td
+	${LLVM_TBLGEN} -gen-attrs \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/include/llvm/IR/Attributes.td
+
+AttributesCompatFunc.inc.h: ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
+	${LLVM_TBLGEN} -gen-attrs \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
+
 Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
-	${TBLGEN} -gen-intrinsic \
+	${LLVM_TBLGEN} -gen-intrinsic \
 	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+
 .for arch in \
 	AArch64/AArch64 ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
 . for hdr in \
@@ -63,7 +74,7 @@ Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
 	RegisterInfo/-gen-register-info \
 	SubtargetInfo/-gen-subtarget
 ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
-	${TBLGEN} ${hdr:T:C/,/ /g} \
+	${LLVM_TBLGEN} ${hdr:T:C/,/ /g} \
 	    -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
@@ -212,13 +223,13 @@ Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 # XXX: Atrocious hack, need to clean this up later
 .if defined(LIB) && ${LIB} == "llvmlibdriver"
 Options.inc.h: ${LLVM_SRCS}/lib/LibDriver/Options.td
-	${TBLGEN} -gen-opt-parser-defs \
+	${LLVM_TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${LLVM_SRCS}/lib/LibDriver/Options.td
 .else
 Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
-	${TBLGEN} -gen-opt-parser-defs \
+	${LLVM_TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Driver/Options.td
diff --git a/lib/clang/clang.lib.mk b/lib/clang/clang.lib.mk
index dd026e7..ab3551e 100644
--- a/lib/clang/clang.lib.mk
+++ b/lib/clang/clang.lib.mk
@@ -7,8 +7,7 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
 INTERNALLIB=
 
 .if ${MACHINE_CPUARCH} == "arm"
-# This will need to be enabled to link clang 3.8
-#STATIC_CXXFLAGS+= -mlong-calls
+STATIC_CXXFLAGS+= -mlong-calls
 .endif
 
 .include <bsd.lib.mk>
diff --git a/lib/clang/include/AttributesCompatFunc.inc b/lib/clang/include/AttributesCompatFunc.inc
new file mode 100644
index 0000000..7f4e777
--- /dev/null
+++ b/lib/clang/include/AttributesCompatFunc.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "AttributesCompatFunc.inc.h"
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
index 2b20cbb..1a74e726 100644
--- a/lib/clang/include/Makefile
+++ b/lib/clang/include/Makefile
@@ -8,9 +8,10 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
 
 .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers
 
-INCSDIR=${LIBDIR}/clang/3.7.1/include
+INCSDIR=${LIBDIR}/clang/3.8.0/include
 
-INCS=	__stddef_max_align_t.h \
+INCS=	__clang_cuda_runtime_wrapper.h \
+	__stddef_max_align_t.h \
 	__wmmintrin_aes.h \
 	__wmmintrin_pclmul.h \
 	adxintrin.h \
@@ -46,6 +47,7 @@ INCS=	__stddef_max_align_t.h \
 	mmintrin.h \
 	module.modulemap \
 	nmmintrin.h \
+	pkuintrin.h \
 	pmmintrin.h \
 	popcntintrin.h \
 	prfchwintrin.h \
@@ -62,6 +64,10 @@ INCS=	__stddef_max_align_t.h \
 	x86intrin.h \
 	xmmintrin.h \
 	xopintrin.h \
+	xsavecintrin.h \
+	xsaveintrin.h \
+	xsaveoptintrin.h \
+	xsavesintrin.h \
 	xtestintrin.h \
 	${GENINCS}
 GENINCS= arm_neon.h
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index 5c5b264..94dc282 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,11 +1,10 @@
 /* $FreeBSD$ */
 
-#define	CLANG_VERSION			3.7.1
+#define	CLANG_VERSION			3.8.0
 #define	CLANG_VERSION_MAJOR		3
-#define	CLANG_VERSION_MINOR		7
-#define	CLANG_VERSION_PATCHLEVEL	1
+#define	CLANG_VERSION_MINOR		8
+#define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX		" 20151225"
 
-#define	SVN_REVISION			"255217"
+#define	SVN_REVISION			"262564"
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index 892bf1b..76180df 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -1,11 +1,10 @@
 /* $FreeBSD$ */
-/* tools/clang/include/clang/Config/config.h.  Generated from config.h.in by configure.  */
 /* This generated file is for internal use. Do not include it from headers. */
 
-#ifdef CONFIG_H
+#ifdef CLANG_CONFIG_H
 #error config.h can only be included once
 #else
-#define CONFIG_H
+#define CLANG_CONFIG_H
 
 /* Bug report URL. */
 #define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
@@ -31,10 +30,8 @@
 /* Define if we have libxml2 */
 /* #undef CLANG_HAVE_LIBXML */
 
-#define PACKAGE_STRING "LLVM 3.7.1"
-
 /* The LLVM product name and version */
-#define BACKEND_PACKAGE_STRING PACKAGE_STRING
+#define BACKEND_PACKAGE_STRING "LLVM 3.8.0"
 
 /* Linker version detected at compile time. */
 /* #undef HOST_LINK_VERSION */
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index 8342fcb..014d9d1 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -1,6 +1,5 @@
 /* $FreeBSD$ */
-/* include/llvm/Config/config.h.  Generated from config.h.in by configure.  */
-/* include/llvm/Config/config.h.in.  Generated from autoconf/configure.ac by autoheader.  */
+/* include/llvm/Config/config.h.cmake corresponding to config.h.in. */
 
 #ifndef CONFIG_H
 #define CONFIG_H
@@ -14,79 +13,67 @@
 /* Bug report URL. */
 #define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
 
-/* Default OpenMP runtime used by -fopenmp. */
-#define CLANG_DEFAULT_OPENMP_RUNTIME "libomp"
-
-/* Define if we have libxml2 */
-/* #undef CLANG_HAVE_LIBXML */
-
-/* Multilib suffix for libdir. */
-#define CLANG_LIBDIR_SUFFIX ""
-
-/* Relative directory for resource files */
-#define CLANG_RESOURCE_DIR ""
-
-/* Directories clang will search for headers */
-#define C_INCLUDE_DIRS ""
-
-/* Default <path> to all compiler invocations for --sysroot=<path>. */
-/* #undef DEFAULT_SYSROOT */
-
 /* Define if you want backtraces on crash */
-#define ENABLE_BACKTRACES 1
+#define ENABLE_BACKTRACES
 
-/* Define to enable crash handling overrides */
-#define ENABLE_CRASH_OVERRIDES 1
+/* Define to enable crash overrides */
+#define ENABLE_CRASH_OVERRIDES
+
+/* Define to disable C++ atexit */
+#define DISABLE_LLVM_DYLIB_ATEXIT
 
 /* Define if position independent code is enabled */
-#define ENABLE_PIC 0
+#define ENABLE_PIC
 
 /* Define if timestamp information (e.g., __DATE__) is allowed */
-#define ENABLE_TIMESTAMPS 0
+/* #undef ENABLE_TIMESTAMPS */
 
-/* Directory where gcc is installed. */
-#define GCC_INSTALL_PREFIX ""
+/* Define to 1 if you have the `arc4random' function. */
+#define HAVE_DECL_ARC4RANDOM 1
 
 /* Define to 1 if you have the `backtrace' function. */
 /* #undef HAVE_BACKTRACE */
 
-/* Define to 1 if you have the <CrashReporterClient.h> header file. */
-/* #undef HAVE_CRASHREPORTERCLIENT_H */
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
 
-/* can use __crashreporter_info__ */
-#define HAVE_CRASHREPORTER_INFO 0
+/* Define to 1 if you have the `closedir' function. */
+#define HAVE_CLOSEDIR 1
 
 /* 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 declaration of `FE_ALL_EXCEPT', and to 0 if you
-   don't. */
-#define HAVE_DECL_FE_ALL_EXCEPT 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_INEXACT', and to 0 if you
-   don't. */
-#define HAVE_DECL_FE_INEXACT 1
+/* can use __crashreporter_info__ */
+#undef HAVE_CRASHREPORTER_INFO
 
 /* 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 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 the dot program is available */
-/* #undef HAVE_DOT */
+/* 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
@@ -111,14 +98,14 @@
 /* Define to 1 if you have the <ffi.h> header file. */
 /* #undef HAVE_FFI_H */
 
-/* Define to 1 if you have the `futimens' function. */
+/* Define to 1 if you have the `futimes' function. */
+#define HAVE_FUTIMES 1
+
+/* 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
 
@@ -143,14 +130,14 @@
 /* Define to 1 if you have the `isatty' function. */
 #define HAVE_ISATTY 1
 
-/* Define if libedit is available on this platform. */
-#define HAVE_LIBEDIT 1
+/* Define if you have the libdl library or equivalent. */
+/* #undef HAVE_LIBDL */
 
 /* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
+#undef HAVE_LIBM
 
 /* Define to 1 if you have the `ole32' library (-lole32). */
-/* #undef HAVE_LIBOLE32 */
+#undef HAVE_LIBOLE32
 
 /* Define to 1 if you have the `psapi' library (-lpsapi). */
 /* #undef HAVE_LIBPSAPI */
@@ -161,25 +148,34 @@
 /* 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 if you can use -rdynamic. */
-#define HAVE_LINK_EXPORT_DYNAMIC 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. */
-#define HAVE_LINK_R 1
+#undef HAVE_LINK_R
 
 /* Define to 1 if you have the `longjmp' function. */
-#define HAVE_LONGJMP 1
+/* #undef HAVE_LONGJMP */
 
 /* 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 if mallinfo() is available on this platform. */
 /* #undef HAVE_MALLINFO */
 
@@ -192,8 +188,8 @@
 /* Define to 1 if you have the `malloc_zone_statistics' function. */
 /* #undef HAVE_MALLOC_ZONE_STATISTICS */
 
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
+/* 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
@@ -205,26 +201,32 @@
 #define HAVE_MKTEMP 1
 
 /* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
+#undef HAVE_MMAP
 
 /* Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if
    it uses MAP_ANON */
-/* #undef HAVE_MMAP_ANONYMOUS */
+#undef HAVE_MMAP_ANONYMOUS
 
 /* Define if mmap() can map files into memory */
-#define HAVE_MMAP_FILE 
+#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_spawn' function. */
-/* #undef HAVE_POSIX_SPAWN */
+#define HAVE_POSIX_SPAWN 1
 
 /* 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 */
-#define HAVE_PRINTF_A 1
+#undef HAVE_PRINTF_A
 
 /* Have pthread_getspecific */
 #define HAVE_PTHREAD_GETSPECIFIC 1
@@ -241,6 +243,9 @@
 /* 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
 
@@ -251,28 +256,34 @@
 #define HAVE_SETENV 1
 
 /* Define to 1 if you have the `setjmp' function. */
-#define HAVE_SETJMP 1
-
-/* Define to 1 if you have the <setjmp.h> header file. */
-#define HAVE_SETJMP_H 1
+/* #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 `siglongjmp' function. */
-#define HAVE_SIGLONGJMP 1
+/* #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. */
-#define HAVE_SIGSETJMP 1
+/* #undef HAVE_SIGSETJMP */
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
+/* Set to 1 if the std::isinf function is found in <cmath> */
+#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
@@ -280,12 +291,6 @@
 /* Define to 1 if you have the `strerror_r' function. */
 #define HAVE_STRERROR_R 1
 
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
 /* Define to 1 if you have the `strtoll' function. */
 #define HAVE_STRTOLL 1
 
@@ -293,17 +298,17 @@
 #define HAVE_STRTOQ 1
 
 /* Define to 1 if you have the `sysconf' function. */
-#define HAVE_SYSCONF 1
+#undef HAVE_SYSCONF
 
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
-/* #undef HAVE_SYS_DIR_H */
+#define HAVE_SYS_DIR_H 1
 
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #define HAVE_SYS_IOCTL_H 1
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
+#define HAVE_SYS_MMAN_H 
 
 /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
    */
@@ -322,14 +327,11 @@
 #define HAVE_SYS_TIME_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
+/* #undef HAVE_SYS_TYPES_H */
 
 /* Define to 1 if you have the <sys/uio.h> header file. */
 #define HAVE_SYS_UIO_H 1
 
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#define HAVE_SYS_WAIT_H 1
-
 /* Define if the setupterm() function is supported this platform. */
 #define HAVE_TERMINFO 1
 
@@ -346,7 +348,7 @@
 #define HAVE_UTIME_H 1
 
 /* Define to 1 if the system has the type `u_int64_t'. */
-/* #undef HAVE_U_INT64_T */
+#define HAVE_U_INT64_T 1
 
 /* Define to 1 if you have the <valgrind/valgrind.h> header file. */
 /* #undef HAVE_VALGRIND_VALGRIND_H */
@@ -382,7 +384,7 @@
 /* #undef HAVE___DIVDI3 */
 
 /* Define to 1 if you have the `__dso_handle' function. */
-#define HAVE___DSO_HANDLE 1
+#undef HAVE___DSO_HANDLE
 
 /* Have host's __fixdfdi */
 /* #undef HAVE___FIXDFDI */
@@ -415,7 +417,7 @@
 /* #undef HAVE____CHKSTK_MS */
 
 /* Linker version detected at compile time. */
-/* #undef HOST_LINK_VERSION */
+#undef HOST_LINK_VERSION
 
 /* Installation directory for binary executables */
 /* #undef LLVM_BINDIR */
@@ -426,19 +428,22 @@
 /* Installation directory for data files */
 /* #undef LLVM_DATADIR */
 
-/* Target triple LLVM will generate code for by default */
+/* 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 to enable checks that alter the LLVM C++ ABI */
-#define LLVM_ENABLE_ABI_BREAKING_CHECKS 1
+/* 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 is enabled */
+/* Define if zlib compression is available */
 #define LLVM_ENABLE_ZLIB 1
 
 /* Installation directory for config files */
@@ -486,36 +491,49 @@
 /* Define if this is Win32ish platform */
 /* #undef LLVM_ON_WIN32 */
 
-/* Define to path to dot program if found or 'echo dot' otherwise */
-/* #undef LLVM_PATH_DOT */
-
 /* Installation prefix directory */
 #define LLVM_PREFIX "/usr"
 
 /* Define if we have the Intel JIT API runtime support library */
-#define LLVM_USE_INTEL_JITEVENTS 0
+/* #undef LLVM_USE_INTEL_JITEVENTS */
 
 /* Define if we have the oprofile JIT-support library */
-#define LLVM_USE_OPROFILE 0
+/* #undef LLVM_USE_OPROFILE */
 
 /* Major version of the LLVM API */
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 7
+#define LLVM_VERSION_MINOR 8
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "3.7.1"
+#define LLVM_VERSION_STRING "3.8.0"
+
+/* 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
 
-/* The shared library extension */
+/* 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 */
+#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/"
@@ -524,36 +542,51 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 3.7.1"
+#define PACKAGE_STRING "LLVM 3.8.0"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "llvm"
+#undef PACKAGE_TARNAME
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.7.1"
+#define PACKAGE_VERSION "3.8.0"
 
 /* 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 */
+#undef STAT_MACROS_BROKEN
 
 /* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
+#undef STDC_HEADERS
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
+#undef TIME_WITH_SYS_TIME
 
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
+#undef TM_IN_SYS_TIME
 
 /* Type of 1st arg on ELM Callback */
 /* #undef WIN32_ELMCB_PCSTR */
 
 /* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
+#undef pid_t
 
 /* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
+#undef size_t
+
+/* Define to a function replacing strtoll */
+/* #undef strtoll */
+
+/* Define to a function implementing strtoull */
+/* #undef strtoull */
+
+/* Define to a function implementing stricmp */
+/* #undef stricmp */
+
+/* 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 36bcda7..5cbb474 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -1,5 +1,4 @@
 /* $FreeBSD$ */
-/* include/llvm/Config/llvm-config.h.  Generated from llvm-config.h.in by configure.  */
 /*===------- llvm/Config/llvm-config.h - llvm configuration -------*- C -*-===*/
 /*                                                                            */
 /*                     The LLVM Compiler Infrastructure                       */
@@ -31,8 +30,9 @@
 /* Installation directory for documentation */
 /* #undef LLVM_DOCSDIR */
 
-/* Define to enable checks that alter the LLVM C++ ABI */
-#define LLVM_ENABLE_ABI_BREAKING_CHECKS 1
+/* Define if 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
@@ -86,21 +86,24 @@
 #define LLVM_PREFIX "/usr"
 
 /* Define if we have the Intel JIT API runtime support library */
-#define LLVM_USE_INTEL_JITEVENTS 0
+/* #undef LLVM_USE_INTEL_JITEVENTS */
 
 /* Define if we have the oprofile JIT-support library */
-#define LLVM_USE_OPROFILE 0
+/* #undef LLVM_USE_OPROFILE */
 
 /* Major version of the LLVM API */
 #define LLVM_VERSION_MAJOR 3
 
 /* Minor version of the LLVM API */
-#define LLVM_VERSION_MINOR 7
+#define LLVM_VERSION_MINOR 8
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 1
+#define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "3.7.1"
+#define LLVM_VERSION_STRING "3.8.0"
+
+/* Define if we link Polly to the tools */
+/* #undef LINK_POLLY_INTO_TOOLS */
 
 #endif
diff --git a/lib/clang/include/llvm/IR/Attributes.inc b/lib/clang/include/llvm/IR/Attributes.inc
new file mode 100644
index 0000000..dfe888e
--- /dev/null
+++ b/lib/clang/include/llvm/IR/Attributes.inc
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "Attributes.inc.h"
diff --git a/lib/clang/include/llvm/Support/DataTypes.h b/lib/clang/include/llvm/Support/DataTypes.h
index 6f95bc4..ceefdaf 100644
--- a/lib/clang/include/llvm/Support/DataTypes.h
+++ b/lib/clang/include/llvm/Support/DataTypes.h
@@ -1,5 +1,4 @@
 /* $FreeBSD$ */
-/* include/llvm/Support/DataTypes.h.  Generated from DataTypes.h.in by configure.  */
 /*===-- include/Support/DataTypes.h - Define fixed size types -----*- C -*-===*\
 |*                                                                            *|
 |*                     The LLVM Compiler Infrastructure                       *|
@@ -23,7 +22,7 @@
 
 /* Please leave this file C-compatible. */
 
-/* Please keep this file in sync with DataTypes.h.cmake */
+/* Please keep this file in sync with DataTypes.h.in */
 
 #ifndef SUPPORT_DATATYPES_H
 #define SUPPORT_DATATYPES_H
@@ -31,7 +30,7 @@
 #define HAVE_INTTYPES_H 1
 #define HAVE_STDINT_H 1
 #define HAVE_UINT64_T 1
-/* #undef HAVE_U_INT64_T */
+#define HAVE_U_INT64_T 1
 
 #ifdef __cplusplus
 #include <cmath>
@@ -103,6 +102,13 @@ typedef signed int ssize_t;
 #define PRIu64 "I64u"
 #define PRIx64 "I64x"
 #define PRIX64 "I64X"
+
+#define PRId32 "d"
+#define PRIi32 "i"
+#define PRIo32 "o"
+#define PRIu32 "u"
+#define PRIx32 "x"
+#define PRIX32 "X"
 #endif /* HAVE_INTTYPES_H */
 
 #endif /* _MSC_VER */
diff --git a/lib/clang/libclangast/Makefile b/lib/clang/libclangast/Makefile
index a3f00aa..d77857b 100644
--- a/lib/clang/libclangast/Makefile
+++ b/lib/clang/libclangast/Makefile
@@ -34,6 +34,7 @@ SRCS=	APValue.cpp \
 	ExprCXX.cpp \
 	ExprClassification.cpp \
 	ExprConstant.cpp \
+	ExprObjC.cpp \
 	ExternalASTSource.cpp \
 	InheritViz.cpp \
 	ItaniumCXXABI.cpp \
@@ -43,13 +44,17 @@ SRCS=	APValue.cpp \
 	MicrosoftMangle.cpp \
 	NSAPI.cpp \
 	NestedNameSpecifier.cpp \
+	OpenMPClause.cpp \
 	ParentMap.cpp \
 	RawCommentList.cpp \
 	RecordLayout.cpp \
 	RecordLayoutBuilder.cpp \
 	SelectorLocationsKind.cpp \
 	Stmt.cpp \
+	StmtCXX.cpp \
 	StmtIterator.cpp \
+	StmtObjC.cpp \
+	StmtOpenMP.cpp \
 	StmtPrinter.cpp \
 	StmtProfile.cpp \
 	StmtViz.cpp \
diff --git a/lib/clang/libclangcodegen/Makefile b/lib/clang/libclangcodegen/Makefile
index 623daba..6b907a6 100644
--- a/lib/clang/libclangcodegen/Makefile
+++ b/lib/clang/libclangcodegen/Makefile
@@ -56,6 +56,7 @@ SRCS=	BackendUtil.cpp \
 TGHDRS=	AttrList \
 	AttrParsedAttrList \
 	AttrVisitor \
+	Attributes \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
diff --git a/lib/clang/libclangfrontend/Makefile b/lib/clang/libclangfrontend/Makefile
index 8e63fb0..0a71441 100644
--- a/lib/clang/libclangfrontend/Makefile
+++ b/lib/clang/libclangfrontend/Makefile
@@ -33,6 +33,7 @@ SRCS=	ASTConsumers.cpp \
 	PrintPreprocessedOutput.cpp \
 	SerializedDiagnosticPrinter.cpp \
 	SerializedDiagnosticReader.cpp \
+	TestModuleFileExtension.cpp \
 	TextDiagnostic.cpp \
 	TextDiagnosticBuffer.cpp \
 	TextDiagnosticPrinter.cpp \
@@ -41,6 +42,7 @@ SRCS=	ASTConsumers.cpp \
 TGHDRS=	AttrList \
 	AttrParsedAttrList \
 	AttrVisitor \
+	Attributes \
 	Attrs \
 	CommentCommandList \
 	CommentNodes \
diff --git a/lib/clang/libclangrewritefrontend/Makefile b/lib/clang/libclangrewritefrontend/Makefile
index 2f614fb..bf86858 100644
--- a/lib/clang/libclangrewritefrontend/Makefile
+++ b/lib/clang/libclangrewritefrontend/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	clangrewritefrontend
 
@@ -12,6 +12,11 @@ SRCS=	FixItRewriter.cpp \
 	RewriteMacros.cpp \
 	RewriteTest.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	RewriteModernObjC.cpp \
+	RewriteObjC.cpp
+.endif
+
 TGHDRS=	AttrList \
 	AttrParsedAttrList \
 	Attrs \
diff --git a/lib/clang/libclangsema/Makefile b/lib/clang/libclangsema/Makefile
index 08c120a..0ab91e4 100644
--- a/lib/clang/libclangsema/Makefile
+++ b/lib/clang/libclangsema/Makefile
@@ -24,6 +24,7 @@ SRCS=	AnalysisBasedWarnings.cpp \
 	SemaChecking.cpp \
 	SemaCodeComplete.cpp \
 	SemaConsumer.cpp \
+	SemaCoroutine.cpp \
 	SemaDecl.cpp \
 	SemaDeclAttr.cpp \
 	SemaDeclCXX.cpp \
diff --git a/lib/clang/libclangserialization/Makefile b/lib/clang/libclangserialization/Makefile
index 3a6a65e..bd9b2d8 100644
--- a/lib/clang/libclangserialization/Makefile
+++ b/lib/clang/libclangserialization/Makefile
@@ -15,6 +15,7 @@ SRCS=	ASTCommon.cpp \
 	GeneratePCH.cpp \
 	GlobalModuleIndex.cpp \
 	Module.cpp \
+	ModuleFileExtension.cpp \
 	ModuleManager.cpp
 
 TGHDRS=	AttrList \
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile b/lib/clang/libclangstaticanalyzercheckers/Makefile
index ec4a76f..c402039 100644
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile
@@ -28,6 +28,7 @@ SRCS=	AllocationDiagnostics.cpp \
 	DereferenceChecker.cpp \
 	DirectIvarAssignment.cpp \
 	DivZeroChecker.cpp \
+	DynamicTypeChecker.cpp \
 	DynamicTypePropagation.cpp \
 	ExprInspectionChecker.cpp \
 	FixedAddressChecker.cpp \
@@ -35,6 +36,7 @@ SRCS=	AllocationDiagnostics.cpp \
 	IdenticalExprChecker.cpp \
 	IvarInvalidationChecker.cpp \
 	LLVMConventionsChecker.cpp \
+	LocalizationChecker.cpp \
 	MacOSKeychainAPIChecker.cpp \
 	MacOSXAPIChecker.cpp \
 	MallocChecker.cpp \
@@ -44,12 +46,14 @@ SRCS=	AllocationDiagnostics.cpp \
 	NSErrorChecker.cpp \
 	NoReturnFunctionChecker.cpp \
 	NonNullParamChecker.cpp \
+	NullabilityChecker.cpp \
 	ObjCAtSyncChecker.cpp \
 	ObjCContainersASTChecker.cpp \
 	ObjCContainersChecker.cpp \
 	ObjCMissingSuperCallChecker.cpp \
 	ObjCSelfInitChecker.cpp \
 	ObjCUnusedIVarsChecker.cpp \
+	PaddingChecker.cpp \
 	PointerArithChecker.cpp \
 	PointerSubChecker.cpp \
 	PthreadLockChecker.cpp \
@@ -70,6 +74,7 @@ SRCS=	AllocationDiagnostics.cpp \
 	UnixAPIChecker.cpp \
 	UnreachableCodeChecker.cpp \
 	VLASizeChecker.cpp \
+	VforkChecker.cpp \
 	VirtualCallChecker.cpp
 
 .if ${MK_CLANG_EXTRAS} != "no"
diff --git a/lib/clang/libclangstaticanalyzercore/Makefile b/lib/clang/libclangstaticanalyzercore/Makefile
index e171517..bfee77a 100644
--- a/lib/clang/libclangstaticanalyzercore/Makefile
+++ b/lib/clang/libclangstaticanalyzercore/Makefile
@@ -21,6 +21,7 @@ SRCS=	APSIntType.cpp \
 	CommonBugCategories.cpp \
 	ConstraintManager.cpp \
 	CoreEngine.cpp \
+	DynamicTypeMap.cpp \
 	Environment.cpp \
 	ExplodedGraph.cpp \
 	ExprEngine.cpp \
@@ -30,6 +31,8 @@ SRCS=	APSIntType.cpp \
 	ExprEngineObjC.cpp \
 	FunctionSummary.cpp \
 	HTMLDiagnostics.cpp \
+	IssueHash.cpp \
+	LoopWidening.cpp \
 	MemRegion.cpp \
 	PathDiagnostic.cpp \
 	PlistDiagnostics.cpp \
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile b/lib/clang/libclangstaticanalyzerfrontend/Makefile
index 3975509..5e074d9 100644
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile
+++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile
@@ -7,8 +7,8 @@ LIB=	clangstaticanalyzerfrontend
 SRCDIR=	tools/clang/lib/StaticAnalyzer/Frontend
 SRCS=	AnalysisConsumer.cpp \
 	CheckerRegistration.cpp \
-	ModelConsumer.cpp \
 	FrontendActions.cpp \
+	ModelConsumer.cpp \
 	ModelInjector.cpp
 
 TGHDRS=	AttrList \
diff --git a/lib/clang/liblldbCore/Makefile b/lib/clang/liblldbCore/Makefile
index 86bff4d..2c81bd4 100644
--- a/lib/clang/liblldbCore/Makefile
+++ b/lib/clang/liblldbCore/Makefile
@@ -35,7 +35,6 @@ SRCS=	Address.cpp \
 	FormatEntity.cpp \
 	History.cpp \
 	IOHandler.cpp \
-	Language.cpp \
 	Listener.cpp \
 	Log.cpp \
 	Logging.cpp \
@@ -69,6 +68,7 @@ SRCS=	Address.cpp \
 	ValueObjectCast.cpp \
 	ValueObjectChild.cpp \
 	ValueObjectConstResult.cpp \
+	ValueObjectConstResultCast.cpp \
 	ValueObjectConstResultChild.cpp \
 	ValueObjectConstResultImpl.cpp \
 	ValueObjectDynamicValue.cpp \
diff --git a/lib/clang/liblldbDataFormatters/Makefile b/lib/clang/liblldbDataFormatters/Makefile
index 8814697..f3b4168 100644
--- a/lib/clang/liblldbDataFormatters/Makefile
+++ b/lib/clang/liblldbDataFormatters/Makefile
@@ -5,24 +5,14 @@
 LIB=	lldbDataFormatters
 
 SRCDIR=	tools/lldb/source/DataFormatters
-SRCS=	CF.cpp \
-	Cocoa.cpp \
-	CXXFormatterFunctions.cpp \
+SRCS=	CXXFunctionPointer.cpp \
 	DataVisualization.cpp \
+	DumpValueObjectOptions.cpp \
 	FormatCache.cpp \
 	FormatClasses.cpp \
 	FormatManager.cpp \
-	LibCxx.cpp \
-	LibCxxInitializerList.cpp \
-	LibCxxList.cpp \
-	LibCxxMap.cpp \
-	LibCxxUnorderedMap.cpp \
-	LibCxxVector.cpp \
-	LibStdcpp.cpp \
-	NSArray.cpp \
-	NSDictionary.cpp \
-	NSIndexPath.cpp \
-	NSSet.cpp \
+	FormattersHelpers.cpp \
+	LanguageCategory.cpp \
 	StringPrinter.cpp \
 	TypeCategory.cpp \
 	TypeCategoryMap.cpp \
diff --git a/lib/clang/liblldbExpression/Makefile b/lib/clang/liblldbExpression/Makefile
index d2d822b..af6635d 100644
--- a/lib/clang/liblldbExpression/Makefile
+++ b/lib/clang/liblldbExpression/Makefile
@@ -5,28 +5,23 @@
 LIB=	lldbExpression
 
 SRCDIR=	tools/lldb/source/Expression
-SRCS=	ASTDumper.cpp \
-	ASTResultSynthesizer.cpp \
-	ASTStructExtractor.cpp \
-	ClangASTSource.cpp \
-	ClangExpressionDeclMap.cpp \
-	ClangExpressionParser.cpp \
-	ClangExpressionVariable.cpp \
-	ClangFunction.cpp \
-	ClangModulesDeclVendor.cpp \
-	ClangPersistentVariables.cpp \
-	ClangUserExpression.cpp \
-	ClangUtilityFunction.cpp \
-	DWARFExpression.cpp \
+SRCS=	DWARFExpression.cpp \
+	Expression.cpp \
 	ExpressionSourceCode.cpp \
+	ExpressionVariable.cpp \
+	FunctionCaller.cpp \
 	IRDynamicChecks.cpp \
 	IRExecutionUnit.cpp \
-	IRForTarget.cpp \
 	IRInterpreter.cpp \
 	IRMemoryMap.cpp \
-	Materializer.cpp
+	LLVMUserExpression.cpp \
+	Materializer.cpp \
+	REPL.cpp \
+	UserExpression.cpp \
+	UtilityFunction.cpp
 
-TGHDRS=	DiagnosticCommonKinds \
+TGHDRS=	Attributes \
+	DiagnosticCommonKinds \
 	DeclNodes \
 	StmtNodes \
 	CommentCommandList \
diff --git a/lib/clang/liblldbHostCommon/Makefile b/lib/clang/liblldbHostCommon/Makefile
index f463c9c..706ea1f 100644
--- a/lib/clang/liblldbHostCommon/Makefile
+++ b/lib/clang/liblldbHostCommon/Makefile
@@ -10,6 +10,7 @@ SRCS=	Condition.cpp \
 	File.cpp \
 	FileSpec.cpp \
 	FileSystem.cpp \
+	GetOptInc.cpp \
 	Host.cpp \
 	HostInfoBase.cpp \
 	HostNativeThreadBase.cpp \
@@ -28,11 +29,13 @@ SRCS=	Condition.cpp \
 	SoftwareBreakpoint.cpp \
 	StringConvert.cpp \
 	Symbols.cpp \
+	TCPSocket.cpp \
 	Terminal.cpp \
 	ThisThread.cpp \
 	ThreadLauncher.cpp \
 	TimeValue.cpp \
-	XML.cpp
+	XML.cpp \
+	UDPSocket.cpp
 
 TGHDRS=	AttrList \
 	Attrs \
diff --git a/lib/clang/liblldbHostPOSIX/Makefile b/lib/clang/liblldbHostPOSIX/Makefile
index a46dbca..d6e275c 100644
--- a/lib/clang/liblldbHostPOSIX/Makefile
+++ b/lib/clang/liblldbHostPOSIX/Makefile
@@ -6,6 +6,7 @@ LIB=	lldbHostPOSIX
 
 SRCDIR=	tools/lldb/source/Host/posix
 SRCS=	ConnectionFileDescriptorPosix.cpp \
+	DomainSocket.cpp \
 	FileSystem.cpp \
 	HostInfoPosix.cpp \
 	HostProcessPosix.cpp \
diff --git a/lib/clang/liblldbInitialization/Makefile b/lib/clang/liblldbInitialization/Makefile
index 9507b6e..15f7af9 100644
--- a/lib/clang/liblldbInitialization/Makefile
+++ b/lib/clang/liblldbInitialization/Makefile
@@ -9,11 +9,9 @@ SRCS=	SystemInitializer.cpp \
 	SystemInitializerCommon.cpp \
 	SystemLifetimeManager.cpp
 	
-#TGHDRS=	AttrList \
-#	Attrs \
-#	DiagnosticCommonKinds \
-#	DeclNodes \
-#	StmtNodes \
-#	CommentCommandList
+TGHDRS=	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	StmtNodes
 
 .include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbInterpreter/Makefile b/lib/clang/liblldbInterpreter/Makefile
index 2ef5d6e..cf7d28e 100644
--- a/lib/clang/liblldbInterpreter/Makefile
+++ b/lib/clang/liblldbInterpreter/Makefile
@@ -47,10 +47,7 @@ SRCS=	Args.cpp \
 	OptionGroupWatchpoint.cpp \
 	Options.cpp \
 	Property.cpp \
-	PythonDataObjects.cpp \
-	ScriptInterpreter.cpp \
-	ScriptInterpreterNone.cpp \
-	ScriptInterpreterPython.cpp
+	ScriptInterpreter.cpp
 
 TGHDRS=	AttrList \
 	Attrs \
diff --git a/lib/clang/liblldbPluginExpressionParserClang/Makefile b/lib/clang/liblldbPluginExpressionParserClang/Makefile
new file mode 100644
index 0000000..2f27613
--- /dev/null
+++ b/lib/clang/liblldbPluginExpressionParserClang/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginExpressionParserClang
+
+SRCDIR=	tools/lldb/source/Plugins/ExpressionParser/Clang
+SRCS=	ASTDumper.cpp \
+	ASTResultSynthesizer.cpp \
+	ASTStructExtractor.cpp \
+	ClangASTSource.cpp \
+	ClangExpressionDeclMap.cpp \
+	ClangExpressionParser.cpp \
+	ClangExpressionVariable.cpp \
+	ClangFunctionCaller.cpp \
+	ClangModulesDeclVendor.cpp \
+	ClangPersistentVariables.cpp \
+	ClangUserExpression.cpp \
+	ClangUtilityFunction.cpp \
+	IRForTarget.cpp
+
+TGHDRS=	Attributes \
+	AttrList \
+	AttrParsedAttrList \
+	Attrs \
+	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	DiagnosticFrontendKinds \
+	DiagnosticSemaKinds \
+	Intrinsics \
+	StmtNodes
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginExpressionParserGo/Makefile b/lib/clang/liblldbPluginExpressionParserGo/Makefile
new file mode 100644
index 0000000..79612f9
--- /dev/null
+++ b/lib/clang/liblldbPluginExpressionParserGo/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginExpressionParserGo
+
+SRCDIR=	tools/lldb/source/Plugins/ExpressionParser/Go
+SRCS=	GoLexer.cpp \
+	GoParser.cpp \
+	GoUserExpression.cpp
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile b/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile
new file mode 100644
index 0000000..6382609
--- /dev/null
+++ b/lib/clang/liblldbPluginLanguageCPlusPlus/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginLanguageCPlusPlus
+
+SRCDIR=	tools/lldb/source/Plugins/Language/CPlusPlus/
+SRCS=	CPlusPlusLanguage.cpp \
+	CxxStringTypes.cpp \
+	LibCxx.cpp \
+	LibCxxInitializerList.cpp \
+	LibCxxList.cpp \
+	LibCxxMap.cpp \
+	LibCxxUnorderedMap.cpp \
+	LibCxxVector.cpp \
+	LibStdcpp.cpp
+
+TGHDRS=	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	StmtNodes
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginLanguageObjC/Makefile b/lib/clang/liblldbPluginLanguageObjC/Makefile
new file mode 100644
index 0000000..8653e75
--- /dev/null
+++ b/lib/clang/liblldbPluginLanguageObjC/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginLanguageObjC
+
+SRCDIR=	tools/lldb/source/Plugins/Language/ObjC/
+SRCS=	CF.cpp \
+	Cocoa.cpp \
+	CoreMedia.cpp \
+	NSArray.cpp \
+	NSDictionary.cpp \
+	NSError.cpp \
+	NSException.cpp \
+	NSIndexPath.cpp \
+	NSSet.cpp \
+	NSString.cpp \
+	ObjCLanguage.cpp
+
+TGHDRS=	AttrList \
+	Attrs \
+	CommentCommandList \
+	DeclNodes \
+	DiagnosticCommonKinds \
+	StmtNodes
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginProcessFreeBSD/Makefile b/lib/clang/liblldbPluginProcessFreeBSD/Makefile
index 2af488b..d9444ee 100644
--- a/lib/clang/liblldbPluginProcessFreeBSD/Makefile
+++ b/lib/clang/liblldbPluginProcessFreeBSD/Makefile
@@ -7,14 +7,13 @@ LIB=	lldbPluginProcessFreeBSD
 # include_directories(.)
 CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD
 CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/POSIX
+CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Utility
 
 SRCDIR=	tools/lldb/source/Plugins/Process/FreeBSD
 SRCS=	FreeBSDThread.cpp \
 	ProcessFreeBSD.cpp \
 	ProcessMonitor.cpp \
 	POSIXStopInfo.cpp \
-	POSIXThread.cpp \
-	ProcessPOSIX.cpp \
 	RegisterContextPOSIXProcessMonitor_arm.cpp \
 	RegisterContextPOSIXProcessMonitor_arm64.cpp \
 	RegisterContextPOSIXProcessMonitor_mips64.cpp \
diff --git a/lib/clang/liblldbPluginProcessUtility/Makefile b/lib/clang/liblldbPluginProcessUtility/Makefile
index ee11668..4a5e340 100644
--- a/lib/clang/liblldbPluginProcessUtility/Makefile
+++ b/lib/clang/liblldbPluginProcessUtility/Makefile
@@ -13,6 +13,7 @@ SRCS=	DynamicRegisterInfo.cpp \
 	InferiorCallPOSIX.cpp \
 	LinuxSignals.cpp \
 	MipsLinuxSignals.cpp \
+	NetBSDSignals.cpp \
 	RegisterContextDarwin_arm.cpp \
 	RegisterContextDarwin_arm64.cpp \
 	RegisterContextDarwin_i386.cpp \
diff --git a/lib/clang/liblldbPluginScriptInterpreterNone/Makefile b/lib/clang/liblldbPluginScriptInterpreterNone/Makefile
new file mode 100644
index 0000000..d837539
--- /dev/null
+++ b/lib/clang/liblldbPluginScriptInterpreterNone/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	lldbPluginScriptInterpreterNone
+
+SRCDIR=	tools/lldb/source/Plugins/ScriptInterpreter/None
+SRCS=	ScriptInterpreterNone.cpp
+
+.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
index 5b8dbfd..0d2409e 100644
--- a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
+++ b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
@@ -5,7 +5,11 @@
 LIB=	lldbPluginSymbolFileDWARF
 
 SRCDIR=	tools/lldb/source/Plugins/SymbolFile/DWARF
-SRCS=	DWARFAbbreviationDeclaration.cpp \
+SRCS=	DIERef.cpp \
+	DWARFAbbreviationDeclaration.cpp \
+	DWARFASTParserClang.cpp \
+	DWARFASTParserGo.cpp \
+	DWARFAttribute.cpp \
 	DWARFCompileUnit.cpp \
 	DWARFDataExtractor.cpp \
 	DWARFDebugAbbrev.cpp \
@@ -13,6 +17,7 @@ SRCS=	DWARFAbbreviationDeclaration.cpp \
 	DWARFDebugArangeSet.cpp \
 	DWARFDebugInfo.cpp \
 	DWARFDebugInfoEntry.cpp \
+	DWARFDebugMacro.cpp \
 	DWARFDebugLine.cpp \
 	DWARFDebugMacinfo.cpp \
 	DWARFDebugMacinfoEntry.cpp \
@@ -21,13 +26,14 @@ SRCS=	DWARFAbbreviationDeclaration.cpp \
 	DWARFDebugRanges.cpp \
 	DWARFDeclContext.cpp \
 	DWARFDefines.cpp \
+	DWARFDIE.cpp \
 	DWARFDIECollection.cpp \
 	DWARFFormValue.cpp \
-	DWARFLocationDescription.cpp \
-	DWARFLocationList.cpp \
 	LogChannelDWARF.cpp \
+	HashedNameToDIE.cpp \
 	NameToDIE.cpp \
 	SymbolFileDWARF.cpp \
+	SymbolFileDWARFDwo.cpp \
 	SymbolFileDWARFDebugMap.cpp \
 	UniqueDWARFASTType.cpp
 
diff --git a/lib/clang/liblldbSymbol/Makefile b/lib/clang/liblldbSymbol/Makefile
index 82c11ff..0cc7a75 100644
--- a/lib/clang/liblldbSymbol/Makefile
+++ b/lib/clang/liblldbSymbol/Makefile
@@ -5,19 +5,23 @@
 LIB=	lldbSymbol
 
 SRCDIR=	tools/lldb/source/Symbol
-SRCS=	Block.cpp \
+SRCS=	ArmUnwindInfo.cpp \
+	Block.cpp \
 	ClangASTContext.cpp \
 	ClangASTImporter.cpp \
-	ClangASTType.cpp \
 	ClangExternalASTSourceCallbacks.cpp \
 	ClangExternalASTSourceCommon.cpp \
-	ClangNamespaceDecl.cpp \
+	CompilerDecl.cpp \
+	CompilerDeclContext.cpp \
+	CompilerType.cpp \
 	CompactUnwindInfo.cpp \
+	DebugMacros.cpp \
 	CompileUnit.cpp \
 	Declaration.cpp \
 	DWARFCallFrameInfo.cpp \
 	Function.cpp \
 	FuncUnwinders.cpp \
+	GoASTContext.cpp \
 	LineEntry.cpp \
 	LineTable.cpp \
 	ObjectFile.cpp \
@@ -28,6 +32,8 @@ SRCS=	Block.cpp \
 	Symtab.cpp \
 	Type.cpp \
 	TypeList.cpp \
+	TypeMap.cpp \
+	TypeSystem.cpp \
 	UnwindPlan.cpp \
 	UnwindTable.cpp \
 	Variable.cpp \
diff --git a/lib/clang/liblldbTarget/Makefile b/lib/clang/liblldbTarget/Makefile
index 110dfe9..9bad46e 100644
--- a/lib/clang/liblldbTarget/Makefile
+++ b/lib/clang/liblldbTarget/Makefile
@@ -15,6 +15,7 @@ SRCS=	ABI.cpp \
 	InstrumentationRuntimeStopInfo.cpp \
 	JITLoader.cpp \
 	JITLoaderList.cpp \
+	Language.cpp \
 	LanguageRuntime.cpp \
 	Memory.cpp \
 	MemoryHistory.cpp \
diff --git a/lib/clang/liblldbUtility/Makefile b/lib/clang/liblldbUtility/Makefile
index 918cfab..6e2345c 100644
--- a/lib/clang/liblldbUtility/Makefile
+++ b/lib/clang/liblldbUtility/Makefile
@@ -20,6 +20,7 @@ SRCS=	ARM64_DWARF_Registers.cpp \
 	StringExtractor.cpp \
 	StringExtractorGDBRemote.cpp \
 	StringLexer.cpp \
+	TaskPool.cpp \
 	TimeSpecTimeout.cpp \
 	UriParser.cpp
 
diff --git a/lib/clang/libllvmaarch64instprinter/Makefile b/lib/clang/libllvmaarch64asmprinter/Makefile
index c037dc8..222dd74 100644
--- a/lib/clang/libllvmaarch64instprinter/Makefile
+++ b/lib/clang/libllvmaarch64asmprinter/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-LIB=	llvmaarch64instprinter
+LIB=	llvmaarch64asmprinter
 
 SRCDIR=	lib/Target/AArch64/InstPrinter
 INCDIR=	lib/Target/AArch64
diff --git a/lib/clang/libllvmaarch64asmprinter/Makefile.depend b/lib/clang/libllvmaarch64asmprinter/Makefile.depend
new file mode 100644
index 0000000..56c8d39
--- /dev/null
+++ b/lib/clang/libllvmaarch64asmprinter/Makefile.depend
@@ -0,0 +1,26 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+AArch64InstPrinter.o: AArch64GenAsmWriter.inc.h
+AArch64InstPrinter.o: AArch64GenAsmWriter1.inc.h
+AArch64InstPrinter.o: AArch64GenInstrInfo.inc.h
+AArch64InstPrinter.o: AArch64GenRegisterInfo.inc.h
+AArch64InstPrinter.o: AArch64GenSubtargetInfo.inc.h
+AArch64InstPrinter.po: AArch64GenAsmWriter.inc.h
+AArch64InstPrinter.po: AArch64GenAsmWriter1.inc.h
+AArch64InstPrinter.po: AArch64GenInstrInfo.inc.h
+AArch64InstPrinter.po: AArch64GenRegisterInfo.inc.h
+AArch64InstPrinter.po: AArch64GenSubtargetInfo.inc.h
+.endif
diff --git a/lib/clang/libllvmaarch64codegen/Makefile b/lib/clang/libllvmaarch64codegen/Makefile
index db0023f..50fec61 100644
--- a/lib/clang/libllvmaarch64codegen/Makefile
+++ b/lib/clang/libllvmaarch64codegen/Makefile
@@ -41,6 +41,7 @@ TGHDRS=	AArch64GenCallingConv \
 	AArch64GenMCPseudoLowering \
 	AArch64GenRegisterInfo \
 	AArch64GenSubtargetInfo \
+	Attributes \
 	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64desc/Makefile b/lib/clang/libllvmaarch64desc/Makefile
index 041fbf2..e757f45 100644
--- a/lib/clang/libllvmaarch64desc/Makefile
+++ b/lib/clang/libllvmaarch64desc/Makefile
@@ -19,6 +19,7 @@ CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
 TGHDRS=	AArch64GenInstrInfo \
 	AArch64GenMCCodeEmitter \
 	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo
+	AArch64GenSubtargetInfo \
+	Attributes
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64disassembler/Makefile b/lib/clang/libllvmaarch64disassembler/Makefile
index 0cf9658..f8d71a9 100644
--- a/lib/clang/libllvmaarch64disassembler/Makefile
+++ b/lib/clang/libllvmaarch64disassembler/Makefile
@@ -1,18 +1,17 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.own.mk>
 
 LIB=	llvmaarch64disassembler
 
 SRCDIR=	lib/Target/AArch64/Disassembler
 INCDIR=	lib/Target/AArch64
-SRCS=	AArch64Disassembler.cpp
+SRCS=	AArch64Disassembler.cpp \
+	AArch64ExternalSymbolizer.cpp
 
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+=	AArch64ExternalSymbolizer.cpp
-.endif
-
-TGHDRS=	AArch64GenDisassemblerTables \
+TGHDRS=	Attributes \
+	Intrinsics \
+	AArch64GenDisassemblerTables \
 	AArch64GenInstrInfo \
 	AArch64GenRegisterInfo \
 	AArch64GenSubtargetInfo
diff --git a/lib/clang/libllvmaarch64instprinter/Makefile.depend b/lib/clang/libllvmaarch64instprinter/Makefile.depend
deleted file mode 100644
index 385072f..0000000
--- a/lib/clang/libllvmaarch64instprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
index 23d1f87..a05083b 100644
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@@ -6,9 +6,7 @@ LIB=	llvmanalysis
 
 SRCDIR=	lib/Analysis
 SRCS=	AliasAnalysis.cpp \
-	AliasAnalysisCounter.cpp \
 	AliasAnalysisEvaluator.cpp \
-	AliasDebugger.cpp \
 	AliasSetTracker.cpp \
 	AssumptionCache.cpp \
 	BasicAliasAnalysis.cpp \
@@ -18,16 +16,23 @@ SRCS=	AliasAnalysis.cpp \
 	CFG.cpp \
 	CFGPrinter.cpp \
 	CFLAliasAnalysis.cpp \
+	CallGraph.cpp \
+	CallGraphSCCPass.cpp \
+	CallPrinter.cpp \
 	CaptureTracking.cpp \
 	CodeMetrics.cpp \
 	ConstantFolding.cpp \
 	CostModel.cpp \
 	Delinearization.cpp \
+	DemandedBits.cpp \
 	DependenceAnalysis.cpp \
 	DivergenceAnalysis.cpp \
 	DomPrinter.cpp \
 	DominanceFrontier.cpp \
+	EHPersonalities.cpp \
+	GlobalsModRef.cpp \
 	IVUsers.cpp \
+	InlineCost.cpp \
 	InstCount.cpp \
 	InstructionSimplify.cpp \
 	Interval.cpp \
@@ -35,8 +40,6 @@ SRCS=	AliasAnalysis.cpp \
 	IteratedDominanceFrontier.cpp \
 	LazyCallGraph.cpp \
 	LazyValueInfo.cpp \
-	LibCallAliasAnalysis.cpp \
-	LibCallSemantics.cpp \
 	Lint.cpp \
 	Loads.cpp \
 	LoopAccessAnalysis.cpp \
@@ -48,7 +51,10 @@ SRCS=	AliasAnalysis.cpp \
 	MemoryDependenceAnalysis.cpp \
 	MemoryLocation.cpp \
 	ModuleDebugInfoPrinter.cpp \
-	NoAliasAnalysis.cpp \
+	ObjCARCAliasAnalysis.cpp \
+	ObjCARCAnalysisUtils.cpp \
+	ObjCARCInstKind.cpp \
+	OrderedBasicBlock.cpp \
 	PHITransAddr.cpp \
 	PostDominators.cpp \
 	PtrUseVisitor.cpp \
@@ -73,6 +79,7 @@ SRCS+=	Analysis.cpp \
 	Trace.cpp
 .endif
 	
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarminstprinter/Makefile b/lib/clang/libllvmarmasmprinter/Makefile
index 67b8fee..b9e9f95 100644
--- a/lib/clang/libllvmarminstprinter/Makefile
+++ b/lib/clang/libllvmarmasmprinter/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-LIB=	llvmarminstprinter
+LIB=	llvmarmasmprinter
 
 SRCDIR=	lib/Target/ARM/InstPrinter
 INCDIR=	lib/Target/ARM
diff --git a/lib/clang/libllvmarmasmprinter/Makefile.depend b/lib/clang/libllvmarmasmprinter/Makefile.depend
new file mode 100644
index 0000000..ba60d06
--- /dev/null
+++ b/lib/clang/libllvmarmasmprinter/Makefile.depend
@@ -0,0 +1,24 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+ARMInstPrinter.o: ARMGenAsmWriter.inc.h
+ARMInstPrinter.o: ARMGenInstrInfo.inc.h
+ARMInstPrinter.o: ARMGenRegisterInfo.inc.h
+ARMInstPrinter.o: ARMGenSubtargetInfo.inc.h
+ARMInstPrinter.po: ARMGenAsmWriter.inc.h
+ARMInstPrinter.po: ARMGenInstrInfo.inc.h
+ARMInstPrinter.po: ARMGenRegisterInfo.inc.h
+ARMInstPrinter.po: ARMGenSubtargetInfo.inc.h
+.endif
diff --git a/lib/clang/libllvmarmcodegen/Makefile b/lib/clang/libllvmarmcodegen/Makefile
index 6da61b9..a77dfdc 100644
--- a/lib/clang/libllvmarmcodegen/Makefile
+++ b/lib/clang/libllvmarmcodegen/Makefile
@@ -46,6 +46,7 @@ TGHDRS=	ARMGenAsmWriter \
 	ARMGenMCPseudoLowering \
 	ARMGenRegisterInfo \
 	ARMGenSubtargetInfo \
+	Attributes \
 	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmdesc/Makefile b/lib/clang/libllvmarmdesc/Makefile
index 42c3f5c..423f807 100644
--- a/lib/clang/libllvmarmdesc/Makefile
+++ b/lib/clang/libllvmarmdesc/Makefile
@@ -7,7 +7,6 @@ LIB=	llvmarmdesc
 SRCDIR=	lib/Target/ARM/MCTargetDesc
 SRCS=	ARMAsmBackend.cpp \
 	ARMELFObjectWriter.cpp \
-	ARMELFObjectWriter.cpp \
 	ARMELFStreamer.cpp \
 	ARMMCAsmInfo.cpp \
 	ARMMCCodeEmitter.cpp \
@@ -24,6 +23,7 @@ CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
 TGHDRS=	ARMGenInstrInfo \
 	ARMGenMCCodeEmitter \
 	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo
+	ARMGenSubtargetInfo \
+	Attributes
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarminfo/Makefile b/lib/clang/libllvmarminfo/Makefile
index 1da434c..fcf0354 100644
--- a/lib/clang/libllvmarminfo/Makefile
+++ b/lib/clang/libllvmarminfo/Makefile
@@ -10,6 +10,7 @@ SRCS=	ARMTargetInfo.cpp
 
 TGHDRS=	ARMGenInstrInfo \
 	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo
+	ARMGenSubtargetInfo \
+	Attributes
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarminstprinter/Makefile.depend b/lib/clang/libllvmarminstprinter/Makefile.depend
deleted file mode 100644
index 385072f..0000000
--- a/lib/clang/libllvmarminstprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmasmparser/Makefile b/lib/clang/libllvmasmparser/Makefile
index bb8f0df..7ee5986 100644
--- a/lib/clang/libllvmasmparser/Makefile
+++ b/lib/clang/libllvmasmparser/Makefile
@@ -9,4 +9,6 @@ SRCS=	LLLexer.cpp \
 	LLParser.cpp \
 	Parser.cpp
 
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmasmprinter/Makefile b/lib/clang/libllvmasmprinter/Makefile
index 1cddd55..eca8cd3 100644
--- a/lib/clang/libllvmasmprinter/Makefile
+++ b/lib/clang/libllvmasmprinter/Makefile
@@ -12,8 +12,8 @@ SRCS=	ARMException.cpp \
 	AsmPrinterInlineAsm.cpp \
 	DIE.cpp \
 	DIEHash.cpp \
-	DebugLocStream.cpp \
 	DbgValueHistoryCalculator.cpp \
+	DebugLocStream.cpp \
 	DwarfAccelTable.cpp \
 	DwarfCFIException.cpp \
 	DwarfCompileUnit.cpp \
@@ -28,6 +28,7 @@ SRCS=	ARMException.cpp \
 	WinCodeViewLineTables.cpp \
 	WinException.cpp
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmbitreader/Makefile b/lib/clang/libllvmbitreader/Makefile
index 6add8a3..252c9a9 100644
--- a/lib/clang/libllvmbitreader/Makefile
+++ b/lib/clang/libllvmbitreader/Makefile
@@ -1,14 +1,18 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmbitreader
 
 SRCDIR=	lib/Bitcode/Reader
-SRCS=	BitReader.cpp \
-	BitcodeReader.cpp \
+SRCS=	BitcodeReader.cpp \
 	BitstreamReader.cpp
 
-TGHDRS=	Intrinsics
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	BitReader.cpp
+.endif
+
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmbitwriter/Makefile b/lib/clang/libllvmbitwriter/Makefile
index 2e5fa2a..4ce8bde 100644
--- a/lib/clang/libllvmbitwriter/Makefile
+++ b/lib/clang/libllvmbitwriter/Makefile
@@ -13,4 +13,7 @@ SRCS=	BitcodeWriter.cpp \
 SRCS+=	BitWriter.cpp
 .endif
 
+TGHDRS=	Attributes \
+	Intrinsics
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile
index 3205f6a..f5c7f4e 100644
--- a/lib/clang/libllvmcodegen/Makefile
+++ b/lib/clang/libllvmcodegen/Makefile
@@ -27,6 +27,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	ExpandISelPseudos.cpp \
 	ExpandPostRAPseudos.cpp \
 	FaultMaps.cpp \
+	FuncletLayout.cpp \
 	GCMetadata.cpp \
 	GCRootLowering.cpp \
 	GlobalMerge.cpp \
@@ -39,6 +40,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	LLVMTargetMachine.cpp \
 	LatencyPriorityQueue.cpp \
 	LexicalScopes.cpp \
+	LiveDebugValues.cpp \
 	LiveDebugVariables.cpp \
 	LiveInterval.cpp \
 	LiveIntervalAnalysis.cpp \
@@ -84,6 +86,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	OptimizePHIs.cpp \
 	PHIElimination.cpp \
 	PHIEliminationUtils.cpp \
+	ParallelCG.cpp \
 	Passes.cpp \
 	PeepholeOptimizer.cpp \
 	PostRASchedulerList.cpp \
@@ -134,6 +137,7 @@ SRCS+=	GCMetadataPrinter.cpp \
 	GCStrategy.cpp
 .endif
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile
index 1d57ecc..dc9ce47 100644
--- a/lib/clang/libllvmcore/Makefile
+++ b/lib/clang/libllvmcore/Makefile
@@ -23,6 +23,7 @@ SRCS=	AsmWriter.cpp \
 	DiagnosticPrinter.cpp \
 	Dominators.cpp \
 	Function.cpp \
+	FunctionInfo.cpp \
 	GCOV.cpp \
 	GVMaterializer.cpp \
 	Globals.cpp \
@@ -38,7 +39,6 @@ SRCS=	AsmWriter.cpp \
 	MDBuilder.cpp \
 	Mangler.cpp \
 	Metadata.cpp \
-	MetadataTracking.cpp \
 	Module.cpp \
 	Operator.cpp \
 	Pass.cpp \
@@ -57,6 +57,8 @@ SRCS=	AsmWriter.cpp \
 SRCS+=	PassManager.cpp
 .endif
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	AttributesCompatFunc \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmdebuginfodwarf/Makefile b/lib/clang/libllvmdebuginfodwarf/Makefile
index 5f52f33..6af9703 100644
--- a/lib/clang/libllvmdebuginfodwarf/Makefile
+++ b/lib/clang/libllvmdebuginfodwarf/Makefile
@@ -16,10 +16,12 @@ SRCS=	DWARFAbbreviationDeclaration.cpp \
 	DWARFDebugInfoEntry.cpp \
 	DWARFDebugLine.cpp \
 	DWARFDebugLoc.cpp \
+	DWARFDebugMacro.cpp \
 	DWARFDebugRangeList.cpp \
 	DWARFFormValue.cpp \
 	DWARFTypeUnit.cpp \
 	DWARFUnit.cpp \
+	DWARFUnitIndex.cpp \
 	SyntaxHighlighting.cpp
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmexecutionengine/Makefile b/lib/clang/libllvmexecutionengine/Makefile
index 13855a0..304473b 100644
--- a/lib/clang/libllvmexecutionengine/Makefile
+++ b/lib/clang/libllvmexecutionengine/Makefile
@@ -11,4 +11,6 @@ SRCS=	ExecutionEngine.cpp \
 	SectionMemoryManager.cpp \
 	TargetSelect.cpp
 
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvminstcombine/Makefile b/lib/clang/libllvminstcombine/Makefile
index 3752aef..a23b60b 100644
--- a/lib/clang/libllvminstcombine/Makefile
+++ b/lib/clang/libllvminstcombine/Makefile
@@ -19,6 +19,7 @@ SRCS=	InstCombineAddSub.cpp \
 	InstCombineVectorOps.cpp \
 	InstructionCombining.cpp
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvminstrumentation/Makefile b/lib/clang/libllvminstrumentation/Makefile
index 82730b0..c38e9e2 100644
--- a/lib/clang/libllvminstrumentation/Makefile
+++ b/lib/clang/libllvminstrumentation/Makefile
@@ -9,16 +9,15 @@ SRCS=	AddressSanitizer.cpp \
 	BoundsChecking.cpp \
 	DataFlowSanitizer.cpp \
 	GCOVProfiling.cpp \
-	MemorySanitizer.cpp \
 	InstrProfiling.cpp \
+	Instrumentation.cpp \
+	MemorySanitizer.cpp \
+	PGOInstrumentation.cpp \
 	SafeStack.cpp \
 	SanitizerCoverage.cpp \
 	ThreadSanitizer.cpp
 
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	Instrumentation.cpp
-.endif
-
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvminterpreter/Makefile b/lib/clang/libllvminterpreter/Makefile
index 06fcca4..52880e0 100644
--- a/lib/clang/libllvminterpreter/Makefile
+++ b/lib/clang/libllvminterpreter/Makefile
@@ -9,6 +9,7 @@ SRCS=	Execution.cpp \
 	ExternalFunctions.cpp \
 	Interpreter.cpp \
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmipa/Makefile b/lib/clang/libllvmipa/Makefile
deleted file mode 100644
index 3380cf3..0000000
--- a/lib/clang/libllvmipa/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmipa
-
-SRCDIR=	lib/Analysis/IPA
-SRCS=	CallGraph.cpp \
-	CallGraphSCCPass.cpp \
-	CallPrinter.cpp \
-	GlobalsModRef.cpp \
-	InlineCost.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	IPA.cpp
-.endif
-
-TGHDRS=	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmipa/Makefile.depend b/lib/clang/libllvmipa/Makefile.depend
deleted file mode 100644
index 385072f..0000000
--- a/lib/clang/libllvmipa/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile
index 16e1c3a..0913402 100644
--- a/lib/clang/libllvmipo/Makefile
+++ b/lib/clang/libllvmipo/Makefile
@@ -8,13 +8,17 @@ SRCDIR=	lib/Transforms/IPO
 SRCS=	ArgumentPromotion.cpp \
 	BarrierNoopPass.cpp \
 	ConstantMerge.cpp \
+	CrossDSOCFI.cpp \
 	DeadArgumentElimination.cpp \
 	ElimAvailExtern.cpp \
 	ExtractGV.cpp \
+	ForceFunctionAttrs.cpp \
 	FunctionAttrs.cpp \
+	FunctionImport.cpp \
 	GlobalDCE.cpp \
 	GlobalOpt.cpp \
 	IPConstantPropagation.cpp \
+	InferFunctionAttrs.cpp \
 	InlineAlways.cpp \
 	InlineSimple.cpp \
 	Inliner.cpp \
@@ -25,6 +29,7 @@ SRCS=	ArgumentPromotion.cpp \
 	PartialInlining.cpp \
 	PassManagerBuilder.cpp \
 	PruneEH.cpp \
+	SampleProfile.cpp \
 	StripDeadPrototypes.cpp \
 	StripSymbols.cpp
 
@@ -32,6 +37,7 @@ SRCS=	ArgumentPromotion.cpp \
 SRCS+=	IPO.cpp
 .endif
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmirreader/Makefile b/lib/clang/libllvmirreader/Makefile
index d9f7e69..8f89947 100644
--- a/lib/clang/libllvmirreader/Makefile
+++ b/lib/clang/libllvmirreader/Makefile
@@ -7,4 +7,6 @@ LIB=	llvmirreader
 SRCDIR=	lib/IRReader
 SRCS=	IRReader.cpp
 
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlinker/Makefile b/lib/clang/libllvmlinker/Makefile
index 711b369..eed5a3c 100644
--- a/lib/clang/libllvmlinker/Makefile
+++ b/lib/clang/libllvmlinker/Makefile
@@ -5,6 +5,9 @@
 LIB=	llvmlinker
 
 SRCDIR=	lib/Linker
-SRCS=	LinkModules.cpp
+SRCS=	IRMover.cpp \
+	LinkModules.cpp
+
+TGHDRS=	Attributes
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlto/Makefile b/lib/clang/libllvmlto/Makefile
index 776c45f..c7cb9da 100644
--- a/lib/clang/libllvmlto/Makefile
+++ b/lib/clang/libllvmlto/Makefile
@@ -8,6 +8,7 @@ SRCDIR=	lib/LTO
 SRCS=	LTOCodeGenerator.cpp \
 	LTOModule.cpp
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
index 5acd2cc..7b70a06 100644
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@@ -21,6 +21,7 @@ SRCS=	ConstantPools.cpp \
 	MCELFObjectTargetWriter.cpp \
 	MCELFStreamer.cpp \
 	MCExpr.cpp \
+	MCFragment.cpp \
 	MCInst.cpp \
 	MCInstPrinter.cpp \
 	MCInstrAnalysis.cpp \
diff --git a/lib/clang/libllvmmcjit/Makefile b/lib/clang/libllvmmcjit/Makefile
index 207fd81..632dd5e 100644
--- a/lib/clang/libllvmmcjit/Makefile
+++ b/lib/clang/libllvmmcjit/Makefile
@@ -7,4 +7,6 @@ LIB=	llvmmcjit
 SRCDIR=	lib/ExecutionEngine/MCJIT
 SRCS=	MCJIT.cpp
 
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsasmparser/Makefile b/lib/clang/libllvmmipsasmparser/Makefile
index 0572f8d..b6b87bf 100644
--- a/lib/clang/libllvmmipsasmparser/Makefile
+++ b/lib/clang/libllvmmipsasmparser/Makefile
@@ -8,7 +8,8 @@ SRCDIR=	lib/Target/Mips/AsmParser
 INCDIR=	lib/Target/Mips
 SRCS=	MipsAsmParser.cpp
 
-TGHDRS=	MipsGenAsmMatcher \
+TGHDRS=	Attributes \
+	MipsGenAsmMatcher \
 	MipsGenInstrInfo \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
diff --git a/lib/clang/libllvmmipsinstprinter/Makefile b/lib/clang/libllvmmipsasmprinter/Makefile
index 39df7cc..94cd25f 100644
--- a/lib/clang/libllvmmipsinstprinter/Makefile
+++ b/lib/clang/libllvmmipsasmprinter/Makefile
@@ -2,13 +2,14 @@
 
 .include <bsd.own.mk>
 
-LIB=	llvmmipsinstprinter
+LIB=	llvmmipsasmprinter
 
 SRCDIR=	lib/Target/Mips/InstPrinter
 INCDIR=	lib/Target/Mips
 SRCS=	MipsInstPrinter.cpp
 
-TGHDRS=	MipsGenAsmWriter \
+TGHDRS=	Attributes \
+	MipsGenAsmWriter \
 	MipsGenInstrInfo \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
diff --git a/lib/clang/libllvmmipsasmprinter/Makefile.depend b/lib/clang/libllvmmipsasmprinter/Makefile.depend
new file mode 100644
index 0000000..2426018
--- /dev/null
+++ b/lib/clang/libllvmmipsasmprinter/Makefile.depend
@@ -0,0 +1,24 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+MipsInstPrinter.o: MipsGenAsmWriter.inc.h
+MipsInstPrinter.o: MipsGenInstrInfo.inc.h
+MipsInstPrinter.o: MipsGenRegisterInfo.inc.h
+MipsInstPrinter.o: MipsGenSubtargetInfo.inc.h
+MipsInstPrinter.po: MipsGenAsmWriter.inc.h
+MipsInstPrinter.po: MipsGenInstrInfo.inc.h
+MipsInstPrinter.po: MipsGenRegisterInfo.inc.h
+MipsInstPrinter.po: MipsGenSubtargetInfo.inc.h
+.endif
diff --git a/lib/clang/libllvmmipscodegen/Makefile b/lib/clang/libllvmmipscodegen/Makefile
index b40b65c..95e8b35 100644
--- a/lib/clang/libllvmmipscodegen/Makefile
+++ b/lib/clang/libllvmmipscodegen/Makefile
@@ -38,7 +38,8 @@ SRCS=	Mips16FrameLowering.cpp \
 	MipsTargetMachine.cpp \
 	MipsTargetObjectFile.cpp
 
-TGHDRS=	Intrinsics \
+TGHDRS=	Attributes \
+	Intrinsics \
 	MipsGenAsmWriter \
 	MipsGenCallingConv \
 	MipsGenCodeEmitter \
diff --git a/lib/clang/libllvmmipsdesc/Makefile b/lib/clang/libllvmmipsdesc/Makefile
index f22ff80..19c585f 100644
--- a/lib/clang/libllvmmipsdesc/Makefile
+++ b/lib/clang/libllvmmipsdesc/Makefile
@@ -19,7 +19,8 @@ SRCS=	MipsABIFlagsSection.cpp \
 	MipsTargetStreamer.cpp
 CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
 
-TGHDRS=	MipsGenInstrInfo \
+TGHDRS=	Attributes \
+	MipsGenInstrInfo \
 	MipsGenMCCodeEmitter \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
diff --git a/lib/clang/libllvmmipsdisassembler/Makefile b/lib/clang/libllvmmipsdisassembler/Makefile
index 41d2062..8a6006d 100644
--- a/lib/clang/libllvmmipsdisassembler/Makefile
+++ b/lib/clang/libllvmmipsdisassembler/Makefile
@@ -8,7 +8,9 @@ SRCDIR=	lib/Target/Mips/Disassembler
 INCDIR=	lib/Target/Mips
 SRCS=	MipsDisassembler.cpp
 
-TGHDRS=	MipsGenDisassemblerTables \
+TGHDRS=	Attributes \
+	Intrinsics \
+	MipsGenDisassemblerTables \
 	MipsGenInstrInfo \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
diff --git a/lib/clang/libllvmmipsinfo/Makefile b/lib/clang/libllvmmipsinfo/Makefile
index c65c8c8..be8d588 100644
--- a/lib/clang/libllvmmipsinfo/Makefile
+++ b/lib/clang/libllvmmipsinfo/Makefile
@@ -8,7 +8,8 @@ SRCDIR=	lib/Target/Mips/TargetInfo
 INCDIR=	lib/Target/Mips
 SRCS=	MipsTargetInfo.cpp
 
-TGHDRS=	MipsGenInstrInfo \
+TGHDRS=	Attributes \
+	MipsGenInstrInfo \
 	MipsGenRegisterInfo \
 	MipsGenSubtargetInfo
 
diff --git a/lib/clang/libllvmmipsinstprinter/Makefile.depend b/lib/clang/libllvmmipsinstprinter/Makefile.depend
deleted file mode 100644
index 385072f..0000000
--- a/lib/clang/libllvmmipsinstprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmirparser/Makefile b/lib/clang/libllvmmirparser/Makefile
index a3a64c6..4632441 100644
--- a/lib/clang/libllvmmirparser/Makefile
+++ b/lib/clang/libllvmmirparser/Makefile
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.own.mk>
 
 LIB=	llvmmirparser
 
 SRCDIR=	lib/CodeGen/MIRParser
-SRCS=	MIParser.cpp \
+SRCS=	MILexer.cpp \
+	MIParser.cpp \
 	MIRParser.cpp
 
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	MILexer.cpp
-.endif
-	
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmobjcarcopts/Makefile b/lib/clang/libllvmobjcarcopts/Makefile
index 308e11a..b88c5b5 100644
--- a/lib/clang/libllvmobjcarcopts/Makefile
+++ b/lib/clang/libllvmobjcarcopts/Makefile
@@ -1,15 +1,12 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 LIB=	llvmobjcarcopts
 
 SRCDIR=	lib/Transforms/ObjCARC
-SRCS=	ARCInstKind.cpp \
-	DependencyAnalysis.cpp \
-	ObjCARC.cpp \
+SRCS=	DependencyAnalysis.cpp \
 	ObjCARCAPElim.cpp \
-	ObjCARCAliasAnalysis.cpp \
 	ObjCARCContract.cpp \
 	ObjCARCExpand.cpp \
 	ObjCARCOpts.cpp \
@@ -17,6 +14,11 @@ SRCS=	ARCInstKind.cpp \
 	ProvenanceAnalysisEvaluator.cpp \
 	PtrState.cpp
 
-TGHDRS=	Intrinsics
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	ObjCARC.cpp
+.endif
+
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmobject/Makefile b/lib/clang/libllvmobject/Makefile
index c575ecd..f7864d2 100644
--- a/lib/clang/libllvmobject/Makefile
+++ b/lib/clang/libllvmobject/Makefile
@@ -14,6 +14,7 @@ SRCS=	Archive.cpp \
 	ELFObjectFile.cpp \
 	ELFYAML.cpp \
 	Error.cpp \
+	FunctionIndexObjectFile.cpp \
 	IRObjectFile.cpp \
 	MachOObjectFile.cpp \
 	MachOUniversal.cpp \
@@ -25,5 +26,7 @@ SRCS=	Archive.cpp \
 SRCS+=	Object.cpp \
 	SymbolSize.cpp
 .endif
+
+TGHDRS=	Attributes
 	
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmorcjit/Makefile b/lib/clang/libllvmorcjit/Makefile
index 84621de..3d15b85 100644
--- a/lib/clang/libllvmorcjit/Makefile
+++ b/lib/clang/libllvmorcjit/Makefile
@@ -7,7 +7,15 @@ LIB=	llvmorcjit
 SRCDIR=	lib/ExecutionEngine/Orc
 SRCS=	ExecutionUtils.cpp \
 	IndirectionUtils.cpp \
+	NullResolver.cpp \
+	OrcArchitectureSupport.cpp \
+	OrcCBindings.cpp \
+	OrcCBindingsStack.cpp \
+	OrcError.cpp \
 	OrcMCJITReplacement.cpp \
-	OrcTargetSupport.cpp
+	OrcRemoteTargetRPCAPI.cpp
+
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpasses/Makefile b/lib/clang/libllvmpasses/Makefile
index ed4e20d..eba54f6 100644
--- a/lib/clang/libllvmpasses/Makefile
+++ b/lib/clang/libllvmpasses/Makefile
@@ -7,6 +7,7 @@ LIB=	llvmpasses
 SRCDIR=	lib/Passes
 SRCS=	PassBuilder.cpp
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile b/lib/clang/libllvmpowerpcasmprinter/Makefile
index ac98321..0fa17e0 100644
--- a/lib/clang/libllvmpowerpcinstprinter/Makefile
+++ b/lib/clang/libllvmpowerpcasmprinter/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-LIB=	llvmpowerpcinstprinter
+LIB=	llvmpowerpcasmprinter
 
 SRCDIR=	lib/Target/PowerPC/InstPrinter
 INCDIR=	lib/Target/PowerPC
diff --git a/lib/clang/libllvmpowerpcasmprinter/Makefile.depend b/lib/clang/libllvmpowerpcasmprinter/Makefile.depend
new file mode 100644
index 0000000..9ddadfa
--- /dev/null
+++ b/lib/clang/libllvmpowerpcasmprinter/Makefile.depend
@@ -0,0 +1,24 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+PPCInstPrinter.o: PPCGenAsmWriter.inc.h
+PPCInstPrinter.o: PPCGenInstrInfo.inc.h
+PPCInstPrinter.o: PPCGenRegisterInfo.inc.h
+PPCInstPrinter.o: PPCGenSubtargetInfo.inc.h
+PPCInstPrinter.po: PPCGenAsmWriter.inc.h
+PPCInstPrinter.po: PPCGenInstrInfo.inc.h
+PPCInstPrinter.po: PPCGenRegisterInfo.inc.h
+PPCInstPrinter.po: PPCGenSubtargetInfo.inc.h
+.endif
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile b/lib/clang/libllvmpowerpccodegen/Makefile
index ea83b75..d0ec3cd 100644
--- a/lib/clang/libllvmpowerpccodegen/Makefile
+++ b/lib/clang/libllvmpowerpccodegen/Makefile
@@ -6,6 +6,7 @@ LIB=	llvmpowerpccodegen
 
 SRCDIR=	lib/Target/PowerPC
 SRCS=	PPCAsmPrinter.cpp \
+	PPCBoolRetToInt.cpp \
 	PPCBranchSelector.cpp \
 	PPCCTRLoops.cpp \
 	PPCEarlyReturn.cpp \
@@ -18,6 +19,7 @@ SRCS=	PPCAsmPrinter.cpp \
 	PPCLoopDataPrefetch.cpp \
 	PPCLoopPreIncPrep.cpp \
 	PPCMCInstLower.cpp \
+	PPCMIPeephole.cpp \
 	PPCMachineFunctionInfo.cpp \
 	PPCRegisterInfo.cpp \
 	PPCSubtarget.cpp \
@@ -30,7 +32,8 @@ SRCS=	PPCAsmPrinter.cpp \
 	PPCVSXFMAMutate.cpp \
 	PPCVSXSwapRemoval.cpp
 
-TGHDRS=	Intrinsics \
+TGHDRS=	Attributes \
+	Intrinsics \
 	PPCGenCallingConv \
 	PPCGenCodeEmitter \
 	PPCGenDAGISel \
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile b/lib/clang/libllvmpowerpcinfo/Makefile
index 03bba0e..db15776 100644
--- a/lib/clang/libllvmpowerpcinfo/Makefile
+++ b/lib/clang/libllvmpowerpcinfo/Makefile
@@ -8,7 +8,8 @@ SRCDIR=	lib/Target/PowerPC/TargetInfo
 INCDIR=	lib/Target/PowerPC
 SRCS=	PowerPCTargetInfo.cpp
 
-TGHDRS=	PPCGenInstrInfo \
+TGHDRS=	Attributes \
+	PPCGenInstrInfo \
 	PPCGenRegisterInfo \
 	PPCGenSubtargetInfo
 
diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
deleted file mode 100644
index 385072f..0000000
--- a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmprofiledata/Makefile b/lib/clang/libllvmprofiledata/Makefile
index a38a190..f7b3b19 100644
--- a/lib/clang/libllvmprofiledata/Makefile
+++ b/lib/clang/libllvmprofiledata/Makefile
@@ -18,4 +18,6 @@ SRCS=	CoverageMapping.cpp \
 SRCS+=	SampleProfWriter.cpp
 .endif
 
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile
index 8579df9..a05916e 100644
--- a/lib/clang/libllvmscalaropts/Makefile
+++ b/lib/clang/libllvmscalaropts/Makefile
@@ -26,6 +26,7 @@ SRCS=	ADCE.cpp \
 	LoopDistribute.cpp \
 	LoopIdiomRecognize.cpp \
 	LoopInterchange.cpp \
+	LoopLoadElimination.cpp \
 	LoopRerollPass.cpp \
 	LoopRotation.cpp \
 	LoopStrengthReduce.cpp \
@@ -43,7 +44,6 @@ SRCS=	ADCE.cpp \
 	RewriteStatepointsForGC.cpp \
 	SCCP.cpp \
 	SROA.cpp \
-	SampleProfile.cpp \
 	ScalarReplAggregates.cpp \
 	Scalarizer.cpp \
 	SeparateConstOffsetFromGEP.cpp \
@@ -59,6 +59,7 @@ SRCS+=	LoopInstSimplify.cpp \
 	Scalar.cpp
 .endif
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmselectiondag/Makefile b/lib/clang/libllvmselectiondag/Makefile
index b73a1c5..ed34251 100644
--- a/lib/clang/libllvmselectiondag/Makefile
+++ b/lib/clang/libllvmselectiondag/Makefile
@@ -30,6 +30,7 @@ SRCS=	DAGCombiner.cpp \
 	TargetLowering.cpp \
 	TargetSelectionDAGInfo.cpp
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsparcinstprinter/Makefile b/lib/clang/libllvmsparcasmprinter/Makefile
index e15c55e..6144fd4 100644
--- a/lib/clang/libllvmsparcinstprinter/Makefile
+++ b/lib/clang/libllvmsparcasmprinter/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-LIB=	llvmsparcinstprinter
+LIB=	llvmsparcasmprinter
 
 SRCDIR=	lib/Target/Sparc/InstPrinter
 INCDIR=	lib/Target/Sparc
diff --git a/lib/clang/libllvmsparcasmprinter/Makefile.depend b/lib/clang/libllvmsparcasmprinter/Makefile.depend
new file mode 100644
index 0000000..6571fb4
--- /dev/null
+++ b/lib/clang/libllvmsparcasmprinter/Makefile.depend
@@ -0,0 +1,24 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+SparcInstPrinter.o: SparcGenAsmWriter.inc.h
+SparcInstPrinter.o: SparcGenInstrInfo.inc.h
+SparcInstPrinter.o: SparcGenRegisterInfo.inc.h
+SparcInstPrinter.o: SparcGenSubtargetInfo.inc.h
+SparcInstPrinter.po: SparcGenAsmWriter.inc.h
+SparcInstPrinter.po: SparcGenInstrInfo.inc.h
+SparcInstPrinter.po: SparcGenRegisterInfo.inc.h
+SparcInstPrinter.po: SparcGenSubtargetInfo.inc.h
+.endif
diff --git a/lib/clang/libllvmsparccodegen/Makefile b/lib/clang/libllvmsparccodegen/Makefile
index 35b1310..4c42a70 100644
--- a/lib/clang/libllvmsparccodegen/Makefile
+++ b/lib/clang/libllvmsparccodegen/Makefile
@@ -18,7 +18,8 @@ SRCS=	DelaySlotFiller.cpp \
 	SparcTargetMachine.cpp \
 	SparcTargetObjectFile.cpp
 
-TGHDRS=	Intrinsics \
+TGHDRS=	Attributes \
+	Intrinsics \
 	SparcGenAsmWriter \
 	SparcGenCallingConv \
 	SparcGenCodeEmitter \
diff --git a/lib/clang/libllvmsparcdisassembler/Makefile b/lib/clang/libllvmsparcdisassembler/Makefile
index a388ff2..1913ee6 100644
--- a/lib/clang/libllvmsparcdisassembler/Makefile
+++ b/lib/clang/libllvmsparcdisassembler/Makefile
@@ -8,7 +8,9 @@ SRCDIR=	lib/Target/Sparc/Disassembler
 INCDIR=	lib/Target/Sparc
 SRCS=	SparcDisassembler.cpp
 
-TGHDRS=	SparcGenDisassemblerTables \
+TGHDRS=	Attributes \
+	Intrinsics \
+	SparcGenDisassemblerTables \
 	SparcGenInstrInfo \
 	SparcGenRegisterInfo \
 	SparcGenSubtargetInfo
diff --git a/lib/clang/libllvmsparcinfo/Makefile b/lib/clang/libllvmsparcinfo/Makefile
index 6c8052e..46791f9 100644
--- a/lib/clang/libllvmsparcinfo/Makefile
+++ b/lib/clang/libllvmsparcinfo/Makefile
@@ -8,7 +8,8 @@ SRCDIR=	lib/Target/Sparc/TargetInfo
 INCDIR=	lib/Target/Sparc
 SRCS=	SparcTargetInfo.cpp
 
-TGHDRS=	SparcGenInstrInfo \
+TGHDRS=	Attributes \
+	SparcGenInstrInfo \
 	SparcGenRegisterInfo \
 	SparcGenSubtargetInfo
 
diff --git a/lib/clang/libllvmsparcinstprinter/Makefile.depend b/lib/clang/libllvmsparcinstprinter/Makefile.depend
deleted file mode 100644
index 385072f..0000000
--- a/lib/clang/libllvmsparcinstprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index 860285b..c828073 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -34,6 +34,7 @@ SRCS=	APFloat.cpp \
 	IntEqClasses.cpp \
 	IntervalMap.cpp \
 	IntrusiveRefCntPtr.cpp \
+	JamCRC.cpp \
 	LEB128.cpp \
 	LineIterator.cpp \
 	Locale.cpp \
@@ -64,7 +65,6 @@ SRCS=	APFloat.cpp \
 	StreamingMemoryObject.cpp \
 	StringExtras.cpp \
 	StringMap.cpp \
-	StringPool.cpp \
 	StringRef.cpp \
 	StringSaver.cpp \
 	TargetParser.cpp \
@@ -96,6 +96,7 @@ SRCS+=	ARMWinEH.cpp \
 	FileOutputBuffer.cpp \
 	FileUtilities.cpp \
 	SystemUtils.cpp \
+	ThreadPool.cpp \
 	Watchdog.cpp
 .endif
 
@@ -103,6 +104,10 @@ SRCS+=	ARMWinEH.cpp \
 SRCS+=	Memory.cpp
 .endif
 
+.if ${MK_LLDB} != "no"
+SRCS+=	StringPool.cpp
+.endif
+
 .include "../clang.lib.mk"
 
 # Ugly hack to work around CLOCK_PROCESS_CPUTIME_ID not being properly defined
diff --git a/lib/clang/libllvmsymbolize/Makefile b/lib/clang/libllvmsymbolize/Makefile
new file mode 100644
index 0000000..88a73c1
--- /dev/null
+++ b/lib/clang/libllvmsymbolize/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	llvmsymbolize
+
+SRCDIR=	lib/DebugInfo/Symbolize
+SRCS=	DIPrinter.cpp \
+	SymbolizableObjectFile.cpp \
+	Symbolize.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtarget/Makefile b/lib/clang/libllvmtarget/Makefile
index 82410e0..25f977b 100644
--- a/lib/clang/libllvmtarget/Makefile
+++ b/lib/clang/libllvmtarget/Makefile
@@ -16,6 +16,7 @@ SRCS=	Target.cpp \
 SRCS+=	TargetIntrinsicInfo.cpp
 .endif
 	
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile
index f5043e6..ecb8d1c 100644
--- a/lib/clang/libllvmtransformutils/Makefile
+++ b/lib/clang/libllvmtransformutils/Makefile
@@ -40,6 +40,7 @@ SRCS=	ASanStackFrameLayout.cpp \
 	SimplifyIndVar.cpp \
 	SimplifyInstructions.cpp \
 	SimplifyLibCalls.cpp \
+	SplitModule.cpp \
 	SymbolRewriter.cpp \
 	UnifyFunctionExitNodes.cpp \
 	ValueMapper.cpp
@@ -48,6 +49,7 @@ SRCS=	ASanStackFrameLayout.cpp \
 SRCS+=	Utils.cpp
 .endif
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmvectorize/Makefile b/lib/clang/libllvmvectorize/Makefile
index bfe1a10..0bca448 100644
--- a/lib/clang/libllvmvectorize/Makefile
+++ b/lib/clang/libllvmvectorize/Makefile
@@ -13,6 +13,7 @@ SRCS=	BBVectorize.cpp \
 SRCS+=	Vectorize.cpp
 .endif
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86instprinter/Makefile b/lib/clang/libllvmx86asmprinter/Makefile
index 308f91c..aa4d31b 100644
--- a/lib/clang/libllvmx86instprinter/Makefile
+++ b/lib/clang/libllvmx86asmprinter/Makefile
@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-LIB=	llvmx86instprinter
+LIB=	llvmx86asmprinter
 
 SRCDIR=	lib/Target/X86/InstPrinter
 INCDIR=	lib/Target/X86
diff --git a/lib/clang/libllvmx86asmprinter/Makefile.depend b/lib/clang/libllvmx86asmprinter/Makefile.depend
new file mode 100644
index 0000000..dfc7c0f
--- /dev/null
+++ b/lib/clang/libllvmx86asmprinter/Makefile.depend
@@ -0,0 +1,38 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libc++ \
+	lib/msun \
+	usr.bin/clang/tblgen.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+X86ATTInstPrinter.o: X86GenAsmWriter.inc.h
+X86ATTInstPrinter.o: X86GenInstrInfo.inc.h
+X86ATTInstPrinter.o: X86GenRegisterInfo.inc.h
+X86ATTInstPrinter.o: X86GenSubtargetInfo.inc.h
+X86ATTInstPrinter.po: X86GenAsmWriter.inc.h
+X86ATTInstPrinter.po: X86GenInstrInfo.inc.h
+X86ATTInstPrinter.po: X86GenRegisterInfo.inc.h
+X86ATTInstPrinter.po: X86GenSubtargetInfo.inc.h
+X86InstComments.o: X86GenInstrInfo.inc.h
+X86InstComments.o: X86GenRegisterInfo.inc.h
+X86InstComments.o: X86GenSubtargetInfo.inc.h
+X86InstComments.po: X86GenInstrInfo.inc.h
+X86InstComments.po: X86GenRegisterInfo.inc.h
+X86InstComments.po: X86GenSubtargetInfo.inc.h
+X86IntelInstPrinter.o: X86GenAsmWriter1.inc.h
+X86IntelInstPrinter.o: X86GenInstrInfo.inc.h
+X86IntelInstPrinter.o: X86GenRegisterInfo.inc.h
+X86IntelInstPrinter.o: X86GenSubtargetInfo.inc.h
+X86IntelInstPrinter.po: X86GenAsmWriter1.inc.h
+X86IntelInstPrinter.po: X86GenInstrInfo.inc.h
+X86IntelInstPrinter.po: X86GenRegisterInfo.inc.h
+X86IntelInstPrinter.po: X86GenSubtargetInfo.inc.h
+.endif
diff --git a/lib/clang/libllvmx86codegen/Makefile b/lib/clang/libllvmx86codegen/Makefile
index 0f6776a..4db7e94 100644
--- a/lib/clang/libllvmx86codegen/Makefile
+++ b/lib/clang/libllvmx86codegen/Makefile
@@ -17,9 +17,11 @@ SRCS=	X86AsmPrinter.cpp \
 	X86InstrInfo.cpp \
 	X86MCInstLower.cpp \
 	X86MachineFunctionInfo.cpp \
+	X86OptimizeLEAs.cpp \
 	X86PadShortFunction.cpp \
 	X86RegisterInfo.cpp \
 	X86SelectionDAGInfo.cpp \
+	X86ShuffleDecodeConstantPool.cpp \
 	X86Subtarget.cpp \
 	X86TargetMachine.cpp \
 	X86TargetObjectFile.cpp \
@@ -27,7 +29,8 @@ SRCS=	X86AsmPrinter.cpp \
 	X86VZeroUpper.cpp \
 	X86WinEHState.cpp
 
-TGHDRS=	Intrinsics \
+TGHDRS=	Attributes \
+	Intrinsics \
 	X86GenCallingConv \
 	X86GenDAGISel \
 	X86GenFastISel \
diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
index 23ec976..5470d9f 100644
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ b/lib/clang/libllvmx86disassembler/Makefile
@@ -6,11 +6,8 @@ LIB=	llvmx86disassembler
 
 SRCDIR=	lib/Target/X86/Disassembler
 INCDIR=	lib/Target/X86
-SRCS=	X86Disassembler.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+=	X86DisassemblerDecoder.cpp
-.endif
+SRCS=	X86Disassembler.cpp \
+	X86DisassemblerDecoder.cpp
 
 TGHDRS=	X86GenDisassemblerTables \
 	X86GenInstrInfo \
diff --git a/lib/clang/libllvmx86instprinter/Makefile.depend b/lib/clang/libllvmx86instprinter/Makefile.depend
deleted file mode 100644
index 385072f..0000000
--- a/lib/clang/libllvmx86instprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index aa16b96..8673a2b 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -502,6 +502,20 @@ clnt_vc_abort(CLIENT *cl)
 {
 }
 
+static __inline void
+htonlp(void *dst, const void *src, uint32_t incr)
+{
+	/* We are aligned, so we think */
+	*(uint32_t *)dst = htonl(*(const uint32_t *)src + incr);
+}
+
+static __inline void
+ntohlp(void *dst, const void *src)
+{
+	/* We are aligned, so we think */
+	*(uint32_t *)dst = htonl(*(const uint32_t *)src);
+}
+
 static bool_t
 clnt_vc_control(CLIENT *cl, u_int request, void *info)
 {
@@ -576,14 +590,12 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info)
 		 * first element in the call structure
 		 * This will get the xid of the PREVIOUS call
 		 */
-		*(u_int32_t *)info =
-		    ntohl(*(u_int32_t *)(void *)&ct->ct_u.ct_mcalli);
+		ntohlp(info, &ct->ct_u.ct_mcalli);
 		break;
 	case CLSET_XID:
 		/* This will set the xid of the NEXT call */
-		*(u_int32_t *)(void *)&ct->ct_u.ct_mcalli =
-		    htonl(*((u_int32_t *)info) + 1);
 		/* increment by 1 as clnt_vc_call() decrements once */
+		htonlp(&ct->ct_u.ct_mcalli, info, 1);
 		break;
 	case CLGET_VERS:
 		/*
@@ -592,15 +604,11 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info)
 		 * begining of the RPC header. MUST be changed if the
 		 * call_struct is changed
 		 */
-		*(u_int32_t *)info =
-		    ntohl(*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    4 * BYTES_PER_XDR_UNIT));
+		ntohlp(info, ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT);
 		break;
 
 	case CLSET_VERS:
-		*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    4 * BYTES_PER_XDR_UNIT) =
-		    htonl(*(u_int32_t *)info);
+		htonlp(ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT, info, 0);
 		break;
 
 	case CLGET_PROG:
@@ -610,15 +618,11 @@ clnt_vc_control(CLIENT *cl, u_int request, void *info)
 		 * begining of the RPC header. MUST be changed if the
 		 * call_struct is changed
 		 */
-		*(u_int32_t *)info =
-		    ntohl(*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    3 * BYTES_PER_XDR_UNIT));
+		ntohlp(info, ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT);
 		break;
 
 	case CLSET_PROG:
-		*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    3 * BYTES_PER_XDR_UNIT) =
-		    htonl(*(u_int32_t *)info);
+		htonlp(ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT, info, 0);
 		break;
 
 	default:
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index 37bc9a3..7c40c36 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -61,8 +61,8 @@ __FBSDID("$FreeBSD$");
 
 extern int _rpc_dtablesize( void );
 
-#define NYEARS	(unsigned long)(1970 - 1900)
-#define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4)))
+#define	NYEARS	(unsigned long)(1970 - 1900)
+#define	TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4)))
 
 static void do_close( int );
 
@@ -98,11 +98,11 @@ rtime(struct sockaddr_in *addrp, struct timeval *timep,
 	addrp->sin_port = serv->s_port;
 
 	if (type == SOCK_DGRAM) {
-		res = _sendto(s, (char *)&thetime, sizeof(thetime), 0, 
+		res = _sendto(s, (char *)&thetime, sizeof(thetime), 0,
 			     (struct sockaddr *)addrp, sizeof(*addrp));
 		if (res < 0) {
 			do_close(s);
-			return(-1);	
+			return(-1);
 		}
 		do {
 			FD_ZERO(&readfds);
@@ -115,14 +115,14 @@ rtime(struct sockaddr_in *addrp, struct timeval *timep,
 				errno = ETIMEDOUT;
 			}
 			do_close(s);
-			return(-1);	
+			return(-1);
 		}
 		fromlen = sizeof(from);
-		res = _recvfrom(s, (char *)&thetime, sizeof(thetime), 0, 
+		res = _recvfrom(s, (char *)&thetime, sizeof(thetime), 0,
 			       (struct sockaddr *)&from, &fromlen);
 		do_close(s);
 		if (res < 0) {
-			return(-1);	
+			return(-1);
 		}
 	} else {
 		if (_connect(s, (struct sockaddr *)addrp, sizeof(*addrp)) < 0) {
@@ -137,7 +137,7 @@ rtime(struct sockaddr_in *addrp, struct timeval *timep,
 	}
 	if (res != sizeof(thetime)) {
 		errno = EIO;
-		return(-1);	
+		return(-1);
 	}
 	thetime = ntohl(thetime);
 	timep->tv_sec = thetime - TOFFSET;
diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile
index ce86dc1..8322db1 100644
--- a/lib/libclang_rt/Makefile
+++ b/lib/libclang_rt/Makefile
@@ -6,6 +6,7 @@
 SUBDIR+= include\
 	 asan\
 	 asan-preinit\
+	 asan_dynamic\
 	 asan_cxx\
 	 safestack\
 	 ubsan_standalone\
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index 1e656d9..cd1e791 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -5,7 +5,7 @@
 CRTARCH=${MACHINE_CPUARCH:C/amd64/x86_64/}
 CRTSRC=${.CURDIR}/../../../contrib/compiler-rt
 
-CLANGDIR=/usr/lib/clang/3.7.1
+CLANGDIR=/usr/lib/clang/3.8.0
 LIBDIR=${CLANGDIR}/lib/freebsd
 
 NO_PIC=
diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index 3090c93..c8097f8 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -75,7 +75,6 @@ SRCS=	asan_preinit.cc\
 	sanitizer_stoptheworld_linux_libcdep.cc\
 	sanitizer_symbolizer_libcdep.cc\
 	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_symbolizer_process_libcdep.cc\
 	sanitizer_unwind_linux_libcdep.cc\
 	lsan_common.cc\
 	lsan_common_linux.cc\
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
new file mode 100644
index 0000000..8be3903
--- /dev/null
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -0,0 +1,104 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+SHLIB_NAME=	libclang_rt.asan-${CRTARCH}.so
+.undef NO_PIC # sorry...
+
+.PATH:	${CRTSRC}/lib/asan\
+	${CRTSRC}/lib/interception\
+	${CRTSRC}/lib/sanitizer_common\
+	${CRTSRC}/lib/lsan\
+	${CRTSRC}/lib/ubsan
+
+SRCS=	interception_linux.cc\
+	interception_mac.cc\
+	interception_win.cc\
+	interception_type_test.cc\
+	sanitizer_allocator.cc\
+	sanitizer_common.cc\
+	sanitizer_deadlock_detector1.cc\
+	sanitizer_deadlock_detector2.cc\
+	sanitizer_flags.cc\
+	sanitizer_flag_parser.cc\
+	sanitizer_libc.cc\
+	sanitizer_libignore.cc\
+	sanitizer_linux.cc\
+	sanitizer_mac.cc\
+	sanitizer_persistent_allocator.cc\
+	sanitizer_platform_limits_linux.cc\
+	sanitizer_platform_limits_posix.cc\
+	sanitizer_posix.cc\
+	sanitizer_printf.cc\
+	sanitizer_procmaps_common.cc\
+	sanitizer_procmaps_freebsd.cc\
+	sanitizer_procmaps_linux.cc\
+	sanitizer_procmaps_mac.cc\
+	sanitizer_stackdepot.cc\
+	sanitizer_stacktrace.cc\
+	sanitizer_stacktrace_printer.cc\
+	sanitizer_suppressions.cc\
+	sanitizer_symbolizer.cc\
+	sanitizer_symbolizer_libbacktrace.cc\
+	sanitizer_symbolizer_mac.cc\
+	sanitizer_symbolizer_win.cc\
+	sanitizer_tls_get_addr.cc\
+	sanitizer_thread_registry.cc\
+	sanitizer_win.cc\
+	sanitizer_common_libcdep.cc\
+	sanitizer_coverage_libcdep.cc\
+	sanitizer_coverage_mapping_libcdep.cc\
+	sanitizer_linux_libcdep.cc\
+	sanitizer_posix_libcdep.cc\
+	sanitizer_stacktrace_libcdep.cc\
+	sanitizer_stoptheworld_linux_libcdep.cc\
+	sanitizer_symbolizer_libcdep.cc\
+	sanitizer_symbolizer_posix_libcdep.cc\
+	sanitizer_unwind_linux_libcdep.cc\
+	lsan_common.cc\
+	lsan_common_linux.cc\
+	ubsan_diag.cc\
+	ubsan_init.cc\
+	ubsan_flags.cc\
+	ubsan_handlers.cc\
+	ubsan_value.cc\
+	asan_allocator.cc\
+	asan_activation.cc\
+	asan_debugging.cc\
+	asan_fake_stack.cc\
+	asan_flags.cc\
+	asan_globals.cc\
+	asan_interceptors.cc\
+	asan_linux.cc\
+	asan_mac.cc\
+	asan_malloc_linux.cc\
+	asan_malloc_mac.cc\
+	asan_malloc_win.cc\
+	asan_poisoning.cc\
+	asan_posix.cc\
+	asan_report.cc\
+	asan_rtl.cc\
+	asan_stack.cc\
+	asan_stats.cc\
+	asan_suppressions.cc\
+	asan_thread.cc\
+	asan_win.cc\
+	asan_new_delete.cc\
+	ubsan_handlers_cxx.cc\
+	ubsan_type_hash.cc\
+	ubsan_type_hash_itanium.cc\
+	ubsan_type_hash_win.cc
+
+# Kludge around a bsd.lib.mk shortcoming: when SHLIB_NAME is defined, but LIB
+# and LIB_CXX are undefined (which forces building only a shared library),
+# there is no way to tell it to use ${CXX} for linking.  Since the files for
+# this library are all C++ anyway, simply set CC to CXX.
+CC=		${CXX}
+
+.include <bsd.lib.mk>
+
+CXXFLAGS.ubsan_handlers_cxx.cc=		-frtti
+CXXFLAGS.ubsan_type_hash.cc=		-frtti
+CXXFLAGS.ubsan_type_hash_itanium.cc=	-frtti
+CXXFLAGS.ubsan_type_hash_win.cc=	-frtti
+CXXFLAGS+=				${CXXFLAGS.${.IMPSRC:T}}
diff --git a/lib/libclang_rt/profile/Makefile b/lib/libclang_rt/profile/Makefile
index 6acbb4e..68ba991 100644
--- a/lib/libclang_rt/profile/Makefile
+++ b/lib/libclang_rt/profile/Makefile
@@ -8,9 +8,12 @@ LIB=	clang_rt.profile-${CRTARCH}
 
 SRCS=	GCDAProfiling.c\
 	InstrProfiling.c\
+	InstrProfilingValue.c\
 	InstrProfilingBuffer.c\
 	InstrProfilingFile.c\
+	InstrProfilingWriter.c\
 	InstrProfilingPlatformDarwin.c\
+	InstrProfilingPlatformLinux.c\
 	InstrProfilingPlatformOther.c\
 	InstrProfilingRuntime.cc\
 	InstrProfilingUtil.c
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index f684fe2..f769412 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -42,6 +42,7 @@ SRCS=	interception_linux.cc\
 	sanitizer_tls_get_addr.cc\
 	sanitizer_thread_registry.cc\
 	sanitizer_win.cc\
+	sanitizer_common_nolibc.cc\
 	safestack.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index 3ba5ca0..fddd2ed 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -46,7 +46,6 @@ SRCS=	sanitizer_allocator.cc\
 	sanitizer_stoptheworld_linux_libcdep.cc\
 	sanitizer_symbolizer_libcdep.cc\
 	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_symbolizer_process_libcdep.cc\
 	sanitizer_unwind_linux_libcdep.cc\
 	ubsan_diag.cc\
 	ubsan_init.cc\
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index 7a29a59..8959225 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -45,6 +45,7 @@ SRCF=	absvdi2 \
 	divmoddi4 \
 	divmodsi4 \
 	divsc3 \
+	divtc3 \
 	divti3 \
 	divxc3 \
 	enable_execute_stack \
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index e94ccbd..835b535 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -50,7 +50,11 @@ SRCS+=	bcmp.c bcopy.c bzero.c ffs.c fls.c \
 # Do not generate movt/movw, because the relocation fixup for them does not
 # translate to the -Bsymbolic -pie format required by self_reloc() in loader(8).
 # Also, the fpu is not available in a standalone environment.
+.if ${COMPILER_VERSION} < 30800
 CFLAGS.clang+=	-mllvm -arm-use-movt=0
+.else
+CFLAGS.clang+=	-mno-movt
+.endif
 CFLAGS.clang+=	-mfpu=none
 
 # Compiler support functions
diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile
index b977db5..92ebc0b 100644
--- a/lib/msun/tests/Makefile
+++ b/lib/msun/tests/Makefile
@@ -41,7 +41,11 @@ NETBSD_ATF_TESTS_C+=	tanh_test
 
 TAP_TESTS_C+=	cexp_test
 TAP_TESTS_C+=	conj_test
+.if ${MACHINE_CPUARCH} != "aarch64"
+# Hits an assert in llvm when building for arm64:
+# https://llvm.org/bugs/show_bug.cgi?id=26081
 TAP_TESTS_C+=	csqrt_test
+.endif
 TAP_TESTS_C+=	ctrig_test
 TAP_TESTS_C+=	exponential_test
 TAP_TESTS_C+=	fenv_test
author	gjb <gjb@FreeBSD.org>	2016-03-06 04:13:17 +0000
committer	gjb <gjb@FreeBSD.org>	2016-03-06 04:13:17 +0000
commit	f4bd2481be4a57485def5a36b1489879e5d7a470 (patch)
tree	7e556653474c7cbaf439c575734d098129e88b2b /lib
parent	7f622b840367101a59fea39a608e273d9e888eae (diff)
parent	ffbdd975f04fc5e43744acfd92c1e69c6e4dbb14 (diff)
download	FreeBSD-src-f4bd2481be4a57485def5a36b1489879e5d7a470.zip FreeBSD-src-f4bd2481be4a57485def5a36b1489879e5d7a470.tar.gz