svn commit: r460063 - in head/devel: . llvm60 llvm60/files llvm60/files/clang llvm60/files/openmp xtoolchain-llvm60

Brooks Davis brooks at FreeBSD.org
Fri Jan 26 23:47:30 UTC 2018 

Author: brooks
Date: Fri Jan 26 23:47:28 2018
New Revision: 460063
URL: https://svnweb.freebsd.org/changeset/ports/460063

Log:
  Add a port of LLVM 6.0.0rc1 and add an xtoolchain-llvm60 to go with it.

Added:
  head/devel/llvm60/
     - copied from r459952, head/devel/llvm50/
  head/devel/llvm60/files/clang/
  head/devel/llvm60/files/clang/patch-fformat_extensions.diff
     - copied unchanged from r459952, head/devel/llvm50/files/clang-patch-fformat_extensions.diff
  head/devel/llvm60/files/clang/patch-fopenmp.diff
     - copied unchanged from r459952, head/devel/llvm50/files/clang-patch-fopenmp.diff
  head/devel/llvm60/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt
     - copied, changed from r459952, head/devel/llvm50/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
  head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py
     - copied unchanged from r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py
  head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_clang-format.py
     - copied unchanged from r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py
  head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_git-clang-format
     - copied unchanged from r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format
  head/devel/llvm60/files/clang/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
     - copied unchanged from r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
  head/devel/llvm60/files/openmp/
  head/devel/llvm60/files/openmp/patch-bug32279
     - copied unchanged from r459952, head/devel/llvm50/files/openmp-patch-bug32279
  head/devel/xtoolchain-llvm60/
     - copied from r460062, head/devel/xtoolchain-llvm50/
Deleted:
  head/devel/llvm60/files/clang-patch-fformat_extensions.diff
  head/devel/llvm60/files/clang-patch-fopenmp.diff
  head/devel/llvm60/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
  head/devel/llvm60/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py
  head/devel/llvm60/files/clang-patch-tools_clang_tools_clang-format_clang-format.py
  head/devel/llvm60/files/clang-patch-tools_clang_tools_clang-format_git-clang-format
  head/devel/llvm60/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
  head/devel/llvm60/files/openmp-patch-bug32279
  head/devel/llvm60/files/patch-lib_Support_Unix_Path.inc
Modified:
  head/devel/Makefile
  head/devel/llvm60/Makefile
  head/devel/llvm60/distinfo
  head/devel/llvm60/pkg-plist
  head/devel/xtoolchain-llvm60/Makefile

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Fri Jan 26 23:23:18 2018	(r460062)
+++ head/devel/Makefile	Fri Jan 26 23:47:28 2018	(r460063)
@@ -1635,6 +1635,7 @@
     SUBDIR += llvm39
     SUBDIR += llvm40
     SUBDIR += llvm50
+    SUBDIR += llvm60
     SUBDIR += lm4tools
     SUBDIR += lmdbg
     SUBDIR += lndir
@@ -6061,6 +6062,7 @@
     SUBDIR += xtoolchain-llvm-devel
     SUBDIR += xtoolchain-llvm40
     SUBDIR += xtoolchain-llvm50
+    SUBDIR += xtoolchain-llvm60
     SUBDIR += xwpe
     SUBDIR += xxgdb
     SUBDIR += xxhash

Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm50/Makefile	Thu Jan 25 17:40:46 2018	(r459952)
+++ head/devel/llvm60/Makefile	Fri Jan 26 23:47:28 2018	(r460063)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	5.0.1
+DISTVERSION=	6.0.0rc1
 PORTREVISION=	0
 CATEGORIES=	devel lang
-MASTER_SITES=	https://releases.llvm.org/${LLVM_RELEASE}/${RCDIR} LOCAL/brooks
+MASTER_SITES=	http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
 DISTFILES=	${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX}
@@ -21,7 +21,7 @@ LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]$//}
 LLVM_LIB_VER=	${LLVM_MAJOR:C/\.//}
 RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
-PRE_=		${DISTVERSION:C/.*rc.*/pre-/:N*[0-9]*}
+PRE_=		${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*}
 LLVM_SUFFIX=	${LLVM_LIB_VER}
 
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
@@ -54,18 +54,11 @@ OPTIONS_DEFINE_i386=	COMPILER_RT
 OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT
-OPTIONS_EXCLUDE_FreeBSD_10=	LLDB
+OPTIONS_EXCLUDE_FreeBSD_10=	LLDB OPENMP
 OPTIONS_SUB=	yes
 
 CLANG_DESC=	Build clang
-CLANG_EXTRA_PATCHES= \
-	${PATCHDIR}/clang-patch-fformat_extensions.diff \
-	${PATCHDIR}/clang-patch-fopenmp.diff \
-	${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \
-	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \
-	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py \
-	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format \
-	${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer
+CLANG_EXTRA_PATCHES=	${PATCHDIR}/clang
 CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
@@ -97,7 +90,7 @@ LLDB_IMPLIES=		CLANG
 LLDB_VARS=		_USES_PYTHON=python:2.7
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
-OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp-patch-bug32279
+OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
@@ -125,6 +118,7 @@ COMMANDS=	bugpoint \
 		llvm-as \
 		llvm-bcanalyzer \
 		llvm-cat \
+		llvm-cfi-verify \
 		llvm-config \
 		llvm-cov \
 		llvm-cvtres \
@@ -140,11 +134,13 @@ COMMANDS=	bugpoint \
 		llvm-modextract \
 		llvm-mt \
 		llvm-nm \
+		llvm-objcopy \
 		llvm-objdump \
 		llvm-opt-report \
 		llvm-pdbutil \
 		llvm-profdata \
 		llvm-ranlib \
+		llvm-rc \
 		llvm-readelf \
 		llvm-readobj \
 		llvm-rtdyld \
@@ -219,6 +215,7 @@ COMMANDS+=	c-index-test \
 		clang-check \
 		clang-cpp \
 		clang-format \
+		clang-func-mapping \
 		clang-import-test \
 		clang-offload-bundler \
 		scan-build \
@@ -232,7 +229,7 @@ SHEBANG_FILES+=	tools/clang/tools/scan-view/bin/scan-v
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
-COMPILER_RT_PATTERN=	(asan_blacklist.txt|sanitizer|include.xray)
+COMPILER_RT_PATTERN=	(_blacklist.txt|sanitizer|include.xray)
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
@@ -244,7 +241,8 @@ LIT_COMMANDS=	lit llvm-lit FileCheck
 COMMANDS+=	lldb \
 		lldb-argdumper \
 		lldb-mi \
-		lldb-server
+		lldb-server \
+		lldb-test
 .endif
 
 .if ! ${OPTIONS_DEFINE:MCOMPILER_RT}
@@ -265,15 +263,20 @@ PLIST_SUB+=	OPENMP="@comment "
 .else
 .endif
 
-MAN1SRCS+=	bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
+MAN1SRCS+=	bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
 		llvm-bcanalyzer.1 llvm-build.1 llvm-config.1 llvm-cov.1 \
 		llvm-diff.1 llvm-dis.1 llvm-dwarfdump.1 \
 		llvm-extract.1 llvm-lib.1 llvm-link.1 llvm-nm.1 \
+		llvm-pdbutil.1 \
 		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
 		opt.1 tblgen.1
 
 .include <bsd.port.pre.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSREL} == 10.3
+CFLAGS+=	-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1
+.endif
+
 .if ${ARCH} == "amd64"
 _COMPILER_RT_LIBS= \
 	libclang_rt.asan-preinit-x86_64.a \
@@ -294,12 +297,14 @@ _COMPILER_RT_LIBS= \
 	libclang_rt.tsan-x86_64.a.syms \
 	libclang_rt.tsan_cxx-x86_64.a \
 	libclang_rt.tsan_cxx-x86_64.a.syms \
+	libclang_rt.ubsan_minimal-x86_64.a \
+	libclang_rt.ubsan_minimal-x86_64.a.syms \
+	libclang_rt.ubsan_minimal-x86_64.so \
 	libclang_rt.ubsan_standalone-x86_64.a \
 	libclang_rt.ubsan_standalone-x86_64.a.syms \
 	libclang_rt.ubsan_standalone-x86_64.so \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
-	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \
-	libclang_rt.ubsan_standalone_cxx-x86_64.so
+	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
 .endif
 .if ${ARCH} == "i386"
 _COMPILER_RT_LIBS+= \
@@ -329,8 +334,11 @@ SHEBANG_FILES+=	tools/clang/tools/extra/clang-tidy/too
 .endif
 
 .if ${PORT_OPTIONS:MLLD}
-COMMANDS+=	lld \
-		lld-link
+COMMANDS+=	ld.lld \
+		ld64.lld \
+		lld \
+		lld-link \
+		wasm-ld
 PORTDOCS+=	lld
 .endif
 
@@ -387,7 +395,7 @@ post-build-COMPILER_RT-on:
 	${CMAKE_BIN} ${CMAKE_ARGS} \
 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
 	    ${WRKSRC_compiler_rt} && \
-	${MAKE_ENV} ${MAKE_CMD}
+	    ${MAKE_ENV} ${MAKE_CMD}
 
 post-install:
 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
@@ -418,8 +426,11 @@ post-install-DOCS-off:
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 .endif
 
+post-install-LLD-on:
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/BinaryFormat/WasmRelocs
+
 post-install-LLDB-on:
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/API
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/windows/getopt
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/mingw
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/lldb/Host/msvc
@@ -485,13 +496,13 @@ build-plist:
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
+	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
 	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
 	    -e 's|${LLVM_MAJOR:C/\.//}|%%LLVM_LIB_VER%%|' \
-	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' | \
-	    ${SORT} >> ${PLIST}.tmp
+	    | ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
@@ -499,13 +510,13 @@ build-plist:
 	    -e 's|lit${LLVM_SUFFIX}|lit%%LLVM_SUFFIX%%|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	${AWK} '{ \
-	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|${EXTRAS_PATTERN}|libclang_rt)/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|ompt.h|${EXTRAS_PATTERN}|libclang_rt)/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
-	    if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /lld|wasm-ld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
-	    if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
+	    if ($$0 ~ /lib.*omp|omp.h|ompt.h/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
 	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}

Modified: head/devel/llvm60/distinfo
==============================================================================
--- head/devel/llvm50/distinfo	Thu Jan 25 17:40:46 2018	(r459952)
+++ head/devel/llvm60/distinfo	Fri Jan 26 23:47:28 2018	(r460063)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1515540207
-SHA256 (llvm-5.0.1.src.tar.xz) = 5fa7489fc0225b11821cab0362f5813a05f2bcf2533e8a4ea9c9c860168807b0
-SIZE (llvm-5.0.1.src.tar.xz) = 23428720
-SHA256 (cfe-5.0.1.src.tar.xz) = 135f6c9b0cd2da1aff2250e065946258eb699777888df39ca5a5b4fe5e23d0ff
-SIZE (cfe-5.0.1.src.tar.xz) = 11483036
-SHA256 (compiler-rt-5.0.1.src.tar.xz) = 4edd1417f457a9b3f0eb88082530490edf3cf6a7335cdce8ecbc5d3e16a895da
-SIZE (compiler-rt-5.0.1.src.tar.xz) = 1498220
-SHA256 (clang-tools-extra-5.0.1.src.tar.xz) = 9aada1f9d673226846c3399d13fab6bba4bfd38bcfe8def5ee7b0ec24f8cd225
-SIZE (clang-tools-extra-5.0.1.src.tar.xz) = 646328
-SHA256 (lld-5.0.1.src.tar.xz) = d5b36c0005824f07ab093616bdff247f3da817cae2c51371e1d1473af717d895
-SIZE (lld-5.0.1.src.tar.xz) = 672952
-SHA256 (lldb-5.0.1.src.tar.xz) = b7c1c9e67975ca219089a3a6a9c77c2d102cead2dc38264f2524aa3326da376a
-SIZE (lldb-5.0.1.src.tar.xz) = 19225084
-SHA256 (openmp-5.0.1.src.tar.xz) = adb635cdd2f9f828351b1e13d892480c657fb12500e69c70e007bddf0fca2653
-SIZE (openmp-5.0.1.src.tar.xz) = 2075472
+TIMESTAMP = 1516903760
+SHA256 (llvm-6.0.0rc1.src.tar.xz) = 6d0bafa39f666181bf711e4afd089eae193dce081a13e84e300d6a6968985137
+SIZE (llvm-6.0.0rc1.src.tar.xz) = 25268528
+SHA256 (cfe-6.0.0rc1.src.tar.xz) = a203dca484aea8c315a6e6098bb9b77fc3b43c8a86fb59e9dbbd959e5e0432d7
+SIZE (cfe-6.0.0rc1.src.tar.xz) = 11954864
+SHA256 (compiler-rt-6.0.0rc1.src.tar.xz) = 3f19543cb8b9170aa02f2b8b3104a61fe7ba607a91b7bf1cffb73a5dbaa2bc21
+SIZE (compiler-rt-6.0.0rc1.src.tar.xz) = 1635768
+SHA256 (clang-tools-extra-6.0.0rc1.src.tar.xz) = d6e306d219fd725c3bb7063ca337b11906855853f1f088c712ba008b995944e6
+SIZE (clang-tools-extra-6.0.0rc1.src.tar.xz) = 758104
+SHA256 (lld-6.0.0rc1.src.tar.xz) = 29d90ee405b4d6bea4881c7d83f212315248f10699cd27a7d6e50cb88439f8fb
+SIZE (lld-6.0.0rc1.src.tar.xz) = 785256
+SHA256 (lldb-6.0.0rc1.src.tar.xz) = 843efd16695bc5d7c823cf743ea8a9145d3c39514f3cb73998946572c1ac0ba8
+SIZE (lldb-6.0.0rc1.src.tar.xz) = 19318508
+SHA256 (openmp-6.0.0rc1.src.tar.xz) = ee4298c5005ba135b9f757993cdb4dbc61350ffa64eca15fb70965784a64ce46
+SIZE (openmp-6.0.0rc1.src.tar.xz) = 2272032

Copied: head/devel/llvm60/files/clang/patch-fformat_extensions.diff (from r459952, head/devel/llvm50/files/clang-patch-fformat_extensions.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm60/files/clang/patch-fformat_extensions.diff	Fri Jan 26 23:47:28 2018	(r460063, copy of r459952, head/devel/llvm50/files/clang-patch-fformat_extensions.diff)
@@ -0,0 +1,44 @@
+diff -ruN tools/clang/include/clang/Basic/LangOptions.def tools/clang/include/clang/Basic/LangOptions.def
+--- tools/clang/include/clang/Basic/LangOptions.def	2015-07-30 22:47:41 UTC
++++ tools/clang/include/clang/Basic/LangOptions.def
+@@ -114,6 +114,7 @@
+ LANGOPT(RTTIData          , 1, 1, "emit run-time type information data")
+ LANGOPT(MSBitfields       , 1, 0, "Microsoft-compatible structure layout")
+ LANGOPT(Freestanding, 1, 0, "freestanding implementation")
++LANGOPT(FormatExtensions  , 1, 0, "FreeBSD format extensions")
+ LANGOPT(NoBuiltin         , 1, 0, "disable builtin functions")
+ LANGOPT(NoMathBuiltin     , 1, 0, "disable math builtin functions")
+ LANGOPT(GNUAsm            , 1, 1, "GNU-style inline assembly")
+diff -ruN tools/clang/include/clang/Driver/Options.td tools/clang/include/clang/Driver/Options.td
+--- tools/clang/include/clang/Driver/Options.td	2015-07-30 22:47:41 UTC
++++ tools/clang/include/clang/Driver/Options.td
+@@ -644,6 +644,8 @@
+ 
+ def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Assert that the compilation takes place in a freestanding environment">;
++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>,
++  HelpText<"Enable FreeBSD kernel specific format string extensions">;
+ def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Allow GNU-extension keywords regardless of language standard">;
+ def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group<f_Group>, Flags<[CC1Option]>,
+--- tools/clang/lib/Driver/ToolChains/Clang.cpp.orig	2017-09-14 19:36:28.212240000 +0100
++++ tools/clang/lib/Driver/ToolChains/Clang.cpp	2017-09-14 19:35:59.296165000 +0100
+@@ -3202,6 +3202,7 @@
+ 
+   // Forward -f (flag) options which we can pass directly.
+   Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls);
++  Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fno_operator_names);
+   // Emulated TLS is enabled by default on Android and OpenBSD, and can be enabled
+diff -ruN tools/clang/lib/Frontend/CompilerInvocation.cpp tools/clang/lib/Frontend/CompilerInvocation.cpp
+--- tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-07-30 22:47:41 UTC
++++ tools/clang/lib/Frontend/CompilerInvocation.cpp
+@@ -1543,6 +1543,7 @@
+   Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false);
+   Opts.ShortEnums = Args.hasArg(OPT_fshort_enums);
+   Opts.Freestanding = Args.hasArg(OPT_ffreestanding);
++  Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions);
+   Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;
+   Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin);
+   Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new);

Copied: head/devel/llvm60/files/clang/patch-fopenmp.diff (from r459952, head/devel/llvm50/files/clang-patch-fopenmp.diff)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm60/files/clang/patch-fopenmp.diff	Fri Jan 26 23:47:28 2018	(r460063, copy of r459952, head/devel/llvm50/files/clang-patch-fopenmp.diff)
@@ -0,0 +1,14 @@
+--- tools/clang/lib/Driver/ToolChains/CommonArgs.cpp.orig	2017-05-10 17:18:56.000000000 +0000
++++ tools/clang/lib/Driver/ToolChains/CommonArgs.cpp	2017-05-10 23:01:17.087686000 +0000
+@@ -441,7 +441,10 @@
+ 
+   switch (TC.getDriver().getOpenMPRuntime(Args)) {
+   case Driver::OMPRT_OMP:
+-    CmdArgs.push_back("-lomp");
++    if (TC.getTriple().getOS() != llvm::Triple::FreeBSD || TC.isCrossCompiling() || !llvm::sys::fs::exists("%%LLVM_PREFIX%%/lib/libomp.so"))
++      CmdArgs.push_back("-lomp");
++    else
++      CmdArgs.push_back("%%LLVM_PREFIX%%/lib/libomp.so");
+     break;
+   case Driver::OMPRT_GOMP:
+     CmdArgs.push_back("-lgomp");

Copied and modified: head/devel/llvm60/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt (from r459952, head/devel/llvm50/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt)
==============================================================================
--- head/devel/llvm50/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt	Thu Jan 25 17:40:46 2018	(r459952, copy source)
+++ head/devel/llvm60/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt	Fri Jan 26 23:47:28 2018	(r460063)
@@ -1,6 +1,6 @@
---- tools/clang/lib/Headers/CMakeLists.txt.orig	2017-05-25 14:44:11.000000000 +0100
-+++ tools/clang/lib/Headers/CMakeLists.txt	2017-09-11 19:19:54.532997000 +0100
-@@ -45,7 +45,6 @@
+--- tools/clang/lib/Headers/CMakeLists.txt.orig
++++ tools/clang/lib/Headers/CMakeLists.txt
+@@ -56,7 +56,6 @@
    intrin.h
    inttypes.h
    iso646.h
@@ -8,7 +8,7 @@
    lwpintrin.h
    lzcntintrin.h
    mm3dnow.h
-@@ -65,20 +64,12 @@
+@@ -76,21 +75,13 @@
    s390intrin.h
    shaintrin.h
    smmintrin.h
@@ -25,7 +25,8 @@
    tmmintrin.h
    unwind.h
    vadefs.h
+   vaesintrin.h
 -  varargs.h
    vecintrin.h
+   vpclmulqdqintrin.h
    wmmintrin.h
-   __wmmintrin_aes.h

Copied: head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py (from r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py	Fri Jan 26 23:47:28 2018	(r460063, copy of r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py)
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/clang/tools/clang-format/clang-format-sublime.py.orig
++++ tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@
+ import subprocess
+ 
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format%%LLVM_SUFFIX%%'
+ 
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for

Copied: head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_clang-format.py (from r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_clang-format.py	Fri Jan 26 23:47:28 2018	(r460063, copy of r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py)
@@ -0,0 +1,11 @@
+--- tools/clang/tools/clang-format/clang-format.py.orig	2015-09-08 20:44:00 UTC
++++ tools/clang/tools/clang-format/clang-format.py
+@@ -34,7 +34,7 @@ import vim
+ 
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format%%LLVM_SUFFIX%%'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+   binary = vim.eval('g:clang_format_path')
+ 

Copied: head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_git-clang-format (from r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm60/files/clang/patch-tools_clang_tools_clang-format_git-clang-format	Fri Jan 26 23:47:28 2018	(r460063, copy of r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format)
@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- tools/clang/tools/clang-format/git-clang-format.orig
++++ tools/clang/tools/clang-format/git-clang-format
+@@ -90,7 +90,7 @@
+     usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter,
+     description=desc)
+   p.add_argument('--binary',
+-                 default=config.get('clangformat.binary', 'clang-format'),
++                 default=config.get('clangformat.binary', 'clang-format%%LLVM_SUFFIX%%'),
+                  help='path to clang-format'),
+   p.add_argument('--commit',
+                  default=config.get('clangformat.commit', 'HEAD'),
+@@ -344,7 +344,7 @@
+ 
+ 
+ def run_clang_format_and_save_to_tree(changed_lines, revision=None,
+-                                      binary='clang-format', style=None):
++                                      binary='clang-format%%LLVM_SUFFIX%%', style=None):
+   """Run clang-format on each file and save the result to a git tree.
+ 
+   Returns the object ID (SHA-1) of the created tree."""
+@@ -397,7 +397,7 @@
+ 
+ 
+ def clang_format_to_blob(filename, line_ranges, revision=None,
+-                         binary='clang-format', style=None):
++                         binary='clang-format%%LLVM_SUFFIX%%', style=None):
+   """Run clang-format on the given file and save the result to a git blob.
+ 
+   Runs on the file in `revision` if not None, or on the file in the working

Copied: head/devel/llvm60/files/clang/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer (from r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm60/files/clang/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer	Fri Jan 26 23:47:28 2018	(r460063, copy of r459952, head/devel/llvm50/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer)
@@ -0,0 +1,12 @@
+--- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig
++++ tools/clang/tools/scan-build/libexec/ccc-analyzer
+@@ -81,6 +81,9 @@
+   if (-x "/usr/bin/xcrun") {
+     $UseXCRUN = 1;
+   }
++} elsif (`uname -s` eq "FreeBSD\n") {
++  $DefaultCCompiler = 'cc';
++  $DefaultCXXCompiler = 'c++';
+ } else {
+   $DefaultCCompiler = 'gcc';
+   $DefaultCXXCompiler = 'g++';

Copied: head/devel/llvm60/files/openmp/patch-bug32279 (from r459952, head/devel/llvm50/files/openmp-patch-bug32279)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm60/files/openmp/patch-bug32279	Fri Jan 26 23:47:28 2018	(r460063, copy of r459952, head/devel/llvm50/files/openmp-patch-bug32279)
@@ -0,0 +1,29 @@
+--- projects/openmp/runtime/cmake/LibompHandleFlags.cmake.orig	2017-03-16 15:50:48 UTC
++++ projects/openmp/runtime/cmake/LibompHandleFlags.cmake
+@@ -156,6 +156,11 @@ function(libomp_get_libflags libflags)
+   if(${IA32})
+     libomp_append(libflags_local -lirc_pic LIBOMP_HAVE_IRC_PIC_LIBRARY)
+   endif()
++  IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++    libomp_append(libflags_local "-Wl,--no-as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
++    libomp_append(libflags_local "-lm")
++    libomp_append(libflags_local "-Wl,--as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
++  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+   IF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+     libomp_append(libflags_local -lm)
+   ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+ runtime/cmake/LibompHandleFlags.cmake | 5 +++++
+ runtime/cmake/LibompMicroTests.cmake  | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- projects/openmp/runtime/cmake/LibompMicroTests.cmake.orig	2017-03-16 15:50:48 UTC
++++ projects/openmp/runtime/cmake/LibompMicroTests.cmake
+@@ -171,7 +171,7 @@ add_custom_command(
+ add_custom_target(libomp-test-deps DEPENDS test-deps/.success)
+ set(libomp_expected_library_deps)
+ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+-  set(libomp_expected_library_deps libc.so.7 libthr.so.3)
++  set(libomp_expected_library_deps libc.so.7 libthr.so.3 libm.so.5)
+   libomp_append(libomp_expected_library_deps libhwloc.so.5 LIBOMP_USE_HWLOC)
+ elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+   set(libomp_expected_library_deps libc.so.12 libpthread.so.1 libm.so.0)

Modified: head/devel/llvm60/pkg-plist
==============================================================================
--- head/devel/llvm50/pkg-plist	Thu Jan 25 17:40:46 2018	(r459952)
+++ head/devel/llvm60/pkg-plist	Fri Jan 26 23:47:28 2018	(r460063)
@@ -7,6 +7,7 @@ bin/llvm-ar%%LLVM_SUFFIX%%
 bin/llvm-as%%LLVM_SUFFIX%%
 bin/llvm-bcanalyzer%%LLVM_SUFFIX%%
 bin/llvm-cat%%LLVM_SUFFIX%%
+bin/llvm-cfi-verify%%LLVM_SUFFIX%%
 bin/llvm-config%%LLVM_SUFFIX%%
 bin/llvm-cov%%LLVM_SUFFIX%%
 bin/llvm-cvtres%%LLVM_SUFFIX%%
@@ -22,11 +23,13 @@ bin/llvm-mcmarkup%%LLVM_SUFFIX%%
 bin/llvm-modextract%%LLVM_SUFFIX%%
 bin/llvm-mt%%LLVM_SUFFIX%%
 bin/llvm-nm%%LLVM_SUFFIX%%
+bin/llvm-objcopy%%LLVM_SUFFIX%%
 bin/llvm-objdump%%LLVM_SUFFIX%%
 bin/llvm-opt-report%%LLVM_SUFFIX%%
 bin/llvm-pdbutil%%LLVM_SUFFIX%%
 bin/llvm-profdata%%LLVM_SUFFIX%%
 bin/llvm-ranlib%%LLVM_SUFFIX%%
+bin/llvm-rc%%LLVM_SUFFIX%%
 bin/llvm-readelf%%LLVM_SUFFIX%%
 bin/llvm-readobj%%LLVM_SUFFIX%%
 bin/llvm-rtdyld%%LLVM_SUFFIX%%
@@ -45,6 +48,7 @@ bin/sancov%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-check%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-cpp%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-format%%LLVM_SUFFIX%%
+%%CLANG%%bin/clang-func-mapping%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-import-test%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-offload-bundler%%LLVM_SUFFIX%%
 %%CLANG%%bin/scan-build%%LLVM_SUFFIX%%
@@ -53,6 +57,7 @@ bin/sancov%%LLVM_SUFFIX%%
 %%LLDB%%bin/lldb-argdumper%%LLVM_SUFFIX%%
 %%LLDB%%bin/lldb-mi%%LLVM_SUFFIX%%
 %%LLDB%%bin/lldb-server%%LLVM_SUFFIX%%
+%%LLDB%%bin/lldb-test%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/clang-apply-replacements%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/clang-change-namespace%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/clang-include-fixer%%LLVM_SUFFIX%%
@@ -64,8 +69,11 @@ bin/sancov%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/clangd%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/find-all-symbols%%LLVM_SUFFIX%%
 %%EXTRAS%%bin/modularize%%LLVM_SUFFIX%%
+%%LLD%%bin/ld.lld%%LLVM_SUFFIX%%
+%%LLD%%bin/ld64.lld%%LLVM_SUFFIX%%
 %%LLD%%bin/lld%%LLVM_SUFFIX%%
 %%LLD%%bin/lld-link%%LLVM_SUFFIX%%
+%%LLD%%bin/wasm-ld%%LLVM_SUFFIX%%
 %%LIT%%bin/lit%%LLVM_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/lit
 %%LIT%%bin/llvm-lit%%LLVM_SUFFIX%%
@@ -101,10 +109,12 @@ llvm%%LLVM_LIB_VER%%/bin/bugpoint
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-cl
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-cpp
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-format
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-func-mapping
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-import-test
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-include-fixer
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-offload-bundler
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-query
+%%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-refactor
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-rename
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/clang-reorder-fields
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/clang-tblgen
@@ -113,6 +123,7 @@ llvm%%LLVM_LIB_VER%%/bin/bugpoint
 %%EXTRAS%%llvm%%LLVM_LIB_VER%%/bin/find-all-symbols
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/git-clang-format
 %%LLD%%llvm%%LLVM_LIB_VER%%/bin/ld.lld
+%%LLD%%llvm%%LLVM_LIB_VER%%/bin/ld64.lld
 llvm%%LLVM_LIB_VER%%/bin/llc
 %%LLD%%llvm%%LLVM_LIB_VER%%/bin/lld
 %%LLD%%llvm%%LLVM_LIB_VER%%/bin/lld-link
@@ -120,12 +131,14 @@ llvm%%LLVM_LIB_VER%%/bin/llc
 %%LLDB%%llvm%%LLVM_LIB_VER%%/bin/lldb-argdumper
 %%LLDB%%llvm%%LLVM_LIB_VER%%/bin/lldb-mi
 %%LLDB%%llvm%%LLVM_LIB_VER%%/bin/lldb-server
+%%LLDB%%llvm%%LLVM_LIB_VER%%/bin/lldb-test
 llvm%%LLVM_LIB_VER%%/bin/lli
 llvm%%LLVM_LIB_VER%%/bin/llvm-ar
 llvm%%LLVM_LIB_VER%%/bin/llvm-as
 llvm%%LLVM_LIB_VER%%/bin/llvm-bcanalyzer
 llvm%%LLVM_LIB_VER%%/bin/llvm-c-test
 llvm%%LLVM_LIB_VER%%/bin/llvm-cat
+llvm%%LLVM_LIB_VER%%/bin/llvm-cfi-verify
 llvm%%LLVM_LIB_VER%%/bin/llvm-config
 llvm%%LLVM_LIB_VER%%/bin/llvm-cov
 llvm%%LLVM_LIB_VER%%/bin/llvm-cvtres
@@ -147,11 +160,13 @@ llvm%%LLVM_LIB_VER%%/bin/llvm-mcmarkup
 llvm%%LLVM_LIB_VER%%/bin/llvm-modextract
 llvm%%LLVM_LIB_VER%%/bin/llvm-mt
 llvm%%LLVM_LIB_VER%%/bin/llvm-nm
+llvm%%LLVM_LIB_VER%%/bin/llvm-objcopy
 llvm%%LLVM_LIB_VER%%/bin/llvm-objdump
 llvm%%LLVM_LIB_VER%%/bin/llvm-opt-report
 llvm%%LLVM_LIB_VER%%/bin/llvm-pdbutil
 llvm%%LLVM_LIB_VER%%/bin/llvm-profdata
 llvm%%LLVM_LIB_VER%%/bin/llvm-ranlib
+llvm%%LLVM_LIB_VER%%/bin/llvm-rc
 llvm%%LLVM_LIB_VER%%/bin/llvm-readelf
 llvm%%LLVM_LIB_VER%%/bin/llvm-readobj
 llvm%%LLVM_LIB_VER%%/bin/llvm-rtdyld
@@ -170,7 +185,9 @@ llvm%%LLVM_LIB_VER%%/bin/sanstats
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/scan-build
 %%CLANG%%llvm%%LLVM_LIB_VER%%/bin/scan-view
 llvm%%LLVM_LIB_VER%%/bin/verify-uselistorder
+%%LLD%%llvm%%LLVM_LIB_VER%%/bin/wasm-ld
 llvm%%LLVM_LIB_VER%%/bin/yaml2obj
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/cfi_blacklist.txt
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/BuildSystem.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/CXCompilationDatabase.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang-c/CXErrorCode.h
@@ -220,6 +237,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentParser.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentSema.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/CommentVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DataCollection.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Decl.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclAccessPair.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/DeclBase.h
@@ -244,6 +262,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ExternalASTSource.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/GlobalDecl.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/LambdaCapture.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/LocInfoType.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Mangle.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/MangleNumberingContext.h
@@ -255,6 +274,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/OperationKinds.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/ParentMap.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/PrettyPrinter.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/QualTypeNames.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/RawCommentList.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/RecordLayout.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/RecursiveASTVisitor.h
@@ -262,6 +282,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/SelectorLocationsKind.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/Stmt.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtCXX.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtDataCollectors.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtGraphTraits.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtIterator.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/AST/StmtNodes.inc
@@ -305,8 +326,9 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/ThreadSafetyUtil.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Analyses/UninitializedValues.h
-%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/AnalysisContext.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/AnalysisDeclContext.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/AnalysisDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/BodyFarm.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/CFG.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/CFGStmtMap.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/CallGraph.h
@@ -319,6 +341,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Analysis/Support/BumpVector.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/ABI.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AddressSpaces.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AlignedAllocation.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AllDiagnostics.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AttrHasAttributeImpl.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/AttrKinds.h
@@ -354,7 +377,9 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticCategories.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticCommentKinds.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticCommonKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticCrossTUKinds.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticDriverKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticError.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticFrontendKinds.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticGroups.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticIDs.h
@@ -363,6 +388,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticOptions.def
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticOptions.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticParseKinds.inc
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticRefactoringKinds.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticSemaKinds.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/DiagnosticSerializationKinds.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/ExceptionSpecificationType.h
@@ -393,12 +419,14 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/PragmaKinds.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/PrettyStackTrace.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SanitizerBlacklist.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SanitizerSpecialCaseList.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Sanitizers.def
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Sanitizers.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SourceLocation.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SourceManager.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SourceManagerInternals.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Specifiers.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/SyncScope.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TargetBuiltins.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TargetCXXABI.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/TargetInfo.h
@@ -412,6 +440,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/VersionTuple.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/VirtualFileSystem.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/Visibility.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/X86Target.def
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/XRayLists.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Basic/arm_neon.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/BackendUtil.h
@@ -424,6 +453,8 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/ObjectFilePCHContainerOperations.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CodeGen/SwiftCallingConv.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Config/config.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CrossTU/CrossTUDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/CrossTU/CrossTranslationUnit.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Action.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Compilation.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Driver/Distro.h
@@ -514,6 +545,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/Token.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/TokenConcatenation.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/TokenLexer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Lex/VariadicMacroSupport.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/AttrParserStringSwitches.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/AttrSubMatchRulesParserStringSwitches.inc
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Parse/ParseAST.h
@@ -588,7 +620,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/Analyses.def
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
-%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
@@ -613,6 +645,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/LoopUnrolling.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/LoopWidening.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
@@ -638,29 +671,57 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Frontend/FrontendActions.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/ASTDiff/ASTDiff.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/ASTDiff/ASTDiffInternal.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/ArgumentsAdjusters.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/CommonOptionsParser.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/CompilationDatabase.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/CompilationDatabasePluginRegistry.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Core/Diagnostic.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Core/Lookup.h
-%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Core/QualTypeNames.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Core/Replacement.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/DiagnosticsYaml.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Execution.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/FileMatchTrie.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/FixIt.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/JSONCompilationDatabase.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/ASTSelection.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/AtomicChange.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Extract/Extract.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringAction.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringActionRule.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringActionRuleRequirements.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringActionRules.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringActionRulesInternal.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringOption.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringOptionVisitor.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringOptions.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringResultConsumer.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/RefactoringRuleContext.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/RenamingAction.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/SymbolName.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/USRFinder.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/USRFindingAction.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Refactoring/Rename/USRLocFinder.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/RefactoringCallbacks.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/ReplacementsYaml.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/StandaloneExecution.h
+%%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/ToolExecutorPluginRegistry.h
 %%CLANG%%llvm%%LLVM_LIB_VER%%/include/clang/Tooling/Tooling.h
-%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Config/Version.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/Args.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/Driver.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/ErrorHandler.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/LLVM.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/Memory.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/Reproduce.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/Strings.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/TargetOptionsCommandFlags.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/Threads.h
+%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Common/Version.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/AbsoluteAtom.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/ArchiveLibraryFile.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Atom.h
@@ -668,91 +729,21 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Error.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/File.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Instrumentation.h
-%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/LLVM.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/LinkingContext.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Node.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Pass.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/PassManager.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Reader.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Reference.h
-%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Reproduce.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Resolver.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/SharedLibraryAtom.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/SharedLibraryFile.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Simple.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/SymbolTable.h
-%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/TargetOptionsCommandFlags.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/UndefinedAtom.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Core/Writer.h
-%%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/Driver/Driver.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/ReaderWriter/MachOLinkingContext.h
 %%LLD%%llvm%%LLVM_LIB_VER%%/include/lld/ReaderWriter/YamlContext.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/LLDB.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBAddress.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBAttachInfo.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBBlock.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBBreakpoint.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBBreakpointLocation.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBBroadcaster.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBCommandInterpreter.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBCommandReturnObject.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBCommunication.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBCompileUnit.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBData.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBDebugger.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBDeclaration.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBDefines.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBError.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBEvent.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBExecutionContext.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBExpressionOptions.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBFileSpec.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBFileSpecList.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBFrame.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBFunction.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBHostOS.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBInstruction.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBInstructionList.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBLanguageRuntime.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBLaunchInfo.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBLineEntry.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBListener.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBMemoryRegionInfo.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBMemoryRegionInfoList.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBModule.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBModuleSpec.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBPlatform.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBProcess.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBQueue.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBQueueItem.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSection.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSourceManager.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBStream.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBStringList.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBStructuredData.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSymbol.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSymbolContext.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBSymbolContextList.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTarget.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBThread.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBThreadCollection.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBThreadPlan.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTrace.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTraceOptions.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBType.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeCategory.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeEnumMember.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeFilter.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeFormat.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeNameSpecifier.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeSummary.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBTypeSynthetic.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBUnixSignals.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBValue.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBValueList.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBVariablesOptions.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SBWatchpoint.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/API/SystemInitializerFull.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/Breakpoint.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointID.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointIDList.h
@@ -760,6 +751,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointLocation.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointLocationCollection.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointLocationList.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointName.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointOptions.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointResolver.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Breakpoint/BreakpointResolverAddress.h
@@ -779,7 +771,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/AddressResolver.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/AddressResolverFileLine.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/AddressResolverName.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ArchSpec.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Architecture.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Broadcaster.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/ClangForward.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Core/Communication.h
@@ -909,6 +901,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/SocketAddress.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/StringConvert.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Symbols.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/TaskPool.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Terminal.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/ThreadLauncher.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Host/Time.h
@@ -1110,6 +1103,7 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/Unwind.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Target/UnwindAssembly.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/AnsiTerminal.h
+%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/ArchSpec.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Baton.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/CleanUp.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Connection.h
@@ -1148,7 +1142,6 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StringLexer.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StringList.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/StructuredData.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/TaskPool.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/TildeExpressionResolver.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Timeout.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/Timer.h
@@ -1158,22 +1151,11 @@ llvm%%LLVM_LIB_VER%%/bin/yaml2obj
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/UserID.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/VASPrintf.h
 %%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/Utility/VMRange.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-defines.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-enumerations.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-forward.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-defines.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-enumerations.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-forward.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-interfaces.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private-types.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-private.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-public.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-types.h
-%%LLDB%%llvm%%LLVM_LIB_VER%%/include/lldb/lldb-versioning.h
 llvm%%LLVM_LIB_VER%%/include/llvm-c/Analysis.h
 llvm%%LLVM_LIB_VER%%/include/llvm-c/BitReader.h
 llvm%%LLVM_LIB_VER%%/include/llvm-c/BitWriter.h
 llvm%%LLVM_LIB_VER%%/include/llvm-c/Core.h
+llvm%%LLVM_LIB_VER%%/include/llvm-c/DebugInfo.h
 llvm%%LLVM_LIB_VER%%/include/llvm-c/Disassembler.h
 llvm%%LLVM_LIB_VER%%/include/llvm-c/ErrorHandling.h
 llvm%%LLVM_LIB_VER%%/include/llvm-c/ExecutionEngine.h
@@ -1284,6 +1266,7 @@ llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CallGraph.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CallGraphSCCPass.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CallPrinter.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CaptureTracking.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CmpInstAnalysis.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/CodeMetrics.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ConstantFolding.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/DOTGraphTraitsPass.h
@@ -1327,7 +1310,7 @@ llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ObjCARCAlia
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ObjCARCAnalysisUtils.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ObjCARCInstKind.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ObjectUtils.h
-llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/OptimizationDiagnosticInfo.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/OptimizationRemarkEmitter.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/OrderedBasicBlock.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/PHITransAddr.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/Passes.h
@@ -1354,6 +1337,8 @@ llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TargetTrans
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/Trace.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TypeBasedAliasAnalysis.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/TypeMetadataUtils.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ValueLattice.h
+llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ValueLatticeUtils.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/ValueTracking.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Analysis/VectorUtils.h
 llvm%%LLVM_LIB_VER%%/include/llvm/AsmParser/Parser.h
@@ -1364,6 +1349,7 @@ llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/Dwarf.h
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELF.h
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/AArch64.def
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/AMDGPU.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/ARC.def
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/ARM.def
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/AVR.def
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/ELFRelocs/BPF.def
@@ -1382,7 +1368,7 @@ llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/MachO.d
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/MachO.h
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/Magic.h
 llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/Wasm.h
-llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def
+llvm%%LLVM_LIB_VER%%/include/llvm/BinaryFormat/WasmRelocs.def
 llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitCodes.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitcodeReader.h
 llvm%%LLVM_LIB_VER%%/include/llvm/Bitcode/BitcodeWriter.h
@@ -1396,7 +1382,8 @@ llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/AtomicExpand
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/BasicTTIImpl.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/CalcSpillWeights.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/CallingConvLower.h
-llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/CommandFlags.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/CommandFlags.def
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/CostTable.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/DAGCombine.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/DFAPacketizer.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/DIE.h
@@ -1413,11 +1400,12 @@ llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GCMetadataPr
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GCStrategy.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GCs.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/CallLowering.h
-llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/GISelAccessor.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/GISelWorkList.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/IRTranslator.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/InstructionSelect.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/InstructionSelector.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/Legalizer.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h
@@ -1436,13 +1424,13 @@ llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LexicalScope
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LinkAllCodegenComponents.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveInterval.h
-llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveIntervalAnalysis.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveIntervalUnion.h
+llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LiveIntervals.h
 llvm%%LLVM_LIB_VER%%/include/llvm/CodeGen/LivePhysRegs.h

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list