Update to a new snapshot.

powerpc64: add configure option to select ELFv2 ABI

In preparation for compiler+ABI change in PowerPC64, this change adds a
configure option to select ELFv2 as default powerpc64 ABI when compiling
llvm-devel.

The new option automatically set when ELFv2 environment is detected
(when PPC_ABI=ELFv2)

Submitted by:	Alfredo Dal'Ava Júnior
Differential Revision:	https://reviews.freebsd.org/D22100

9 files changed, 145 insertions, 89 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index fbc478268ccf..4cd2d13735c8 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -66,7 +66,7 @@ GH_TAGNAME=	${LLVM_COMMIT}
 
 .include "Makefile.snapshot"
 
-OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
+OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB ELFV2
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
@@ -130,6 +130,9 @@ OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
+ELFV2_DESC=		[PowerPC64] Use OpenPOWER ELF ABI v2 by default
+ELFV2_EXTRA_PATCHES=	${PATCHDIR}/ppc64-elfv2
+ELFV2_IMPLIES=		CLANG
 
 PLIST_SUB+=	LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE}
@@ -158,6 +161,7 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-lib.1 \
 		llvm-lipo.1 \
 		llvm-link.1 \
+		llvm-locstats.1 \
 		llvm-mca.1 \
 		llvm-nm.1 \
 		llvm-objcopy.1 \
@@ -197,6 +201,12 @@ EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}
 
 .include <bsd.port.options.mk>
 
+# PPC_ABI variable is only defined after including bsd.port.options.mk
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
+OPTIONS_DEFAULT_powerpc64=      ELFV2
+.endif
+
+
 # keep in sync with /usr/src/lib/clang/clang.build.mk 
 # ----------- start of sync block ------------------
 # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
diff --git a/devel/llvm-devel/Makefile.COMMANDS b/devel/llvm-devel/Makefile.COMMANDS
index 1d070936dd5a..a8c069c141e8 100644
--- a/devel/llvm-devel/Makefile.COMMANDS
+++ b/devel/llvm-devel/Makefile.COMMANDS
@@ -52,6 +52,7 @@ LLVM_COMMANDS=	\
 		llvm-undname \
 		llvm-xray \
 		opt \
+		pp-trace \
 		sancov
 
 CLANG_COMMANDS=	\
@@ -63,7 +64,9 @@ CLANG_COMMANDS=	\
 		clang-extdef-mapping \
 		clang-format \
 		clang-import-test \
+		clang-move \
 		clang-offload-bundler \
+		clang-offload-wrapper \
 		clang-scan-deps \
 		clangd \
 		diagtool \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index e547a98ebb13..5f93a1947e7f 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	10
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20190913
+SNAPDATE=	20191021
 
-LLVM_COMMIT=		d8b09e1ff4d64f9e83cb91d7899e68756fdf0375
-CLANG_COMMIT=		f5ae2881e6c3ca5c6d7f832f046d762ba46c537c
-COMPILER_RT_COMMIT=	b83f360f7e249afbc59a20dc81845ac776079f0a
-EXTRAS_COMMIT=		e4ddfce1654ae0b4c24892915594ad623eccc7e3
-LLD_COMMIT=		a4a4ad55926fd271cd9bd05d81ed6420bc75c17c
-LLDB_COMMIT=		dedf56240bf255791846589401ff2be688bed137
-OPENMP_COMMIT=		2b135c5afc8ffa96cebe7a9ce9ae3e7251b1fadc
+LLVM_COMMIT=		1e4c44b0d4d0c9febe6859b43ca0dcdfffa810a1
+CLANG_COMMIT=		73e476646bdaeb2ad2d40254ce64c2dfe8c78873
+COMPILER_RT_COMMIT=	89a8e62c03aa2cfe044c9023ec3bbaefb835a7df
+EXTRAS_COMMIT=		5c40544fa40bfb85ec888b6a03421b3905e4a4e7
+LLD_COMMIT=		64b024a57c56c3528d6be3d14be5e3da42614a6f
+LLDB_COMMIT=		5b4e00f1d6dc2ab5847452ca969e8d0362e3671e
+OPENMP_COMMIT=		56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 4f3b9f0ec186..8cbefeee84bf 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1568380653
-SHA256 (llvm-mirror-llvm-10.0.d20190913-d8b09e1ff4d64f9e83cb91d7899e68756fdf0375_GH0.tar.gz) = b0dc8d447377a086d3752fe3533c16c84a0ea6edc610818dfc5b435740d9a90a
-SIZE (llvm-mirror-llvm-10.0.d20190913-d8b09e1ff4d64f9e83cb91d7899e68756fdf0375_GH0.tar.gz) = 51307193
-SHA256 (llvm-mirror-clang-f5ae2881e6c3ca5c6d7f832f046d762ba46c537c_GH0.tar.gz) = 46aeb38d94d41d133428a0bf0fbd22edc1779b94ecdb615cad38d5edc0d026c9
-SIZE (llvm-mirror-clang-f5ae2881e6c3ca5c6d7f832f046d762ba46c537c_GH0.tar.gz) = 19349665
-SHA256 (llvm-mirror-compiler-rt-b83f360f7e249afbc59a20dc81845ac776079f0a_GH0.tar.gz) = ee390babba2d39f6310643ab15c0d76bedbfeeaf94675d0e5280e8525ca4f7c9
-SIZE (llvm-mirror-compiler-rt-b83f360f7e249afbc59a20dc81845ac776079f0a_GH0.tar.gz) = 3449166
-SHA256 (llvm-mirror-clang-tools-extra-e4ddfce1654ae0b4c24892915594ad623eccc7e3_GH0.tar.gz) = d3bc715208d743baac17e7824bf40e7f94959e7746b500ca67c863a86834d849
-SIZE (llvm-mirror-clang-tools-extra-e4ddfce1654ae0b4c24892915594ad623eccc7e3_GH0.tar.gz) = 2968313
-SHA256 (llvm-mirror-lld-a4a4ad55926fd271cd9bd05d81ed6420bc75c17c_GH0.tar.gz) = aee7f6f861e3be72060f9af14a9ccadfd6e21462e94e0c9f0a79c0aa0cff721e
-SIZE (llvm-mirror-lld-a4a4ad55926fd271cd9bd05d81ed6420bc75c17c_GH0.tar.gz) = 1560014
-SHA256 (llvm-mirror-lldb-dedf56240bf255791846589401ff2be688bed137_GH0.tar.gz) = a7bc362fc8274b370343a1d45cf87754b653fdb0d3ee0966d6fb1f4a9f7ed208
-SIZE (llvm-mirror-lldb-dedf56240bf255791846589401ff2be688bed137_GH0.tar.gz) = 13313191
-SHA256 (llvm-mirror-openmp-2b135c5afc8ffa96cebe7a9ce9ae3e7251b1fadc_GH0.tar.gz) = 28d3f80c47eab6f19d2b5e62da75bec10713d96032450a53551f79f16fcf08ff
-SIZE (llvm-mirror-openmp-2b135c5afc8ffa96cebe7a9ce9ae3e7251b1fadc_GH0.tar.gz) = 1472534
+TIMESTAMP = 1571698502
+SHA256 (llvm-mirror-llvm-10.0.d20191021-1e4c44b0d4d0c9febe6859b43ca0dcdfffa810a1_GH0.tar.gz) = a24826131e1260b561c99994d5ccfa7cda333892bd2b4a68737307b6eba26727
+SIZE (llvm-mirror-llvm-10.0.d20191021-1e4c44b0d4d0c9febe6859b43ca0dcdfffa810a1_GH0.tar.gz) = 51949645
+SHA256 (llvm-mirror-clang-73e476646bdaeb2ad2d40254ce64c2dfe8c78873_GH0.tar.gz) = 6d0f6a5c7820cd99284989a7d37d674d4784fb512aa3280702c7deb5676f5608
+SIZE (llvm-mirror-clang-73e476646bdaeb2ad2d40254ce64c2dfe8c78873_GH0.tar.gz) = 19599471
+SHA256 (llvm-mirror-compiler-rt-89a8e62c03aa2cfe044c9023ec3bbaefb835a7df_GH0.tar.gz) = 6dc8101c34a5fe3240709a39fbbe0cce6c95835a5b0cd8e40f12f9d0e94c04f4
+SIZE (llvm-mirror-compiler-rt-89a8e62c03aa2cfe044c9023ec3bbaefb835a7df_GH0.tar.gz) = 3453848
+SHA256 (llvm-mirror-clang-tools-extra-5c40544fa40bfb85ec888b6a03421b3905e4a4e7_GH0.tar.gz) = ef9443d7502d0a274efc7f488ce3fe6ad62c3e42cbe900f2fe9f953ddf14e076
+SIZE (llvm-mirror-clang-tools-extra-5c40544fa40bfb85ec888b6a03421b3905e4a4e7_GH0.tar.gz) = 3008864
+SHA256 (llvm-mirror-lld-64b024a57c56c3528d6be3d14be5e3da42614a6f_GH0.tar.gz) = 05d444d2aaf5d08caed1912441d022584596c5138af7a763704127229653ed75
+SIZE (llvm-mirror-lld-64b024a57c56c3528d6be3d14be5e3da42614a6f_GH0.tar.gz) = 1607912
+SHA256 (llvm-mirror-lldb-5b4e00f1d6dc2ab5847452ca969e8d0362e3671e_GH0.tar.gz) = 84be84d6a398beab8818a90d9ad7771e134529808a8b50bb2a30abbee97a6f6b
+SIZE (llvm-mirror-lldb-5b4e00f1d6dc2ab5847452ca969e8d0362e3671e_GH0.tar.gz) = 13378059
+SHA256 (llvm-mirror-openmp-56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b_GH0.tar.gz) = 88a04ad329b0c4685d93d3e787a7bfa524987e3535045a47360f6ce4c8ec4348
+SIZE (llvm-mirror-openmp-56d941a8cede7c0d6aa4dc19e8f0b95de6f97e1b_GH0.tar.gz) = 1475009
diff --git a/devel/llvm-devel/files/clang/patch-fformat_extensions.diff b/devel/llvm-devel/files/clang/patch-fformat_extensions.diff
index a4d2ecd90540..0950f939dedb 100644
--- a/devel/llvm-devel/files/clang/patch-fformat_extensions.diff
+++ b/devel/llvm-devel/files/clang/patch-fformat_extensions.diff
@@ -1,45 +1,11 @@
-diff -ruN tools/clang/include/clang/Basic/LangOptions.def tools/clang/include/clang/Basic/LangOptions.def
---- tools/clang/include/clang/Basic/LangOptions.def	2015-08-18 08:10:39 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-08-18 08:10:39 UTC
-+++ tools/clang/include/clang/Driver/Options.td
-@@ -660,6 +660,8 @@
+--- tools/clang/include/clang/Driver/Options.td.orig	2019-10-21 21:45:02.000000000 +0100
++++ tools/clang/include/clang/Driver/Options.td	2019-10-22 00:00:39.833390000 +0100
+@@ -1186,6 +1186,8 @@
+   Flags<[CC1Option]>;
+ def fno_use_line_directives : Flag<["-"], "fno-use-line-directives">, Group<f_Group>;
  
++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flag s<[CC1Option]>,
++  HelpText<"Enable FreeBSD kernel specific format string extensions">;
  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]>,
-diff -ruN tools/clang/lib/Driver/ToolChains/Clang.cpp tools/clang/lib/Driver/ToolChains/Clang.cpp
---- tools/clang/lib/Driver/ToolChains/Clang.cpp.orig	2017-03-27 21:06:42.969177000 +0000
-+++ tools/clang/lib/Driver/ToolChains/Clang.cpp	2017-03-27 21:07:03.523370000 +0000
-@@ -3188,6 +3188,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 can be enabled manually
-diff -ruN tools/clang/lib/Frontend/CompilerInvocation.cpp tools/clang/lib/Frontend/CompilerInvocation.cpp
---- tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-08-18 08:10:39 UTC
-+++ tools/clang/lib/Frontend/CompilerInvocation.cpp
-@@ -1559,6 +1559,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);
+ def fgnuc_version_EQ : Joined<["-"], "fgnuc-version=">, Group<f_Group>,
diff --git a/devel/llvm-devel/files/openmp/patch-bug32279 b/devel/llvm-devel/files/openmp/patch-bug32279
deleted file mode 100644
index eb72391e7709..000000000000
--- a/devel/llvm-devel/files/openmp/patch-bug32279
+++ /dev/null
@@ -1,11 +0,0 @@
---- projects/openmp/runtime/cmake/LibompHandleFlags.cmake.orig
-+++ projects/openmp/runtime/cmake/LibompHandleFlags.cmake
-@@ -158,7 +158,7 @@
-   if(${IA32})
-     libomp_append(libflags_local -lirc_pic LIBOMP_HAVE_IRC_PIC_LIBRARY)
-   endif()
--  if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
-+  if((${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") OR (${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)
diff --git a/devel/llvm-devel/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp b/devel/llvm-devel/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp
new file mode 100644
index 000000000000..b0a1482581c9
--- /dev/null
+++ b/devel/llvm-devel/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp
@@ -0,0 +1,23 @@
+--- lib/Target/PowerPC/PPCTargetMachine.cpp.orig	2019-07-04 07:43:51 UTC
++++ lib/Target/PowerPC/PPCTargetMachine.cpp
+@@ -209,6 +209,20 @@ static PPCTargetMachine::PPCABI computeTargetABI(const
+   if (TT.isMacOSX())
+     return PPCTargetMachine::PPC_ABI_UNKNOWN;
+ 
++  if (TT.isOSFreeBSD()) {
++    switch (TT.getArch()) {
++    case Triple::ppc64le:
++    case Triple::ppc64:
++      if (TT.getOSMajorVersion() >= 13)
++        return PPCTargetMachine::PPC_ABI_ELFv2;
++      else
++        return PPCTargetMachine::PPC_ABI_ELFv1;
++    case Triple::ppc:
++    default:
++      return PPCTargetMachine::PPC_ABI_UNKNOWN;
++    }
++  }
++
+   switch (TT.getArch()) {
+   case Triple::ppc64le:
+     return PPCTargetMachine::PPC_ABI_ELFv2;
diff --git a/devel/llvm-devel/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h b/devel/llvm-devel/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h
new file mode 100644
index 000000000000..5b6460a0afba
--- /dev/null
+++ b/devel/llvm-devel/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h
@@ -0,0 +1,34 @@
+--- tools/clang/lib/Basic/Targets/PPC.h.orig	2019-07-09 13:32:26 UTC
++++ tools/clang/lib/Basic/Targets/PPC.h
+@@ -374,12 +374,29 @@ class LLVM_LIBRARY_VISIBILITY PPC64TargetInfo : public
+     IntMaxType = SignedLong;
+     Int64Type = SignedLong;
+ 
++    if (Triple.getEnvironment() != llvm::Triple::UnknownEnvironment) {
++      switch (Triple.getEnvironment()){
++        case llvm::Triple::ELFv1:
++          ABI = "elfv1";
++          break;
++	default:
++          ABI = "elfv2";
++	break;
++      }
++    } else {
++      if ((Triple.getOS() == llvm::Triple::FreeBSD) &&
++	      (Triple.getOSMajorVersion() < 13)) {
++        ABI = "elfv1";
++      } else {
++        ABI = "elfv2";
++      }
++    }
++
++
+     if ((Triple.getArch() == llvm::Triple::ppc64le)) {
+       resetDataLayout("e-m:e-i64:64-n32:64");
+-      ABI = "elfv2";
+     } else {
+       resetDataLayout("E-m:e-i64:64-n32:64");
+-      ABI = Triple.getEnvironment() == llvm::Triple::ELFv2 ? "elfv2" : "elfv1";
+     }
+ 
+     if (Triple.getOS() == llvm::Triple::AIX)
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 5d50bb8d457d..622a2ffce8a3 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -51,6 +51,7 @@ bin/llvm-tblgen-devel
 bin/llvm-undname-devel
 bin/llvm-xray-devel
 bin/opt-devel
+bin/pp-trace-devel
 bin/sancov-devel
 %%CLANG%%bin/c-index-test-devel
 %%CLANG%%bin/clang-devel
@@ -60,7 +61,9 @@ bin/sancov-devel
 %%CLANG%%bin/clang-extdef-mapping-devel
 %%CLANG%%bin/clang-format-devel
 %%CLANG%%bin/clang-import-test-devel
+%%CLANG%%bin/clang-move-devel
 %%CLANG%%bin/clang-offload-bundler-devel
+%%CLANG%%bin/clang-offload-wrapper-devel
 %%CLANG%%bin/clang-scan-deps-devel
 %%CLANG%%bin/clangd-devel
 %%CLANG%%bin/diagtool-devel
@@ -125,7 +128,9 @@ llvm-devel/bin/bugpoint
 %%CLANG%%llvm-devel/bin/clang-format
 %%CLANG%%llvm-devel/bin/clang-import-test
 %%EXTRAS%%llvm-devel/bin/clang-include-fixer
+%%CLANG%%llvm-devel/bin/clang-move
 %%CLANG%%llvm-devel/bin/clang-offload-bundler
+%%CLANG%%llvm-devel/bin/clang-offload-wrapper
 %%EXTRAS%%llvm-devel/bin/clang-query
 %%CLANG%%llvm-devel/bin/clang-refactor
 %%EXTRAS%%llvm-devel/bin/clang-rename
@@ -205,6 +210,7 @@ llvm-devel/bin/llvm-xray
 %%EXTRAS%%llvm-devel/bin/modularize
 llvm-devel/bin/obj2yaml
 llvm-devel/bin/opt
+llvm-devel/bin/pp-trace
 llvm-devel/bin/sancov
 llvm-devel/bin/sanstats
 %%CLANG%%llvm-devel/bin/scan-build
@@ -254,6 +260,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/AST/BaseSubobject.h
 %%CLANG%%llvm-devel/include/clang/AST/BuiltinTypes.def
 %%CLANG%%llvm-devel/include/clang/AST/CXXInheritance.h
+%%CLANG%%llvm-devel/include/clang/AST/CXXRecordDeclDefinitionBits.def
 %%CLANG%%llvm-devel/include/clang/AST/CanonicalType.h
 %%CLANG%%llvm-devel/include/clang/AST/CharUnits.h
 %%CLANG%%llvm-devel/include/clang/AST/Comment.h
@@ -338,7 +345,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/AST/TypeLoc.h
 %%CLANG%%llvm-devel/include/clang/AST/TypeLocNodes.def
 %%CLANG%%llvm-devel/include/clang/AST/TypeLocVisitor.h
-%%CLANG%%llvm-devel/include/clang/AST/TypeNodes.def
+%%CLANG%%llvm-devel/include/clang/AST/TypeNodes.inc
 %%CLANG%%llvm-devel/include/clang/AST/TypeOrdering.h
 %%CLANG%%llvm-devel/include/clang/AST/TypeVisitor.h
 %%CLANG%%llvm-devel/include/clang/AST/UnresolvedSet.h
@@ -395,6 +402,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/AttrList.inc
 %%CLANG%%llvm-devel/include/clang/Basic/AttrSubMatchRulesList.inc
 %%CLANG%%llvm-devel/include/clang/Basic/AttrSubjectMatchRules.h
+%%CLANG%%llvm-devel/include/clang/Basic/AttributeCommonInfo.h
 %%CLANG%%llvm-devel/include/clang/Basic/Attributes.h
 %%CLANG%%llvm-devel/include/clang/Basic/BitmaskEnum.h
 %%CLANG%%llvm-devel/include/clang/Basic/Builtins.def
@@ -402,6 +410,7 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsAArch64.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsAMDGPU.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsARM.def
+%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsBPF.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsHexagon.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsLe64.def
 %%CLANG%%llvm-devel/include/clang/Basic/BuiltinsMips.def
@@ -764,7 +773,6 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/AtomicChange.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Extract/Extract.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Extract/SourceExtraction.h
-%%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/RangeSelector.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/RefactoringAction.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/RefactoringActionRule.h
@@ -783,9 +791,6 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Rename/USRFinder.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Rename/USRFindingAction.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Rename/USRLocFinder.h
-%%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/SourceCode.h
-%%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Stencil.h
-%%CLANG%%llvm-devel/include/clang/Tooling/Refactoring/Transformer.h
 %%CLANG%%llvm-devel/include/clang/Tooling/RefactoringCallbacks.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ReplacementsYaml.h
 %%CLANG%%llvm-devel/include/clang/Tooling/StandaloneExecution.h
@@ -795,8 +800,16 @@ llvm-devel/bin/yaml2obj
 %%CLANG%%llvm-devel/include/clang/Tooling/Syntax/Tree.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ToolExecutorPluginRegistry.h
 %%CLANG%%llvm-devel/include/clang/Tooling/Tooling.h
+%%CLANG%%llvm-devel/include/clang/Tooling/Transformer/MatchConsumer.h
+%%CLANG%%llvm-devel/include/clang/Tooling/Transformer/RangeSelector.h
+%%CLANG%%llvm-devel/include/clang/Tooling/Transformer/RewriteRule.h
+%%CLANG%%llvm-devel/include/clang/Tooling/Transformer/SourceCode.h
+%%CLANG%%llvm-devel/include/clang/Tooling/Transformer/SourceCodeBuilders.h
+%%CLANG%%llvm-devel/include/clang/Tooling/Transformer/Stencil.h
+%%CLANG%%llvm-devel/include/clang/Tooling/Transformer/Transformer.h
 %%COMPILER_RT%%llvm-devel/include/fuzzer/FuzzedDataProvider.h
 %%LLD%%llvm-devel/include/lld/Common/Args.h
+%%LLD%%llvm-devel/include/lld/Common/DWARF.h
 %%LLD%%llvm-devel/include/lld/Common/Driver.h
 %%LLD%%llvm-devel/include/lld/Common/ErrorHandler.h
 %%LLD%%llvm-devel/include/lld/Common/Filesystem.h
@@ -850,6 +863,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/API/SBEvent.h
 %%LLDB%%llvm-devel/include/lldb/API/SBExecutionContext.h
 %%LLDB%%llvm-devel/include/lldb/API/SBExpressionOptions.h
+%%LLDB%%llvm-devel/include/lldb/API/SBFile.h
 %%LLDB%%llvm-devel/include/lldb/API/SBFileSpec.h
 %%LLDB%%llvm-devel/include/lldb/API/SBFileSpecList.h
 %%LLDB%%llvm-devel/include/lldb/API/SBFrame.h
@@ -1037,6 +1051,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Host/HostNativeThreadForward.h
 %%LLDB%%llvm-devel/include/lldb/Host/HostProcess.h
 %%LLDB%%llvm-devel/include/lldb/Host/HostThread.h
+%%LLDB%%llvm-devel/include/lldb/Host/LZMA.h
 %%LLDB%%llvm-devel/include/lldb/Host/LockFile.h
 %%LLDB%%llvm-devel/include/lldb/Host/LockFileBase.h
 %%LLDB%%llvm-devel/include/lldb/Host/MainLoop.h
@@ -1117,6 +1132,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Interpreter/OptionGroupFormat.h
 %%LLDB%%llvm-devel/include/lldb/Interpreter/OptionGroupOutputFile.h
 %%LLDB%%llvm-devel/include/lldb/Interpreter/OptionGroupPlatform.h
+%%LLDB%%llvm-devel/include/lldb/Interpreter/OptionGroupPythonClassWithDict.h
 %%LLDB%%llvm-devel/include/lldb/Interpreter/OptionGroupString.h
 %%LLDB%%llvm-devel/include/lldb/Interpreter/OptionGroupUInt64.h
 %%LLDB%%llvm-devel/include/lldb/Interpreter/OptionGroupUUID.h
@@ -1149,6 +1165,7 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Interpreter/ScriptInterpreter.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/ArmUnwindInfo.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/Block.h
+%%LLDB%%llvm-devel/include/lldb/Symbol/CallFrameInfo.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/ClangASTContext.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/ClangASTImporter.h
 %%LLDB%%llvm-devel/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
@@ -1268,9 +1285,9 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Utility/Event.h
 %%LLDB%%llvm-devel/include/lldb/Utility/FileSpec.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Flags.h
+%%LLDB%%llvm-devel/include/lldb/Utility/GDBRemote.h
 %%LLDB%%llvm-devel/include/lldb/Utility/IOObject.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Iterable.h
-%%LLDB%%llvm-devel/include/lldb/Utility/JSON.h
 %%LLDB%%llvm-devel/include/lldb/Utility/LLDBAssert.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Listener.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Log.h
@@ -1291,7 +1308,6 @@ llvm-devel/bin/yaml2obj
 %%LLDB%%llvm-devel/include/lldb/Utility/Status.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Stream.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StreamCallback.h
-%%LLDB%%llvm-devel/include/lldb/Utility/StreamGDBRemote.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StreamString.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StreamTee.h
 %%LLDB%%llvm-devel/include/lldb/Utility/StringExtractor.h
@@ -1452,9 +1468,11 @@ llvm-devel/include/llvm/Analysis/CaptureTracking.h
 llvm-devel/include/llvm/Analysis/CmpInstAnalysis.h
 llvm-devel/include/llvm/Analysis/CodeMetrics.h
 llvm-devel/include/llvm/Analysis/ConstantFolding.h
+llvm-devel/include/llvm/Analysis/DDG.h
 llvm-devel/include/llvm/Analysis/DOTGraphTraitsPass.h
 llvm-devel/include/llvm/Analysis/DemandedBits.h
 llvm-devel/include/llvm/Analysis/DependenceAnalysis.h
+llvm-devel/include/llvm/Analysis/DependenceGraphBuilder.h
 llvm-devel/include/llvm/Analysis/DivergenceAnalysis.h
 llvm-devel/include/llvm/Analysis/DomPrinter.h
 llvm-devel/include/llvm/Analysis/DomTreeUpdater.h
@@ -1648,6 +1666,7 @@ llvm-devel/include/llvm/CodeGen/LiveInterval.h
 llvm-devel/include/llvm/CodeGen/LiveIntervalUnion.h
 llvm-devel/include/llvm/CodeGen/LiveIntervals.h
 llvm-devel/include/llvm/CodeGen/LivePhysRegs.h
+llvm-devel/include/llvm/CodeGen/LiveRangeCalc.h
 llvm-devel/include/llvm/CodeGen/LiveRangeEdit.h
 llvm-devel/include/llvm/CodeGen/LiveRegMatrix.h
 llvm-devel/include/llvm/CodeGen/LiveRegUnits.h
@@ -1676,6 +1695,7 @@ llvm-devel/include/llvm/CodeGen/MachineInstrBundle.h
 llvm-devel/include/llvm/CodeGen/MachineInstrBundleIterator.h
 llvm-devel/include/llvm/CodeGen/MachineJumpTableInfo.h
 llvm-devel/include/llvm/CodeGen/MachineLoopInfo.h
+llvm-devel/include/llvm/CodeGen/MachineLoopUtils.h
 llvm-devel/include/llvm/CodeGen/MachineMemOperand.h
 llvm-devel/include/llvm/CodeGen/MachineModuleInfo.h
 llvm-devel/include/llvm/CodeGen/MachineModuleInfoImpls.h
@@ -1848,6 +1868,9 @@ llvm-devel/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
 llvm-devel/include/llvm/DebugInfo/GSYM/FileEntry.h
 llvm-devel/include/llvm/DebugInfo/GSYM/FileWriter.h
 llvm-devel/include/llvm/DebugInfo/GSYM/FunctionInfo.h
+llvm-devel/include/llvm/DebugInfo/GSYM/GsymCreator.h
+llvm-devel/include/llvm/DebugInfo/GSYM/GsymReader.h
+llvm-devel/include/llvm/DebugInfo/GSYM/Header.h
 llvm-devel/include/llvm/DebugInfo/GSYM/InlineInfo.h
 llvm-devel/include/llvm/DebugInfo/GSYM/LineEntry.h
 llvm-devel/include/llvm/DebugInfo/GSYM/LineTable.h
@@ -1993,6 +2016,7 @@ llvm-devel/include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h
 llvm-devel/include/llvm/ExecutionEngine/JITLink/JITLink.h
 llvm-devel/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h
 llvm-devel/include/llvm/ExecutionEngine/JITLink/MachO.h
+llvm-devel/include/llvm/ExecutionEngine/JITLink/MachO_arm64.h
 llvm-devel/include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
 llvm-devel/include/llvm/ExecutionEngine/JITSymbol.h
 llvm-devel/include/llvm/ExecutionEngine/MCJIT.h
@@ -2362,6 +2386,7 @@ llvm-devel/include/llvm/Support/Allocator.h
 llvm-devel/include/llvm/Support/ArrayRecycler.h
 llvm-devel/include/llvm/Support/Atomic.h
 llvm-devel/include/llvm/Support/AtomicOrdering.h
+llvm-devel/include/llvm/Support/Automaton.h
 llvm-devel/include/llvm/Support/BinaryByteStream.h
 llvm-devel/include/llvm/Support/BinaryItemStream.h
 llvm-devel/include/llvm/Support/BinaryStream.h
@@ -2424,7 +2449,6 @@ llvm-devel/include/llvm/Support/Host.h
 llvm-devel/include/llvm/Support/InitLLVM.h
 llvm-devel/include/llvm/Support/ItaniumManglingCanonicalizer.h
 llvm-devel/include/llvm/Support/JSON.h
-llvm-devel/include/llvm/Support/JamCRC.h
 llvm-devel/include/llvm/Support/KnownBits.h
 llvm-devel/include/llvm/Support/LEB128.h
 llvm-devel/include/llvm/Support/LICENSE.TXT
@@ -2464,7 +2488,6 @@ llvm-devel/include/llvm/Support/SHA1.h
 llvm-devel/include/llvm/Support/SMLoc.h
 llvm-devel/include/llvm/Support/SMTAPI.h
 llvm-devel/include/llvm/Support/SaveAndRestore.h
-llvm-devel/include/llvm/Support/ScalableSize.h
 llvm-devel/include/llvm/Support/ScaledNumber.h
 llvm-devel/include/llvm/Support/ScopedPrinter.h
 llvm-devel/include/llvm/Support/Signals.h
@@ -2493,6 +2516,7 @@ llvm-devel/include/llvm/Support/ToolOutputFile.h
 llvm-devel/include/llvm/Support/TrailingObjects.h
 llvm-devel/include/llvm/Support/TrigramIndex.h
 llvm-devel/include/llvm/Support/TypeName.h
+llvm-devel/include/llvm/Support/TypeSize.h
 llvm-devel/include/llvm/Support/Unicode.h
 llvm-devel/include/llvm/Support/UnicodeCharRanges.h
 llvm-devel/include/llvm/Support/VCSRevision.h
@@ -2514,6 +2538,7 @@ llvm-devel/include/llvm/Support/raw_sha1_ostream.h
 llvm-devel/include/llvm/Support/thread.h
 llvm-devel/include/llvm/Support/type_traits.h
 llvm-devel/include/llvm/Support/xxhash.h
+llvm-devel/include/llvm/TableGen/Automaton.td
 llvm-devel/include/llvm/TableGen/Error.h
 llvm-devel/include/llvm/TableGen/Main.h
 llvm-devel/include/llvm/TableGen/Record.h
@@ -2524,6 +2549,7 @@ llvm-devel/include/llvm/TableGen/StringToOffsetTable.h
 llvm-devel/include/llvm/TableGen/TableGenBackend.h
 llvm-devel/include/llvm/Target/CodeGenCWrappers.h
 llvm-devel/include/llvm/Target/GenericOpcodes.td
+llvm-devel/include/llvm/Target/GlobalISel/Combine.td
 llvm-devel/include/llvm/Target/GlobalISel/RegisterBank.td
 llvm-devel/include/llvm/Target/GlobalISel/SelectionDAGCompat.td
 llvm-devel/include/llvm/Target/GlobalISel/Target.td
@@ -2548,7 +2574,9 @@ llvm-devel/include/llvm/TextAPI/MachO/Architecture.h
 llvm-devel/include/llvm/TextAPI/MachO/ArchitectureSet.h
 llvm-devel/include/llvm/TextAPI/MachO/InterfaceFile.h
 llvm-devel/include/llvm/TextAPI/MachO/PackedVersion.h
+llvm-devel/include/llvm/TextAPI/MachO/Platform.h
 llvm-devel/include/llvm/TextAPI/MachO/Symbol.h
+llvm-devel/include/llvm/TextAPI/MachO/Target.h
 llvm-devel/include/llvm/TextAPI/MachO/TextAPIReader.h
 llvm-devel/include/llvm/TextAPI/MachO/TextAPIWriter.h
 llvm-devel/include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
@@ -2638,6 +2666,7 @@ llvm-devel/include/llvm/Transforms/Scalar/LoopStrengthReduce.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopUnrollAndJamPass.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopUnrollPass.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerAtomic.h
+llvm-devel/include/llvm/Transforms/Scalar/LowerConstantIntrinsics.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerWidenableCondition.h
@@ -2752,10 +2781,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%COMPILER_RT%%llvm-devel/include/xray/xray_interface.h
 %%COMPILER_RT%%llvm-devel/include/xray/xray_log_interface.h
 %%COMPILER_RT%%llvm-devel/include/xray/xray_records.h
-llvm-devel/lib/CheckerDependencyHandlingAnalyzerPlugin.so
-llvm-devel/lib/CheckerOptionHandlingAnalyzerPlugin.so
 %%GOLD%%llvm-devel/lib/LLVMgold.so
-llvm-devel/lib/SampleAnalyzerPlugin.so
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h
@@ -3109,6 +3135,7 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%EXTRAS%%llvm-devel/lib/libclangTidyBugproneModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyCERTModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyCppCoreGuidelinesModule.a
+%%EXTRAS%%llvm-devel/lib/libclangTidyDarwinModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyFuchsiaModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyGoogleModule.a
 %%EXTRAS%%llvm-devel/lib/libclangTidyHICPPModule.a
@@ -3131,6 +3158,7 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%svn
 %%CLANG%%llvm-devel/lib/libclangToolingInclusions.a
 %%CLANG%%llvm-devel/lib/libclangToolingRefactoring.a
 %%CLANG%%llvm-devel/lib/libclangToolingSyntax.a
+%%CLANG%%llvm-devel/lib/libclangTransformer.a
 %%EXTRAS%%llvm-devel/lib/libfindAllSymbols.a
 %%OPENMP%%llvm-devel/lib/libgomp.so
 %%OPENMP%%llvm-devel/lib/libiomp5.so
@@ -3182,6 +3210,7 @@ llvm-devel/share/opt-viewer/style.css
 %%CLANG%%llvm-devel/share/scan-view/startfile.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/BooleanExpression.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitConfig.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitTestCase.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ProgressBar.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShCommands.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ShUtil.py
@@ -3189,7 +3218,9 @@ llvm-devel/share/opt-viewer/style.css
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestRunner.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/TestingConfig.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/__init__.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/cl_arguments.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/discovery.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/display.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/main.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/run.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/util.py