import UBI llvm-17.0.6-2.module+el8.10.0+21256+978ccea6

.gitignore

@@ -1 +1,6 @@
-SOURCES/llvm-9.0.1.src.tar.xz
+SOURCES/cmake-17.0.6.src.tar.xz
+SOURCES/cmake-17.0.6.src.tar.xz.sig
+SOURCES/llvm-17.0.6.src.tar.xz
+SOURCES/llvm-17.0.6.src.tar.xz.sig
+SOURCES/third-party-17.0.6.src.tar.xz
+SOURCES/third-party-17.0.6.src.tar.xz.sig

.llvm.metadata

@@ -1 +1,6 @@
-f7fcf3bd92d130784513c06efe6910f135372ce3 SOURCES/llvm-9.0.1.src.tar.xz
+4b397344260c934e687be7efa0f8456a9dd46f44 SOURCES/cmake-17.0.6.src.tar.xz
+fa31d348b6780478403484e22139d25f403503d4 SOURCES/cmake-17.0.6.src.tar.xz.sig
+860a3605f08a0a56a8de4e073e26a259871623a6 SOURCES/llvm-17.0.6.src.tar.xz
+2ad479ab00a6d5e61ecb953997cfeef6650a687a SOURCES/llvm-17.0.6.src.tar.xz.sig
+a35dc22cd3d983a556f6e4a63c8dac6a84e01caf SOURCES/third-party-17.0.6.src.tar.xz
+12128cdab7414aeedd573c61cbc2fa82e75491db SOURCES/third-party-17.0.6.src.tar.xz.sig

SOURCES/0001-BPF-annotate-DIType-metadata-for-builtin-preseve_arr.patch

@@ -1,138 +0,0 @@
-From f2ccdd2700174c717dc55a0f4c3f5a91ae73ff42 Mon Sep 17 00:00:00 2001
-From: Yonghong Song <yhs@fb.com>
-Date: Fri, 2 Aug 2019 21:28:28 +0000
-Subject: [PATCH] [BPF] annotate DIType metadata for builtin
- preseve_array_access_index()
-
-Previously, debuginfo types are annotated to
-IR builtin preserve_struct_access_index() and
-preserve_union_access_index(), but not
-preserve_array_access_index(). The debug info
-is useful to identify the root type name which
-later will be used for type comparison.
-
-For user access without explicit type conversions,
-the previous scheme works as we can ignore intermediate
-compiler generated type conversions (e.g., from union types to
-union members) and still generate correct access index string.
-
-The issue comes with user explicit type conversions, e.g.,
-converting an array to a structure like below:
-  struct t { int a; char b[40]; };
-  struct p { int c; int d; };
-  struct t *var = ...;
-  ... __builtin_preserve_access_index(&(((struct p *)&(var->b[0]))->d)) ...
-Although BPF backend can derive the type of &(var->b[0]),
-explicit type annotation make checking more consistent
-and less error prone.
-
-Another benefit is for multiple dimension array handling.
-For example,
-  struct p { int c; int d; } g[8][9][10];
-  ... __builtin_preserve_access_index(&g[2][3][4].d) ...
-It would be possible to calculate the number of "struct p"'s
-before accessing its member "d" if array debug info is
-available as it contains each dimension range.
-
-This patch enables to annotate IR builtin preserve_array_access_index()
-with proper debuginfo type. The unit test case and language reference
-is updated as well.
-
-Signed-off-by: Yonghong Song <yhs@fb.com>
-
-Differential Revision: https://reviews.llvm.org/D65664
-
-llvm-svn: 367724
-(cherry picked from commit d0ea05d5eff475a27a5d3bbe4d9fd389935f9cb2)
-
-Also added back
-Value *CreatePreserveArrayAccessIndex(Value *Base, unsigned Dimension,
-                                      unsigned LastIndex);
-
-To avoid breaking the ABI.
----
- clang/lib/CodeGen/CGExpr.cpp                       | 12 ++++++++---
- .../CodeGen/builtin-preserve-access-index-array.c  | 18 +++++++++++++++++
- clang/test/CodeGen/builtin-preserve-access-index.c | 23 +++++++++++-----------
- llvm/docs/LangRef.rst                              |  4 ++++
- llvm/include/llvm/IR/IRBuilder.h                   | 13 ++++++++++--
- llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll      |  2 +-
- 6 files changed, 55 insertions(+), 17 deletions(-)
- create mode 100644 clang/test/CodeGen/builtin-preserve-access-index-array.c
-
-diff --git a/llvm/docs/LangRef.rst b/llvm/docs/LangRef.rst
-index 87e8a55..b63e3af 100644
---- a/llvm/docs/LangRef.rst
-+++ b/llvm/docs/LangRef.rst
-@@ -17349,6 +17349,10 @@ based on array base ``base``, array dimension ``dim`` and the last access index
- into the array. The return type ``ret_type`` is a pointer type to the array element.
- The array ``dim`` and ``index`` are preserved which is more robust than
- getelementptr instruction which may be subject to compiler transformation.
-+The ``llvm.preserve.access.index`` type of metadata is attached to this call instruction
-+to provide array or pointer debuginfo type.
-+The metadata is a ``DICompositeType`` or ``DIDerivedType`` representing the
-+debuginfo version of ``type``.
- 
- Arguments:
- """"""""""
-diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h
-index a74364d..c2fa9a3 100644
---- a/llvm/include/llvm/IR/IRBuilder.h
-+++ b/llvm/include/llvm/IR/IRBuilder.h
-@@ -2455,6 +2455,11 @@ public:
- 
-   Value *CreatePreserveArrayAccessIndex(Value *Base, unsigned Dimension,
-                                         unsigned LastIndex) {
-+    return CreatePreserveArrayAccessIndex(Base, Dimension, LastIndex, nullptr);
-+  }
-+
-+  Value *CreatePreserveArrayAccessIndex(Value *Base, unsigned Dimension,
-+                                        unsigned LastIndex, MDNode *DbgInfo) {
-     assert(isa<PointerType>(Base->getType()) &&
-            "Invalid Base ptr type for preserve.array.access.index.");
-     auto *BaseType = Base->getType();
-@@ -2476,6 +2481,8 @@ public:
-     Value *DimV = getInt32(Dimension);
-     CallInst *Fn =
-         CreateCall(FnPreserveArrayAccessIndex, {Base, DimV, LastIndexV});
-+    if (DbgInfo)
-+      Fn->setMetadata(LLVMContext::MD_preserve_access_index, DbgInfo);
- 
-     return Fn;
-   }
-@@ -2493,7 +2500,8 @@ public:
-     Value *DIIndex = getInt32(FieldIndex);
-     CallInst *Fn =
-         CreateCall(FnPreserveUnionAccessIndex, {Base, DIIndex});
--    Fn->setMetadata(LLVMContext::MD_preserve_access_index, DbgInfo);
-+    if (DbgInfo)
-+      Fn->setMetadata(LLVMContext::MD_preserve_access_index, DbgInfo);
- 
-     return Fn;
-   }
-@@ -2516,7 +2524,8 @@ public:
-     Value *DIIndex = getInt32(FieldIndex);
-     CallInst *Fn = CreateCall(FnPreserveStructAccessIndex,
-                               {Base, GEPIndex, DIIndex});
--    Fn->setMetadata(LLVMContext::MD_preserve_access_index, DbgInfo);
-+    if (DbgInfo)
-+      Fn->setMetadata(LLVMContext::MD_preserve_access_index, DbgInfo);
- 
-     return Fn;
-   }
-diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll
-index adbcb9f..fe2c196 100644
---- a/llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll
-+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll
-@@ -14,7 +14,7 @@
- define dso_local i32 @test(%struct.s* %arg) local_unnamed_addr #0 !dbg !7 {
- entry:
-   call void @llvm.dbg.value(metadata %struct.s* %arg, metadata !17, metadata !DIExpression()), !dbg !18
--  %0 = tail call %struct.s* @llvm.preserve.array.access.index.p0s_struct.ss.p0s_struct.ss(%struct.s* %arg, i32 0, i32 2), !dbg !19
-+  %0 = tail call %struct.s* @llvm.preserve.array.access.index.p0s_struct.ss.p0s_struct.ss(%struct.s* %arg, i32 0, i32 2), !dbg !19, !llvm.preserve.access.index !11
-   %1 = tail call i32* @llvm.preserve.struct.access.index.p0i32.p0s_struct.ss(%struct.s* %0, i32 1, i32 1), !dbg !19, !llvm.preserve.access.index !12
-   %2 = bitcast i32* %1 to i8*, !dbg !19
-   %call = tail call i32 @get_value(i8* %2) #4, !dbg !20
--- 
-1.8.3.1
-

SOURCES/0001-CMake-Split-static-library-exports-into-their-own-ex.patch

@@ -1,66 +0,0 @@
-From 8f6917ea11bd1bfbfe07f3577756d1c4abfdb916 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Fri, 6 Sep 2019 11:03:18 -0700
-Subject: [PATCH] CMake: Split static library exports into their own export
- file
-
----
- llvm/cmake/modules/AddLLVM.cmake       | 6 +++++-
- llvm/cmake/modules/CMakeLists.txt      | 3 +++
- llvm/cmake/modules/LLVMConfig.cmake.in | 2 ++
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 619e986..200fc45 100644
---- a/llvm/cmake/modules/AddLLVM.cmake
-+++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -691,7 +691,11 @@ macro(add_llvm_library name)
-       if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
-           (in_llvm_libs AND "llvm-libraries" IN_LIST LLVM_DISTRIBUTION_COMPONENTS) OR
-           NOT LLVM_DISTRIBUTION_COMPONENTS)
--        set(export_to_llvmexports EXPORT LLVMExports)
-+        if (ARG_SHARED)
-+          set(export_to_llvmexports EXPORT LLVMExports)
-+        else()
-+          set(export_to_llvmexports EXPORT LLVMStaticExports)
-+        endif()
-         set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True)
-       endif()
- 
-diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
-index 9cf22b4..dc982d2 100644
---- a/llvm/cmake/modules/CMakeLists.txt
-+++ b/llvm/cmake/modules/CMakeLists.txt
-@@ -105,6 +105,7 @@ set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}")
- set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin")
- set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake")
- set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}")
-+set(LLVM_CONFIG_STATIC_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMStaticExports.cmake")
- configure_file(
-   LLVMConfig.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLVMConfig.cmake
-@@ -121,6 +122,8 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-   if(llvm_has_exports)
-     install(EXPORT LLVMExports DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}
-             COMPONENT cmake-exports)
-+    install(EXPORT LLVMStaticExports DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}
-+            COMPONENT cmake-exports)
-   endif()
- 
-   install(FILES
-diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
-index 536031f..6ef54a0 100644
---- a/llvm/cmake/modules/LLVMConfig.cmake.in
-+++ b/llvm/cmake/modules/LLVMConfig.cmake.in
-@@ -89,6 +89,8 @@ if(NOT TARGET LLVMSupport)
-   set(LLVM_EXPORTED_TARGETS "@LLVM_CONFIG_EXPORTS@")
-   include("@LLVM_CONFIG_EXPORTS_FILE@")
-   @llvm_config_include_buildtree_only_exports@
-+
-+  include("@LLVM_CONFIG_STATIC_EXPORTS_FILE@" OPTIONAL)
- endif()
- 
- # By creating intrinsics_gen here, subprojects that depend on LLVM's
--- 
-1.8.3.1
-

SOURCES/0001-CMake-Split-test-binary-exports-into-their-own-expor.patch

@@ -1,65 +0,0 @@
-From 9d496e978f59e153bb76e92229d5a524d92dee04 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 10 Sep 2019 13:33:48 -0700
-Subject: [PATCH] CMake: Split test binary exports into their own export file
-
----
- llvm/cmake/modules/AddLLVM.cmake       | 7 ++++++-
- llvm/cmake/modules/CMakeLists.txt      | 3 +++
- llvm/cmake/modules/LLVMConfig.cmake.in | 1 +
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 200fc45..9eec7a7 100644
---- a/llvm/cmake/modules/AddLLVM.cmake
-+++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -953,7 +953,12 @@ macro(add_llvm_utility name)
-       set(export_to_llvmexports)
-       if (${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
-           NOT LLVM_DISTRIBUTION_COMPONENTS)
--        set(export_to_llvmexports EXPORT LLVMExports)
-+        if (${name} STREQUAL "not" OR ${name} STREQUAL "count" OR
-+            ${name} STREQUAL "yaml-bench" OR ${name} STREQUAL "lli-child-target")
-+          set(export_to_llvmexports EXPORT LLVMTestExports)
-+        else()
-+          set(export_to_llvmexports EXPORT LLVMExports)
-+        endif()
-         set_property(GLOBAL PROPERTY LLVM_HAS_EXPORTS True)
-       endif()
- 
-diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
-index dc982d2..c861f45 100644
---- a/llvm/cmake/modules/CMakeLists.txt
-+++ b/llvm/cmake/modules/CMakeLists.txt
-@@ -106,6 +106,7 @@ set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin")
- set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake")
- set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}")
- set(LLVM_CONFIG_STATIC_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMStaticExports.cmake")
-+set(LLVM_CONFIG_TEST_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMTestExports.cmake")
- configure_file(
-   LLVMConfig.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLVMConfig.cmake
-@@ -124,6 +125,8 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-             COMPONENT cmake-exports)
-     install(EXPORT LLVMStaticExports DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}
-             COMPONENT cmake-exports)
-+    install(EXPORT LLVMTestExports DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}
-+            COMPONENT cmake-exports)
-   endif()
- 
-   install(FILES
-diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
-index 6ef54a0..d81b09a 100644
---- a/llvm/cmake/modules/LLVMConfig.cmake.in
-+++ b/llvm/cmake/modules/LLVMConfig.cmake.in
-@@ -91,6 +91,7 @@ if(NOT TARGET LLVMSupport)
-   @llvm_config_include_buildtree_only_exports@
- 
-   include("@LLVM_CONFIG_STATIC_EXPORTS_FILE@" OPTIONAL)
-+  include("@LLVM_CONFIG_TEST_EXPORTS_FILE@" OPTIONAL)
- endif()
- 
- # By creating intrinsics_gen here, subprojects that depend on LLVM's
--- 
-1.8.3.1
-

SOURCES/0001-Deactivate-markdown-doc.patch

@@ -1,28 +0,0 @@
-From e7bc515182199764b17ab3f5e22047342f9c7514 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Thu, 13 Jun 2019 07:58:59 +0000
-Subject: [PATCH] Deactivate markdown doc
-
----
- llvm/docs/conf.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py
-index 4a52df8..340cd07 100644
---- a/llvm/docs/conf.py
-+++ b/llvm/docs/conf.py
-@@ -32,9 +32,9 @@ extensions = ['sphinx.ext.intersphinx', 'sphinx.ext.todo']
- templates_path = ['_templates']
- 
- # The suffix of source filenames.
--source_suffix = ['.rst', '.md']
-+source_suffix = ['.rst']
- 
--source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
-+source_parsers = {}
- 
- # The encoding of source files.
- #source_encoding = 'utf-8-sig'
--- 
-1.8.3.1
-

SOURCES/0001-Docs-llvm-strip-Add-help-text-to-llvm-strip-rst-doc.patch

@@ -1,223 +0,0 @@
-From 8987da9a2cac6c5bd39ba100ffd1aaede94dc6a0 Mon Sep 17 00:00:00 2001
-From: Michael Pozulp <pozulp.llvm@gmail.com>
-Date: Fri, 9 Aug 2019 19:10:55 +0000
-Subject: [PATCH] [Docs][llvm-strip] Add help text to llvm-strip rst doc
-
-Summary: Addresses https://bugs.llvm.org/show_bug.cgi?id=42383
-
-Reviewers: jhenderson, alexshap, rupprecht
-
-Reviewed By: jhenderson
-
-Subscribers: wolfgangp, jakehehrlich, llvm-commits
-
-Tags: #llvm
-
-Differential Revision: https://reviews.llvm.org/D65384
-
-llvm-svn: 368464
----
- llvm/docs/CommandGuide/llvm-strip.md  |  16 ----
- llvm/docs/CommandGuide/llvm-strip.rst | 167 ++++++++++++++++++++++++++++++++++
- 2 files changed, 167 insertions(+), 16 deletions(-)
- delete mode 100644 llvm/docs/CommandGuide/llvm-strip.md
- create mode 100644 llvm/docs/CommandGuide/llvm-strip.rst
-
-diff --git a/llvm/docs/CommandGuide/llvm-strip.md b/llvm/docs/CommandGuide/llvm-strip.md
-deleted file mode 100644
-index dd6e859..0000000
---- a/llvm/docs/CommandGuide/llvm-strip.md
-+++ /dev/null
-@@ -1,16 +0,0 @@
--# llvm-strip - object stripping tool
--
--## SYNOPSIS
--
--**llvm-strip** [*options*]
--
--## DESCRIPTION
--
--**llvm-strip** is a tool to strip sections and symbols from object files.
--
--The tool is still in active development, but in most scenarios it works as a
--drop-in replacement for GNU's **strip**.
--
--## SEE ALSO
--
--[llvm-objcopy](llvm-objcopy.html)
-diff --git a/llvm/docs/CommandGuide/llvm-strip.rst b/llvm/docs/CommandGuide/llvm-strip.rst
-new file mode 100644
-index 0000000..6e02482
---- /dev/null
-+++ b/llvm/docs/CommandGuide/llvm-strip.rst
-@@ -0,0 +1,167 @@
-+llvm-strip - object stripping tool
-+==================================
-+
-+.. program:: llvm-strip
-+
-+SYNOPSIS
-+--------
-+
-+:program:`llvm-strip` [*options*] *inputs...*
-+
-+DESCRIPTION
-+-----------
-+
-+:program:`llvm-strip` is a tool to strip sections and symbols from object files.
-+If no other stripping or remove options are specified, :option:`--strip-all`
-+will be enabled by default.
-+
-+The input files are modified in-place. If "-" is specified for the input file,
-+the input is read from the program's standard input stream.
-+
-+If the input is an archive, any requested operations will be applied to each
-+archive member individually.
-+
-+The tool is still in active development, but in most scenarios it works as a
-+drop-in replacement for GNU's :program:`strip`.
-+
-+GENERIC AND CROSS-PLATFORM OPTIONS
-+----------------------------------
-+
-+The following options are either agnostic of the file format, or apply to
-+multiple file formats.
-+
-+.. option:: --disable-deterministic-archives, -U
-+
-+ Use real values for UIDs, GIDs and timestamps when updating archive member
-+ headers.
-+
-+.. option:: --discard-all, -x
-+
-+ Remove most local symbols from the output. Different file formats may limit
-+ this to a subset of the local symbols. For example, file and section symbols in
-+ ELF objects will not be discarded.
-+
-+.. option::  --enable-deterministic-archives, -D
-+
-+ Enable deterministic mode when stripping archives, i.e. use 0 for archive member
-+ header UIDs, GIDs and timestamp fields. On by default.
-+
-+.. option:: --help, -h
-+
-+ Print a summary of command line options.
-+
-+.. option::  --no-strip-all
-+
-+ Disable --strip-all.
-+
-+.. option::  -o <file>
-+
-+ Write output to <file>. Multiple input files cannot be used in combination
-+ with -o.
-+
-+.. option:: --regex
-+
-+ If specified, symbol and section names specified by other switches are treated
-+ as extended POSIX regular expression patterns.
-+
-+.. option:: --remove-section <section>, -R
-+
-+ Remove the specified section from the output. Can be specified multiple times
-+ to remove multiple sections simultaneously.
-+
-+.. option:: --strip-all-gnu
-+
-+ Remove all symbols, debug sections and relocations from the output. This option
-+ is equivalent to GNU :program:`strip`'s ``--strip-all`` switch.
-+
-+.. option:: --strip-all, -S
-+
-+ For ELF objects, remove from the output all symbols and non-alloc sections not
-+ within segments, except for .gnu.warning sections and the section name table.
-+
-+ For COFF objects, remove all symbols, debug sections, and relocations from the
-+ output.
-+
-+.. option:: --strip-debug, -g
-+
-+ Remove all debug sections.
-+
-+.. option:: --strip-sections
-+
-+ Remove all section headers and all sections not in segments.
-+
-+.. option:: --strip-symbol <symbol>, -N
-+
-+ Remove all symbols named ``<symbol>`` from the output. Can be specified
-+ multiple times to remove multiple symbols.
-+
-+.. option:: --strip-unneeded
-+
-+ Remove all local or undefined symbols that are not required by relocations.
-+
-+.. option:: --version, -V
-+
-+  Display the version of this program.
-+
-+COFF-SPECIFIC OPTIONS
-+---------------------
-+
-+The following options are implemented only for COFF objects. If used with other
-+objects, :program:`llvm-strip` will either emit an error or silently ignore
-+them.
-+
-+.. option:: --only-keep-debug
-+
-+ Remove the contents of non-debug sections from the output, but keep the section
-+ headers.
-+
-+ELF-SPECIFIC OPTIONS
-+--------------------
-+
-+The following options are implemented only for ELF objects. If used with other
-+objects, :program:`llvm-strip` will either emit an error or silently ignore
-+them.
-+
-+.. option:: --allow-broken-links
-+
-+ Allow llvm-strip to remove sections even if it would leave invalid section
-+ references. Any invalid sh_link fields will be set to zero.
-+
-+.. option:: --discard-locals, -X
-+
-+ Remove local symbols starting with ".L" from the output.
-+
-+.. option:: --keep-file-symbols
-+
-+ Keep symbols of type `STT_FILE`, even if they would otherwise be stripped.
-+
-+ .. option:: --keep-section <section>
-+
-+ When removing sections from the output, do not remove sections named
-+ ``<section>``. Can be specified multiple times to keep multiple sections.
-+
-+.. option:: --keep-symbol <symbol>, -K
-+
-+ Do not remove symbols named ``<symbol>``. Can be specified multiple times to
-+ keep multiple symbols.
-+
-+.. option::  --preserve-dates, -p
-+
-+ Preserve access and modification timestamps.
-+
-+
-+EXIT STATUS
-+-----------
-+
-+:program:`llvm-strip` exits with a non-zero exit code if there is an error.
-+Otherwise, it exits with code 0.
-+
-+BUGS
-+----
-+
-+To report bugs, please visit <http://llvm.org/bugs/>.
-+
-+SEE ALSO
-+--------
-+
-+:manpage:`llvm-objcopy(1)`
--- 
-1.8.3.1
-

SOURCES/0001-Filter-out-cxxflags-not-supported-by-clang.patch

@@ -1,28 +0,0 @@
-From d15c835028bcc72a8695d047f0acaa530aa54716 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Wed, 31 Jul 2019 20:43:42 -0700
-Subject: [PATCH] Filter out cxxflags not supported by clang
-
----
- llvm/tools/llvm-config/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt
-index 8e97a10..9b9b7d1 100644
---- a/llvm/tools/llvm-config/CMakeLists.txt
-+++ b/llvm/tools/llvm-config/CMakeLists.txt
-@@ -43,7 +43,11 @@ set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR})
- set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
- set(LLVM_CPPFLAGS "${LLVM_DEFINITIONS}")
- set(LLVM_CFLAGS "${LLVM_C_STD_FLAG} ${LLVM_DEFINITIONS}")
-+STRING(REGEX REPLACE "-mcet" "" LLVM_CFLAGS ${LLVM_CFLAGS})
-+STRING(REGEX REPLACE "-fcf-protection" "" LLVM_CFLAGS ${LLVM_CFLAGS})
- set(LLVM_CXXFLAGS "${LLVM_CXX_STD_FLAG} ${LLVM_CXX_STDLIB_FLAG} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
-+STRING(REGEX REPLACE "-mcet" "" LLVM_CXXFLAGS ${LLVM_CXXFLAGS})
-+STRING(REGEX REPLACE "-fcf-protection" "" LLVM_CXXFLAGS ${LLVM_CXXFLAGS})
- set(LLVM_BUILD_SYSTEM cmake)
- set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
- set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}")
--- 
-1.8.3.1
-

SOURCES/0001-PEI-Don-t-zero-out-noreg-operands.patch

@@ -0,0 +1,74 @@
+From 9d1f05a7b8537deb5f626cd1b7b26ef2678f4c8e Mon Sep 17 00:00:00 2001
+From: Arthur Eubanks <aeubanks@google.com>
+Date: Thu, 27 Jul 2023 13:27:58 -0700
+Subject: [PATCH] [PEI] Don't zero out noreg operands
+
+A tail call may have $noreg operands.
+
+Fixes a crash.
+
+Reviewed By: xgupta
+
+Differential Revision: https://reviews.llvm.org/D156485
+
+(cherry picked from commit f800c1f3b207e7bcdc8b4c7192928d9a078242a0)
+---
+ llvm/lib/CodeGen/PrologEpilogInserter.cpp    |  9 +++++++--
+ llvm/test/CodeGen/X86/zero-call-used-regs.ll | 14 ++++++++++++++
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/llvm/lib/CodeGen/PrologEpilogInserter.cpp
+index e323aaaeefaf..49047719fdaa 100644
+--- a/llvm/lib/CodeGen/PrologEpilogInserter.cpp
++++ b/llvm/lib/CodeGen/PrologEpilogInserter.cpp
+@@ -1285,6 +1285,8 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) {
+           continue;
+ 
+         MCRegister Reg = MO.getReg();
++        if (!Reg)
++          continue;
+ 
+         // This picks up sibling registers (e.q. %al -> %ah).
+         for (MCRegUnit Unit : TRI.regunits(Reg))
+@@ -1308,8 +1310,11 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) {
+         if (!MO.isReg())
+           continue;
+ 
+-        for (const MCPhysReg &Reg :
+-             TRI.sub_and_superregs_inclusive(MO.getReg()))
++        MCRegister Reg = MO.getReg();
++        if (!Reg)
++          continue;
++
++        for (const MCPhysReg Reg : TRI.sub_and_superregs_inclusive(Reg))
+           RegsToZero.reset(Reg);
+       }
+     }
+diff --git a/llvm/test/CodeGen/X86/zero-call-used-regs.ll b/llvm/test/CodeGen/X86/zero-call-used-regs.ll
+index 63d51c916bb9..97ad5ce9c8cb 100644
+--- a/llvm/test/CodeGen/X86/zero-call-used-regs.ll
++++ b/llvm/test/CodeGen/X86/zero-call-used-regs.ll
+@@ -241,6 +241,20 @@ entry:
+   ret i32 %x
+ }
+ 
++define dso_local void @tailcall(ptr %p) local_unnamed_addr #0 "zero-call-used-regs"="used-gpr" {
++; I386-LABEL: tailcall:
++; I386:       # %bb.0:
++; I386-NEXT:    movl {{[0-9]+}}(%esp), %eax
++; I386-NEXT:    jmpl *(%eax) # TAILCALL
++;
++; X86-64-LABEL: tailcall:
++; X86-64:       # %bb.0:
++; X86-64-NEXT:    jmpq *(%rdi) # TAILCALL
++  %c = load ptr, ptr %p
++  tail call void %c()
++  ret void
++}
++
+ ; Don't emit zeroing registers in "main" function.
+ define dso_local i32 @main() local_unnamed_addr #1 {
+ ; I386-LABEL: main:
+-- 
+2.43.0
+

SOURCES/0001-Pass-target-to-gold-linker-to-avoid-faliures-on-i686.patch

@@ -1,34 +0,0 @@
-From f0762684457a883b6813b48c98a1e94e377bc06b Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Wed, 28 Aug 2019 19:31:21 -0700
-Subject: [PATCH] Pass target to gold linker to avoid faliures on i686
-
----
- llvm/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/llvm/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll b/llvm/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
-index 525bf2d..01291bd 100644
---- a/llvm/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
-+++ b/llvm/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
-@@ -3,7 +3,7 @@
- 
- ; RUN: opt -module-summary %s -o %t.o
- ; RUN: opt -module-summary %p/Inputs/linkonce_odr_unnamed_addr.ll -o %t2.o
--; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
-+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
- ; RUN:    --plugin-opt=save-temps \
- ; RUN:    %t.o %t2.o -o %t3.o
- ; RUN: llvm-dis %t.o.1.promote.bc -o - | FileCheck %s
-@@ -11,7 +11,7 @@
- ; Now test when one module is a native object. In that case we must be
- ; conservative and not auto hide.
- ; RUN: llc %p/Inputs/linkonce_odr_unnamed_addr.ll -o %t2native.o -filetype=obj
--; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
-+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
- ; RUN:    --plugin-opt=save-temps \
- ; RUN:    %t.o %t2native.o -o %t3.o
- ; RUN: llvm-dis %t.o.1.promote.bc -o - | FileCheck %s --check-prefix=NOSUMMARY
--- 
-1.8.3.1
-

SOURCES/0001-Revert-SCEV-add-no-wrap-flag-for-SCEVAddExpr.patch

@@ -1,113 +0,0 @@
-From 58e8c793d0e43150a6452e971a32d7407a8a7401 Mon Sep 17 00:00:00 2001
-From: Tim Northover <tnorthover@apple.com>
-Date: Mon, 30 Sep 2019 07:46:52 +0000
-Subject: [PATCH] Revert "[SCEV] add no wrap flag for SCEVAddExpr."
-
-This reverts r366419 because the analysis performed is within the context of
-the loop and it's only valid to add wrapping flags to "global" expressions if
-they're always correct.
-
-llvm-svn: 373184
----
- llvm/lib/Analysis/ScalarEvolution.cpp              | 2 +-
- llvm/test/Analysis/ScalarEvolution/limit-depth.ll  | 2 +-
- llvm/test/Analysis/ScalarEvolution/nsw.ll          | 2 +-
- llvm/test/Analysis/ScalarEvolution/trip-count12.ll | 2 +-
- llvm/test/Analysis/ScalarEvolution/trip-count9.ll  | 8 ++++----
- 5 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
-index 354ae05bb841..c29fc5dbccfb 100644
---- a/llvm/lib/Analysis/ScalarEvolution.cpp
-+++ b/llvm/lib/Analysis/ScalarEvolution.cpp
-@@ -4992,7 +4992,7 @@ const SCEV *ScalarEvolution::createSimpleAffineAddRec(PHINode *PN,
-   // overflow.
-   if (auto *BEInst = dyn_cast<Instruction>(BEValueV))
-     if (isLoopInvariant(Accum, L) && isAddRecNeverPoison(BEInst, L))
--      (void)getAddRecExpr(getAddExpr(StartVal, Accum, Flags), Accum, L, Flags);
-+      (void)getAddRecExpr(getAddExpr(StartVal, Accum), Accum, L, Flags);
- 
-   return PHISCEV;
- }
-diff --git a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll
-index db68a4f84c91..6fdf8c5df974 100644
---- a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll
-+++ b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll
-@@ -46,7 +46,7 @@ define void @test_mul(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) {
- define void @test_sext(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) {
- ; CHECK-LABEL: @test_sext
- ; CHECK:        %se2 = sext i64 %iv2.inc to i128
--; CHECK-NEXT:   -->  {(1 + (sext i64 {(sext i32 (1 + %a)<nsw> to i64),+,1}<nsw><%loop> to i128))<nsw>,+,1}<nsw><%loop2>
-+; CHECK-NEXT:   -->  {(1 + (sext i64 {(sext i32 (1 + %a) to i64),+,1}<nsw><%loop> to i128))<nsw>,+,1}<nsw><%loop2>
- entry:
-   br label %loop
- 
-diff --git a/llvm/test/Analysis/ScalarEvolution/nsw.ll b/llvm/test/Analysis/ScalarEvolution/nsw.ll
-index 69427368625d..ca24f9d4a04b 100644
---- a/llvm/test/Analysis/ScalarEvolution/nsw.ll
-+++ b/llvm/test/Analysis/ScalarEvolution/nsw.ll
-@@ -163,7 +163,7 @@ bb5:                                              ; preds = %bb2
- declare void @f(i32)
- 
- ; CHECK-LABEL: nswnowrap
--; CHECK: --> {(1 + %v)<nsw>,+,1}<nsw><%for.body>{{ U: [^ ]+ S: [^ ]+}}{{ *}}Exits: (2 + %v)
-+; CHECK: --> {(1 + %v)<nsw>,+,1}<nsw><%for.body>{{ U: [^ ]+ S: [^ ]+}}{{ *}}Exits: (1 + ((1 + %v)<nsw> smax %v))
- define void @nswnowrap(i32 %v, i32* %buf) {
- entry:
-   %add = add nsw i32 %v, 1
-diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll
-index 5e7d72d5e4f3..d0086ee2e6ac 100644
---- a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll
-+++ b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll
-@@ -1,7 +1,7 @@
- ; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s
- 
- ; CHECK: Determining loop execution counts for: @test
--; CHECK: Loop %for.body: backedge-taken count is ((-2 + %len)<nsw> /u 2)
-+; CHECK: Loop %for.body: backedge-taken count is ((-2 + %len) /u 2)
- ; CHECK: Loop %for.body: max backedge-taken count is 1073741823
- 
- define zeroext i16 @test(i16* nocapture %p, i32 %len) nounwind readonly {
-diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll
-index c0a1d12fa00e..9a080b34743f 100644
---- a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll
-+++ b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll
-@@ -179,7 +179,7 @@ exit:
- }
- 
- ; CHECK: Determining loop execution counts for: @nsw_startx
--; CHECK: Loop %loop: backedge-taken count is (-1 + (-1 * %x) + ((1 + %x)<nsw> smax %n))
-+; CHECK: Loop %loop: backedge-taken count is (-1 + (-1 * %x) + ((1 + %x) smax %n))
- ; CHECK: Loop %loop: max backedge-taken count is -1
- define void @nsw_startx(i4 %n, i4 %x) {
- entry:
-@@ -195,7 +195,7 @@ exit:
- }
- 
- ; CHECK: Determining loop execution counts for: @nsw_startx_step2
--; CHECK: Loop %loop: backedge-taken count is ((-1 + (-1 * %x) + ((2 + %x)<nsw> smax %n)) /u 2)
-+; CHECK: Loop %loop: backedge-taken count is ((-1 + (-1 * %x) + ((2 + %x) smax %n)) /u 2)
- ; CHECK: Loop %loop: max backedge-taken count is 7
- define void @nsw_startx_step2(i4 %n, i4 %x) {
- entry:
-@@ -381,7 +381,7 @@ exit:
- }
- 
- ; CHECK: Determining loop execution counts for: @even_nsw_startx
--; CHECK: Loop %loop: backedge-taken count is (-1 + (-1 * %x) + ((1 + %x)<nsw> smax (2 * %n)))
-+; CHECK: Loop %loop: backedge-taken count is (-1 + (-1 * %x) + ((1 + %x) smax (2 * %n)))
- ; CHECK: Loop %loop: max backedge-taken count is -2
- define void @even_nsw_startx(i4 %n, i4 %x) {
- entry:
-@@ -398,7 +398,7 @@ exit:
- }
- 
- ; CHECK: Determining loop execution counts for: @even_nsw_startx_step2
--; CHECK: Loop %loop: backedge-taken count is ((-1 + (-1 * %x) + ((2 + %x)<nsw> smax (2 * %n))) /u 2)
-+; CHECK: Loop %loop: backedge-taken count is ((-1 + (-1 * %x) + ((2 + %x) smax (2 * %n))) /u 2)
- ; CHECK: Loop %loop: max backedge-taken count is 7
- define void @even_nsw_startx_step2(i4 %n, i4 %x) {
- entry:
--- 
-2.24.1
-

SOURCES/0001-docs-Convert-remaining-command-guide-entries-from-md.patch

@@ -1,248 +0,0 @@
-From e4e77bb8bf741f52b43b90987646f1c118914848 Mon Sep 17 00:00:00 2001
-From: Jordan Rupprecht <rupprecht@google.com>
-Date: Wed, 21 Aug 2019 18:00:17 +0000
-Subject: [PATCH] [docs] Convert remaining command guide entries from md to
- rst.
-
-Summary:
-Linking between markdown and rst files is currently not supported very well, e.g. the current llvm-addr2line docs [1] link to "llvm-symbolizer" instead of "llvm-symbolizer.html". This is weirdly broken in different ways depending on which versions of sphinx and recommonmark are being used, so workaround the bug by using rst everywhere.
-
-[1] http://llvm.org/docs/CommandGuide/llvm-addr2line.html
-
-Reviewers: jhenderson
-
-Reviewed By: jhenderson
-
-Subscribers: lebedev.ri, llvm-commits
-
-Tags: #llvm
-
-Differential Revision: https://reviews.llvm.org/D66305
-
-llvm-svn: 369553
----
- llvm/docs/CommandGuide/llvm-addr2line.md  | 28 -----------------------
- llvm/docs/CommandGuide/llvm-addr2line.rst | 38 +++++++++++++++++++++++++++++++
- llvm/docs/CommandGuide/llvm-ranlib.md     | 17 --------------
- llvm/docs/CommandGuide/llvm-ranlib.rst    | 23 +++++++++++++++++++
- llvm/docs/CommandGuide/llvm-size.md       | 10 --------
- llvm/docs/CommandGuide/llvm-size.rst      | 15 ++++++++++++
- llvm/docs/CommandGuide/llvm-strings.md    | 10 --------
- llvm/docs/CommandGuide/llvm-strings.rst   | 15 ++++++++++++
- 8 files changed, 91 insertions(+), 65 deletions(-)
- delete mode 100644 llvm/docs/CommandGuide/llvm-addr2line.md
- create mode 100644 llvm/docs/CommandGuide/llvm-addr2line.rst
- delete mode 100644 llvm/docs/CommandGuide/llvm-ranlib.md
- create mode 100644 llvm/docs/CommandGuide/llvm-ranlib.rst
- delete mode 100644 llvm/docs/CommandGuide/llvm-size.md
- create mode 100644 llvm/docs/CommandGuide/llvm-size.rst
- delete mode 100644 llvm/docs/CommandGuide/llvm-strings.md
- create mode 100644 llvm/docs/CommandGuide/llvm-strings.rst
-
-diff --git a/llvm/docs/CommandGuide/llvm-addr2line.md b/llvm/docs/CommandGuide/llvm-addr2line.md
-deleted file mode 100644
-index 03224c4..0000000
---- a/llvm/docs/CommandGuide/llvm-addr2line.md
-+++ /dev/null
-@@ -1,28 +0,0 @@
--# llvm-addr2line - a drop-in replacement for addr2line
--
--## SYNOPSIS
--
--**llvm-addr2line** [*options*]
--
--## DESCRIPTION
--
--**llvm-addr2line** is an alias for the [llvm-symbolizer](llvm-symbolizer) tool
--with different defaults. The goal is to make it a drop-in replacement for
--GNU's **addr2line**.
--
--Here are some of those differences:
--
--* Defaults not to print function names. Use [-f](llvm-symbolizer-opt-f)
--  to enable that.
--
--* Defaults not to demangle function names. Use [-C](llvm-symbolizer-opt-C)
--  to switch the demangling on.
--
--* Defaults not to print inlined frames. Use [-i](llvm-symbolizer-opt-i)
--  to show inlined frames for a source code location in an inlined function.
--
--* Uses [--output-style=GNU](llvm-symbolizer-opt-output-style) by default.
--
--## SEE ALSO
--
--Refer to [llvm-symbolizer](llvm-symbolizer) for additional information.
-diff --git a/llvm/docs/CommandGuide/llvm-addr2line.rst b/llvm/docs/CommandGuide/llvm-addr2line.rst
-new file mode 100644
-index 0000000..08f1b69
---- /dev/null
-+++ b/llvm/docs/CommandGuide/llvm-addr2line.rst
-@@ -0,0 +1,38 @@
-+llvm-addr2line - a drop-in replacement for addr2line
-+====================================================
-+
-+.. program:: llvm-addr2line
-+
-+SYNOPSIS
-+--------
-+
-+:program:`llvm-addr2line` [*options*]
-+
-+DESCRIPTION
-+-----------
-+
-+:program:`llvm-addr2line` is an alias for the :manpage:`llvm-symbolizer(1)`
-+tool with different defaults. The goal is to make it a drop-in replacement for
-+GNU's :program:`addr2line`.
-+
-+Here are some of those differences:
-+
-+-  Defaults not to print function names. Use `-f`_ to enable that.
-+
-+-  Defaults not to demangle function names. Use `-C`_ to switch the
-+   demangling on.
-+
-+-  Defaults not to print inlined frames. Use `-i`_ to show inlined
-+   frames for a source code location in an inlined function.
-+
-+-  Uses `--output-style=GNU`_ by default.
-+
-+SEE ALSO
-+--------
-+
-+:manpage:`llvm-symbolizer(1)`
-+
-+.. _-f: llvm-symbolizer.html#llvm-symbolizer-opt-f
-+.. _-C: llvm-symbolizer.html#llvm-symbolizer-opt-c
-+.. _-i: llvm-symbolizer.html#llvm-symbolizer-opt-i
-+.. _--output-style=GNU: llvm-symbolizer.html#llvm-symbolizer-opt-output-style
-diff --git a/llvm/docs/CommandGuide/llvm-ranlib.md b/llvm/docs/CommandGuide/llvm-ranlib.md
-deleted file mode 100644
-index 4377364..0000000
---- a/llvm/docs/CommandGuide/llvm-ranlib.md
-+++ /dev/null
-@@ -1,17 +0,0 @@
--# llvm-ranlib - generates an archive index
--
--## SYNOPSIS
--
--**llvm-ranlib** [*options*]
--
--## DESCRIPTION
--
--**llvm-ranlib** is an alias for the [llvm-ar](llvm-ar.html) tool that generates
--an index for an archive. It can be used as a replacement for GNU's **ranlib**
--tool.
--
--Running **llvm-ranlib** is equivalent to running **llvm-ar s**.
--
--## SEE ALSO
--
--Refer to [llvm-ar](llvm-ar.html) for additional information.
-diff --git a/llvm/docs/CommandGuide/llvm-ranlib.rst b/llvm/docs/CommandGuide/llvm-ranlib.rst
-new file mode 100644
-index 0000000..314a330
---- /dev/null
-+++ b/llvm/docs/CommandGuide/llvm-ranlib.rst
-@@ -0,0 +1,23 @@
-+llvm-ranlib - generates an archive index
-+========================================
-+
-+.. program:: llvm-ranlib
-+
-+SYNOPSIS
-+--------
-+
-+:program:`llvm-ranlib` [*options*]
-+
-+DESCRIPTION
-+-----------
-+
-+:program:`llvm-ranlib` is an alias for the :doc:`llvm-ar <llvm-ar>` tool that
-+generates an index for an archive. It can be used as a replacement for GNU’s
-+:program:`ranlib` tool.
-+
-+Running :program:`llvm-ranlib` is equivalent to running ``llvm-ar s``.
-+
-+SEE ALSO
-+--------
-+
-+:manpage:`llvm-ar(1)`
-diff --git a/llvm/docs/CommandGuide/llvm-size.md b/llvm/docs/CommandGuide/llvm-size.md
-deleted file mode 100644
-index 3952708..0000000
---- a/llvm/docs/CommandGuide/llvm-size.md
-+++ /dev/null
-@@ -1,10 +0,0 @@
--# llvm-size - print segment sizes
--
--## SYNOPSIS
--
--**llvm-size** [*options*]
--
--## DESCRIPTION
--
--**llvm-size** is a tool that prints segment sizes in object files. The goal is
--to make it a drop-in replacement for GNU's **size**.
-diff --git a/llvm/docs/CommandGuide/llvm-size.rst b/llvm/docs/CommandGuide/llvm-size.rst
-new file mode 100644
-index 0000000..0dce15c
---- /dev/null
-+++ b/llvm/docs/CommandGuide/llvm-size.rst
-@@ -0,0 +1,15 @@
-+llvm-size - print size information
-+==================================
-+
-+.. program:: llvm-size
-+
-+SYNOPSIS
-+--------
-+
-+:program:`llvm-size` [*options*]
-+
-+DESCRIPTION
-+-----------
-+
-+:program:`llvm-size` is a tool that prints size information for object files.
-+The goal is to make it a drop-in replacement for GNU’s :program:`size`.
-diff --git a/llvm/docs/CommandGuide/llvm-strings.md b/llvm/docs/CommandGuide/llvm-strings.md
-deleted file mode 100644
-index b5871c4..0000000
---- a/llvm/docs/CommandGuide/llvm-strings.md
-+++ /dev/null
-@@ -1,10 +0,0 @@
--# llvm-strings - print strings
--
--## SYNOPSIS
--
--**llvm-strings** [*options*]
--
--## DESCRIPTION
--
--**llvm-strings** is a tool that prints strings in object files. The goal is to
--make it a drop-in replacement for GNU's **size**.
-diff --git a/llvm/docs/CommandGuide/llvm-strings.rst b/llvm/docs/CommandGuide/llvm-strings.rst
-new file mode 100644
-index 0000000..d8ab9cb
---- /dev/null
-+++ b/llvm/docs/CommandGuide/llvm-strings.rst
-@@ -0,0 +1,15 @@
-+llvm-strings - print strings
-+============================
-+
-+.. program:: llvm-strings
-+
-+SYNOPSIS
-+--------
-+
-+:program:`llvm-strings` [*options*]
-+
-+DESCRIPTION
-+-----------
-+
-+:program:`llvm-strings` is a tool that prints strings in files. The goal is to
-+make it a drop-in replacement for GNU’s :program:`strings`.
--- 
-1.8.3.1
-

SOURCES/0101-Deactivate-markdown-doc.patch

@@ -0,0 +1,26 @@
+diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py
+--- a/llvm/docs/conf.py	2020-09-15 09:12:24.318287611 +0000
++++ b/llvm/docs/conf.py	2020-09-15 15:01:00.025893199 +0000
+@@ -36,21 +36,7 @@
+     ".rst": "restructuredtext",
+ }
+ 
+-try:
+-    import recommonmark
+-except ImportError:
+-    # manpages do not use any .md sources
+-    if not tags.has("builder-man"):
+-        raise
+-else:
+-    import sphinx
+-
+-    if sphinx.version_info >= (3, 0):
+-        # This requires 0.5 or later.
+-        extensions.append("recommonmark")
+-    else:
+-        source_parsers = {".md": "recommonmark.parser.CommonMarkParser"}
+-    source_suffix[".md"] = "markdown"
++import sphinx
+ 
+ # The encoding of source files.
+ # source_encoding = 'utf-8-sig'

SOURCES/lit.fedora.cfg.py

@@ -1,17 +0,0 @@
-
-config.llvm_tools_dir = '/usr/bin'
-config.llvm_shlib_dir = '%(llvm_shlib_dir)s' % lit_config.params
-
-if hasattr(config, 'host_triple'):
-    # This means we are running lit regression tests
-
-    # Regression tests write output to this directory, so we need to be able to specify
-    # a temp directory when invoking lit. e.g. lit -Dllvm_obj_root=/tmp/lit
-    config.llvm_obj_root = "%(llvm_obj_root)s" % lit_config.params
-    lit_config.load_config(config, '%(llvm_test_root)s/lit.cfg.py' % lit_config.params)
-else:
-    # This means we are running lit unit tests
-
-    # For unit tests, llvm_obj_root is used to find the unit test binaries.
-    config.llvm_obj_root = '%(llvm_unittest_bindir)s' % lit_config.params
-    lit_config.load_config(config, '%(llvm_test_root)s/Unit/lit.cfg.py' % lit_config.params)

SOURCES/release-keys.asc

@@ -0,0 +1,104 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+9RmlwZlOTFGcWBYl/cfRONn9qi9a6w==
+=Lvw+
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=tMzl
+-----END PGP PUBLIC KEY BLOCK-----

SOURCES/run-lit-tests

@@ -1,64 +0,0 @@
-#!/bin/bash
-
-usage() {
-    echo "usage: `basename $0` [OPTIONS]"
-    echo "  --threads NUM         The number of threads to use for running tests."
-    echo "  --multilib-arch ARCH  Use this option to test 32-bit libs/binaries on"
-    echo "                        64-bit hosts."
-}
-
-threads_arg=''
-
-while [ $# -gt 0 ]; do
-    case $1 in
-        --threads)
-            shift
-            threads_arg="--threads $1"
-            ;;
-	--multilib-arch)
-            shift
-	    ARCH=$1
-	    ;;
-        * )
-            echo "unknown option: $1"
-            echo ""
-            usage
-            exit 1
-            ;;
-    esac
-    shift
-done
-
-set -xe
-
-if [ -z "$ARCH" ]; then
-    ARCH=`rpm --eval '%_arch'`
-fi
-
-case $ARCH in
-    arm)
-	;&
-    i686)
-        LIB_DIR="/usr/lib/"
-        ;;
-    *)
-        LIB_DIR="/usr/lib64/"
-        ;;
-esac
-
-cd $(mktemp -d)
-ln -s /usr/include include
-tar -xzf /usr/share/llvm/src/test.tar.gz
-ln -s $ARCH.site.cfg.py test/lit.site.cfg.py
-ln -s $ARCH.site.cfg.py test/Unit/lit.site.cfg.py
-
-# llvm_obj_root is used to determine the directory the tests will run in.
-# test/MC/MachO/gen-dwarf.s fails if llvm_obj_root is a parent directory
-# of the source file.  To workaround this, we set llvm_obj_root to a
-# different directory than the one used to store the test sources.
-# This also matches better how tests are run from the llvm source tree.
-lit -v -s $threads_arg test \
-	-Dllvm_obj_root=$(mktemp -d) \
-	-Dllvm_test_root=`pwd`/test \
-	-Dllvm_unittest_bindir=$LIB_DIR/llvm \
-	-Dllvm_shlib_dir=$LIB_DIR

SPECS/llvm.spec

@@ -1,5 +1,20 @@
+%bcond_with snapshot_build
+
+%if %{with snapshot_build}
+# Unlock LLVM Snapshot LUA functions
+%{llvm_sb}
+%endif
+
+# We are building with clang for faster/lower memory LTO builds.
+# See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros
+%global toolchain clang
+
+# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
+# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
+%undefine _include_frame_pointers
+
 # Components enabled if supported by target architecture:
-%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64}
+%define gold_arches %{ix86} x86_64 aarch64 %{power64} s390x
 %ifarch %{gold_arches}
   %bcond_without gold
 %else
@@ -7,84 +22,139 @@
 %endif
 
 %bcond_with compat_build
+%bcond_without check
 
-%global llvm_libdir %{_libdir}/%{name}
-%global build_llvm_libdir %{buildroot}%{llvm_libdir}
-%global maj_ver 9
+%ifarch %ix86
+# Disable LTO on x86 in order to reduce memory consumption
+%bcond_with lto_build
+%else
+%bcond_without lto_build
+%endif
+
+%global maj_ver 17
 %global min_ver 0
-%global patch_ver 1
-#%%global rc_ver 3
-%global baserelease 4
+%global patch_ver 6
+#global rc_ver 4
 
+%if %{with snapshot_build}
+%undefine rc_ver
+%global maj_ver %{llvm_snapshot_version_major}
+%global min_ver %{llvm_snapshot_version_minor}
+%global patch_ver %{llvm_snapshot_version_patch}
+%endif
+
+%global llvm_srcdir llvm-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
+%global cmake_srcdir cmake-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
+%global third_party_srcdir third-party-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
 
 %if %{with compat_build}
-%global pkg_name llvm%{maj_ver}.%{min_ver}
-%global exec_suffix -%{maj_ver}.%{min_ver}
+%global pkg_name llvm%{maj_ver}
+%global exec_suffix -%{maj_ver}
 %global install_prefix %{_libdir}/%{name}
 %global install_bindir %{install_prefix}/bin
 %global install_includedir %{install_prefix}/include
 %global install_libdir %{install_prefix}/lib
 
-%global pkg_bindir %{install_bindir}
 %global pkg_includedir %{_includedir}/%{name}
-%global pkg_libdir %{install_libdir}
+%global pkg_datadir %{install_prefix}/share
 %else
 %global pkg_name llvm
 %global install_prefix /usr
+%global install_bindir %{_bindir}
 %global install_libdir %{_libdir}
-%global pkg_libdir %{install_libdir}
+%global install_includedir %{_includedir}
+%global pkg_datadir %{_datadir}
+%global exec_suffix %{nil}
+%endif
+
+%if 0%{?rhel}
+%global targets_to_build "X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;ARM;Mips;BPF;WebAssembly"
+%global experimental_targets_to_build ""
+%else
+%global targets_to_build "all"
+%global experimental_targets_to_build "AVR"
 %endif
 
 %global build_install_prefix %{buildroot}%{install_prefix}
 
-%if !0%{?rhel}
+# Lower memory usage of dwz on s390x
+%global _dwz_low_mem_die_limit_s390x 1
+%global _dwz_max_die_limit_s390x 1000000
+
+%global llvm_triple %{_target_platform}
+
+# https://fedoraproject.org/wiki/Changes/PythonSafePath#Opting_out
+# Don't add -P to Python shebangs
+# The executable Python scripts in /usr/share/opt-viewer/ import each other
+%undefine _py3_shebang_P
+
+################################################################################
+# OS Specific Configuration
+################################################################################
+
+########
+# RHEL #
+########
+%if 0%{?rhel}
+%global _smp_mflags -j8
+
+%if 0%{?rhel} == 8
+%undefine __cmake_in_source_build
+
 # libedit-devel is a buildroot-only package in RHEL8, so we can't have a
 # any run-time depencies on it.
+%global use_libedit 0
+%endif
+
+%if 0%{?rhel} > 8
 %global use_libedit 1
 %endif
-
-Name:		%{pkg_name}
-Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	%{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
-Summary:	The Low Level Virtual Machine
-
-License:	NCSA
-URL:		http://llvm.org
-Source0:	http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz
-%if %{without compat_build}
-Source1:	run-lit-tests
-Source2:	lit.fedora.cfg.py
 %endif
 
-Patch0:		0001-Filter-out-cxxflags-not-supported-by-clang.patch
-# TODO: I'm not sure why this is needed.  Could be a change in newer version
-# of gold.
-Patch1:		0001-Pass-target-to-gold-linker-to-avoid-faliures-on-i686.patch
-Patch2:		0001-CMake-Split-static-library-exports-into-their-own-ex.patch
-Patch3:		0001-CMake-Split-test-binary-exports-into-their-own-expor.patch
+################################################################################
+# Spec File
+################################################################################
 
-# RHEL-specific patches.
-Patch101:	0001-Deactivate-markdown-doc.patch
-# Patches to convert md files to rst since we don't have the md parser in RHEL.
-Patch102:	0001-Docs-llvm-strip-Add-help-text-to-llvm-strip-rst-doc.patch
-Patch103:	0001-docs-Convert-remaining-command-guide-entries-from-md.patch
 
-# Fix crash in kernel bpf self-tests
-Patch5: 0001-BPF-Handling-type-conversions-correctly-for-CO-RE.patch
-Patch6: 0001-BPF-annotate-DIType-metadata-for-builtin-preseve_arr.patch
+Name:		%{pkg_name}
+Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
+Release:	2%{?dist}
+Summary:	The Low Level Virtual Machine
 
-# Fix Rust codegen bug, https://github.com/rust-lang/rust/issues/69225
-Patch7:	0001-Revert-SCEV-add-no-wrap-flag-for-SCEVAddExpr.patch
+License:	Apache-2.0 WITH LLVM-exception OR NCSA
+URL:		http://llvm.org
+%if %{with snapshot_build}
+Source0:	%{llvm_snapshot_source_prefix}llvm-%{llvm_snapshot_yyyymmdd}.src.tar.xz
+Source2:	%{llvm_snapshot_source_prefix}cmake-%{llvm_snapshot_yyyymmdd}.src.tar.xz
+Source4:	%{llvm_snapshot_source_prefix}third-party-%{llvm_snapshot_yyyymmdd}.src.tar.xz
+%{llvm_snapshot_extra_source_tags}
+%else
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz
+Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz.sig
+Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
+Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
+Source4:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{third_party_srcdir}.tar.xz
+Source5:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{third_party_srcdir}.tar.xz.sig
+Source6:	release-keys.asc
+%endif
+
+# Backport of https://reviews.llvm.org/D156485 for RHEL-23865.
+Patch0: 0001-PEI-Don-t-zero-out-noreg-operands.patch
+
+# RHEL-specific patch to avoid unwanted recommonmark dep
+Patch101:	0101-Deactivate-markdown-doc.patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
+BuildRequires:	clang
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 BuildRequires:	zlib-devel
 BuildRequires:	libffi-devel
 BuildRequires:	ncurses-devel
+BuildRequires:	python3-psutil
 BuildRequires:	python3-sphinx
-%if !0%{?rhel}
+%if %{undefined rhel}
 BuildRequires:	python3-recommonmark
 %endif
 BuildRequires:	multilib-rpm-config
@@ -99,8 +169,19 @@ BuildRequires:	valgrind-devel
 # LLVM's LineEditor library will use libedit if it is available.
 BuildRequires:	libedit-devel
 %endif
-# We need python3-devel for pathfix.py.
+# Need pandoc to cover markdown to rst, because RHEL does not have recommonmark,
+# so we can't build the documentation as is.
+%if 0%{?rhel} == 8
+# RHEL8 has pandoc which we can use instead of python3-recommonmark for some things.
+BuildRequires:	pandoc
+%endif
+# We need python3-devel for pathfix.py and %%py3_shebang_fix.
 BuildRequires:	python3-devel
+BuildRequires:	python3-setuptools
+
+# For origin certification
+BuildRequires:	gnupg2
+
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -122,6 +203,18 @@ Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 %if 0%{?use_libedit}
 Requires:	libedit-devel
 %endif
+# The installed cmake files reference binaries from llvm-test, llvm-static, and
+# llvm-gtest.  We tried in the past to split the cmake exports for these binaries
+# out into separate files, so that llvm-devel would not need to Require these packages,
+# but this caused bugs (rhbz#1773678) and forced us to carry two non-upstream
+# patches.
+Requires:	%{name}-static%{?_isa} = %{version}-%{release}
+%if %{without compat_build}
+Requires:	%{name}-test%{?_isa} = %{version}-%{release}
+Requires:	%{name}-googletest%{?_isa} = %{version}-%{release}
+%endif
+
+
 Requires(post):	%{_sbindir}/alternatives
 Requires(postun):	%{_sbindir}/alternatives
 
@@ -149,23 +242,24 @@ Shared libraries for the LLVM compiler infrastructure.
 Summary:	LLVM static libraries
 Conflicts:	%{name}-devel < 8
 
+Provides:	llvm-static(major) = %{maj_ver}
+
 %description static
 Static libraries for the LLVM compiler infrastructure.
 
+%package cmake-utils
+Summary: CMake utilities shared across LLVM subprojects
+
+%description cmake-utils
+CMake utilities shared across LLVM subprojects.
+This is for internal use by LLVM packages only.
+
 %if %{without compat_build}
 
 %package test
 Summary:	LLVM regression tests
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
-Requires:	python3-lit
-# The regression tests need gold.
-Requires:	binutils
-# This is for llvm-config
-Requires:	%{name}-devel%{?_isa} = %{version}-%{release}
-# Bugpoint tests require gcc
-Requires:	gcc
-Requires:	findutils
 
 Provides:	llvm-test(major) = %{maj_ver}
 
@@ -174,40 +268,79 @@ LLVM regression tests.
 
 %package googletest
 Summary: LLVM's modified googletest sources
+# libllvm_gtest.a moved from llvm-static to llvm-googletest
+Conflicts: %{name}-static < 17.0.0
 
 %description googletest
 LLVM's modified googletest sources.
 
+%if 0%{?rhel}
+%package toolset
+Summary:	Package that installs llvm-toolset
+Requires:	clang = %{version}
+Requires:	llvm = %{version}
+
+%ifnarch s390x
+Requires:	lld = %{version}
+%endif
+
+%description toolset
+This is the main package for llvm-toolset.
+%endif
+
 %endif
 
 %prep
-%autosetup -n llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src -p2
+%if %{without snapshot_build}
+%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE3}' --data='%{SOURCE2}'
+%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE5}' --data='%{SOURCE4}'
+%endif
+%setup -T -q -b 2 -n %{cmake_srcdir}
+# TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir},
+# but this is not a CACHED variable, so we can't actually set it externally :(
+cd ..
+mv %{cmake_srcdir} cmake
+%setup -T -q -b 4 -n %{third_party_srcdir}
+cd ..
+mv %{third_party_srcdir} third-party
 
-pathfix.py -i %{__python3} -pn \
+%setup -T -q -b 0 -n %{llvm_srcdir}
+%autopatch -M%{?!rhel:100}%{?rhel:200} -p2
+
+%py3_shebang_fix \
 	test/BugPoint/compile-custom.ll.py \
-	tools/opt-viewer/*.py
+	tools/opt-viewer/*.py \
+	utils/update_cc_test_checks.py
+
+%if 0%{?rhel} == 8
+# Convert markdown files to rst to cope with the absence of compatible md parser in rhel.
+# The sed expression takes care of a slight difference between pandoc markdown and sphinx markdown.
+find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pandoc -f markdown -o ${md%.md}.rst  ; done
+%endif
 
 %build
-mkdir -p _build
-cd _build
 
-%ifarch s390 %{arm} %ix86
+%if %{without lto_build}
+%global _lto_cflags %nil
+%endif
+
+%ifarch s390 s390x %ix86
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
+# Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files.
+export ASMFLAGS="%{build_cflags}"
+
 # force off shared libs as cmake macros turns it on.
-#
-# -DCMAKE_INSTALL_RPATH=";" is a workaround for llvm manually setting the
-# rpath of libraries and binaries.  llvm will skip the manual setting
-# if CAMKE_INSTALL_RPATH is set to a value, but cmake interprets this value
-# as nothing, so it sets the rpath to "" when installing.
-%cmake .. -G Ninja \
+# TODO: Disable LLVM_UNREACHABLE_OPTIMIZE.
+%cmake	-G Ninja \
 	-DBUILD_SHARED_LIBS:BOOL=OFF \
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	-DCMAKE_INSTALL_RPATH=";" \
-%ifarch s390 %{arm} %ix86
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
+%ifarch s390 %ix86
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
@@ -219,14 +352,16 @@ cd _build
 %endif
 %endif
 	\
-	-DLLVM_TARGETS_TO_BUILD="X86;AMDGPU;PowerPC;NVPTX;SystemZ;AArch64;ARM;Mips;BPF" \
+	-DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \
 	-DLLVM_ENABLE_LIBCXX:BOOL=OFF \
 	-DLLVM_ENABLE_ZLIB:BOOL=ON \
 	-DLLVM_ENABLE_FFI:BOOL=ON \
 	-DLLVM_ENABLE_RTTI:BOOL=ON \
+	-DLLVM_USE_PERF:BOOL=ON \
 %if %{with gold}
 	-DLLVM_BINUTILS_INCDIR=%{_includedir} \
 %endif
+	-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{experimental_targets_to_build} \
 	\
 	-DLLVM_BUILD_RUNTIME:BOOL=ON \
 	\
@@ -235,6 +370,12 @@ cd _build
 	\
 	-DLLVM_INCLUDE_TESTS:BOOL=ON \
 	-DLLVM_BUILD_TESTS:BOOL=ON \
+%if %{with compat_build}
+	-DLLVM_INSTALL_GTEST:BOOL=OFF \
+%else
+	-DLLVM_INSTALL_GTEST:BOOL=ON \
+%endif
+	-DLLVM_LIT_ARGS=-v \
 	\
 	-DLLVM_INCLUDE_EXAMPLES:BOOL=ON \
 	-DLLVM_BUILD_EXAMPLES:BOOL=OFF \
@@ -253,106 +394,74 @@ cd _build
 	-DLLVM_ENABLE_SPHINX:BOOL=ON \
 	-DLLVM_ENABLE_DOXYGEN:BOOL=OFF \
 	\
+%if %{with snapshot_build}
+	-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
+%else
+	-DLLVM_VERSION_SUFFIX='' \
+%endif
+	-DLLVM_UNREACHABLE_OPTIMIZE:BOOL=ON \
 	-DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \
-	-DLLVM_DYLIB_EXPORT_ALL:BOOL=ON \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \
 	-DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=OFF \
-	\
+	-DLLVM_DEFAULT_TARGET_TRIPLE=%{llvm_triple} \
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
+	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
 	-DLLVM_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \
-	-DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3
+	-DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3 \
+	-DLLVM_INCLUDE_BENCHMARKS=OFF \
+%if %{with lto_build}
+	-DLLVM_UNITTEST_LINK_FLAGS="-Wl,-plugin-opt=O0" \
+%endif
+	-DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS -Wl,-z,cet-report=error"
 
 # Build libLLVM.so first.  This ensures that when libLLVM.so is linking, there
 # are no other compile jobs running.  This will help reduce OOM errors on the
 # builders without having to artificially limit the number of concurrent jobs.
-%ninja_build LLVM
-%ninja_build
+%cmake_build --target LLVM
+%cmake_build
 
 %install
-%ninja_install -C _build
+%cmake_install
 
+mkdir -p %{buildroot}/%{_bindir}
 
 %if %{without compat_build}
-mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}/%{_bindir}/llvm-config %{buildroot}/%{_bindir}/llvm-config-%{__isa_bits}
 
 # Fix some man pages
-ln -s llvm-config.1 %{buildroot}%{_mandir}/man1/llvm-config-%{__isa_bits}.1
-mv %{buildroot}%{_mandir}/man1/tblgen.1 %{buildroot}%{_mandir}/man1/llvm-tblgen.1
+ln -s llvm-config.1 %{buildroot}%{_mandir}/man1/llvm-config%{exec_suffix}-%{__isa_bits}.1
 
 # Install binaries needed for lit tests
 %global test_binaries llvm-isel-fuzzer llvm-opt-fuzzer
 
 for f in %{test_binaries}
 do
-    install -m 0755 ./_build/bin/$f %{buildroot}%{_bindir}
+    install -m 0755 %{_vpath_builddir}/bin/$f %{buildroot}%{_bindir}
 done
 
+# Remove testing of update utility tools
+rm -rf test/tools/UpdateTestChecks
 
 %multilib_fix_c_header --file %{_includedir}/llvm/Config/llvm-config.h
 
 # Install libraries needed for unittests
-%if 0%{?__isa_bits} == 64
-%global build_libdir _build/lib64
-%else
-%global build_libdir _build/lib
-%endif
+%global build_libdir %{_vpath_builddir}/%{_lib}
 
 install %{build_libdir}/libLLVMTestingSupport.a %{buildroot}%{_libdir}
+install %{build_libdir}/libLLVMTestingAnnotations.a %{buildroot}%{_libdir}
 
-%global install_srcdir %{buildroot}%{_datadir}/llvm/src
-%global lit_cfg test/%{_arch}.site.cfg.py
-%global lit_unit_cfg test/Unit/%{_arch}.site.cfg.py
-%global lit_fedora_cfg %{_datadir}/llvm/lit.fedora.cfg.py
-
-# Install gtest sources so clang can use them for gtest
-install -d %{install_srcdir}
-install -d %{install_srcdir}/utils/
-cp -R utils/unittest %{install_srcdir}/utils/
-
-# Generate lit config files.  Strip off the last line that initiates the
-# test run, so we can customize the configuration.
-head -n -1 _build/test/lit.site.cfg.py >> %{lit_cfg}
-head -n -1 _build/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg}
-
-# Install custom fedora config file
-cp %{SOURCE2} %{buildroot}%{lit_fedora_cfg}
-
-# Patch lit config files to load custom fedora config:
-for f in %{lit_cfg} %{lit_unit_cfg}; do
-  echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> $f
-done
-
-install -d %{buildroot}%{_libexecdir}/tests/llvm
-install -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/tests/llvm
-
-# Install lit tests.  We need to put these in a tarball otherwise rpm will complain
-# about some of the test inputs having the wrong object file format.
-install -d %{buildroot}%{_datadir}/llvm/
-tar -czf %{install_srcdir}/test.tar.gz test/
-
-# Install the unit test binaries
-mkdir -p %{build_llvm_libdir}
-cp -R _build/unittests %{build_llvm_libdir}/
-rm -rf `find %{build_llvm_libdir} -iname 'cmake*'`
-
-# Install libraries used for testing
-install -m 0755 %{build_libdir}/BugpointPasses.so %{buildroot}%{_libdir}
-install -m 0755 %{build_libdir}/LLVMHello.so %{buildroot}%{_libdir}
-
-# Install test inputs for PDB tests
-echo "%{_datadir}/llvm/src/unittests/DebugInfo/PDB" > %{build_llvm_libdir}/unittests/DebugInfo/PDB/llvm.srcdir.txt
-mkdir -p %{buildroot}%{_datadir}/llvm/src/unittests/DebugInfo/PDB/
-cp -R unittests/DebugInfo/PDB/Inputs %{buildroot}%{_datadir}/llvm/src/unittests/DebugInfo/PDB/
+%if %{with gold}
+# Add symlink to lto plugin in the binutils plugin directory.
+%{__mkdir_p} %{buildroot}%{_libdir}/bfd-plugins/
+ln -s -t %{buildroot}%{_libdir}/bfd-plugins/ ../LLVMgold.so
+%endif
 
 %else
 
 # Add version suffix to binaries
-mkdir -p %{buildroot}/%{_bindir}
 for f in %{buildroot}/%{install_bindir}/*; do
   filename=`basename $f`
-  ln -s %{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{exec_suffix}
+  ln -s ../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{exec_suffix}
 done
 
 # Move header files
@@ -361,18 +470,17 @@ ln -s ../../../%{install_includedir}/llvm %{buildroot}/%{pkg_includedir}/llvm
 ln -s ../../../%{install_includedir}/llvm-c %{buildroot}/%{pkg_includedir}/llvm-c
 
 # Fix multi-lib
-mv %{buildroot}%{_bindir}/llvm-config{%{exec_suffix},%{exec_suffix}-%{__isa_bits}}
 %multilib_fix_c_header --file %{install_includedir}/llvm/Config/llvm-config.h
 
 # Create ld.so.conf.d entry
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
-%{pkg_libdir}
+mkdir -p %{buildroot}/etc/ld.so.conf.d
+cat >> %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
+%{install_libdir}
 EOF
 
 # Add version suffix to man pages and move them to mandir.
 mkdir -p %{buildroot}/%{_mandir}/man1
-for f in `ls %{build_install_prefix}/share/man/man1/*`; do
+for f in %{build_install_prefix}/share/man/man1/*; do
   filename=`basename $f | cut -f 1 -d '.'`
   mv $f %{buildroot}%{_mandir}/man1/$filename%{exec_suffix}.1
 done
@@ -382,37 +490,73 @@ rm -Rf %{build_install_prefix}/share/opt-viewer
 
 %endif
 
+# llvm-config special casing. llvm-config is managed by update-alternatives.
+# the original file must remain available for compatibility with the CMake
+# infrastructure. Without compat, cmake points to the symlink, with compat it
+# points to the original file.
+
+%if %{without compat_build}
+
+mv %{buildroot}/%{install_bindir}/llvm-config %{buildroot}/%{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
+# We still maintain a versionned symlink for consistency across llvm versions.
+# This is specific to the non-compat build and matches the exec prefix for
+# compat builds. An isa-agnostic versionned symlink is also maintained in the (un)install
+# steps.
+(cd %{buildroot}/%{install_bindir} ; ln -s llvm-config%{exec_suffix}-%{__isa_bits} llvm-config-%{maj_ver}-%{__isa_bits} )
+# ghost presence
+touch %{buildroot}%{_bindir}/llvm-config-%{maj_ver}
+
+%else
+
+rm %{buildroot}%{_bindir}/llvm-config%{exec_suffix}
+(cd %{buildroot}/%{install_bindir} ; ln -s llvm-config llvm-config%{exec_suffix}-%{__isa_bits} )
+
+%endif
+
+# ghost presence
+touch %{buildroot}%{_bindir}/llvm-config%{exec_suffix}
+
+mkdir -p %{buildroot}%{pkg_datadir}/llvm/cmake
+cp -Rv ../cmake/* %{buildroot}%{pkg_datadir}/llvm/cmake
 
 %check
-# TODO: Fix test failures on arm
-ninja check-all -C _build || \
-%ifarch %{arm}
-  :
-%else
-  false
+
+# non reproducible errors
+rm test/tools/dsymutil/X86/swift-interface.test
+
+%if %{with check}
+# FIXME: use %%cmake_build instead of %%__ninja
+LD_LIBRARY_PATH=%{buildroot}/%{install_libdir}  %{__ninja} check-all -C %{_vpath_builddir}
 %endif
 
 %ldconfig_scriptlets libs
 
-%if %{without compat_build}
-
 %post devel
-%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config llvm-config %{_bindir}/llvm-config-%{__isa_bits} %{__isa_bits}
+%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}
+%if %{without compat_build}
+%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}
+%endif
 
 %postun devel
 if [ $1 -eq 0 ]; then
-  %{_sbindir}/update-alternatives --remove llvm-config %{_bindir}/llvm-config
+  %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
+%if %{without compat_build}
+  %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
+%endif
 fi
 
-%endif
-
 %files
+%license LICENSE.TXT
 %exclude %{_mandir}/man1/llvm-config*
 %{_mandir}/man1/*
 %{_bindir}/*
 
+%exclude %{_bindir}/llvm-config%{exec_suffix}
+%exclude %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
+
 %if %{without compat_build}
-%exclude %{_bindir}/llvm-config-%{__isa_bits}
+%exclude %{_bindir}/llvm-config-%{maj_ver}
+%exclude %{install_bindir}/llvm-config-%{maj_ver}-%{__isa_bits}
 %exclude %{_bindir}/not
 %exclude %{_bindir}/count
 %exclude %{_bindir}/yaml-bench
@@ -421,89 +565,205 @@ fi
 %exclude %{_bindir}/llvm-opt-fuzzer
 %{_datadir}/opt-viewer
 %else
-%exclude %{pkg_bindir}/llvm-config
-%{pkg_bindir}
+%{install_bindir}
 %endif
 
 %files libs
-%{pkg_libdir}/libLLVM-%{maj_ver}.so
+%license LICENSE.TXT
+%{install_libdir}/libLLVM-%{maj_ver}%{?llvm_snapshot_version_suffix:%{llvm_snapshot_version_suffix}}.so
 %if %{without compat_build}
 %if %{with gold}
 %{_libdir}/LLVMgold.so
+%{_libdir}/bfd-plugins/LLVMgold.so
 %endif
 %{_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so
 %{_libdir}/libLTO.so*
 %else
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+%config(noreplace) /etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %if %{with gold}
 %{_libdir}/%{name}/lib/LLVMgold.so
 %endif
-%{pkg_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so
-%{pkg_libdir}/libLTO.so*
-%exclude %{pkg_libdir}/libLTO.so
+%{install_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so
+%{install_libdir}/libLTO.so*
+%exclude %{install_libdir}/libLTO.so
 %endif
-%{pkg_libdir}/libRemarks.so*
+%{install_libdir}/libRemarks.so*
 
 %files devel
-%if %{without compat_build}
-%{_bindir}/llvm-config-%{__isa_bits}
+%license LICENSE.TXT
+
+%ghost %{_bindir}/llvm-config%{exec_suffix}
+%{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
 %{_mandir}/man1/llvm-config*
-%{_includedir}/llvm
-%{_includedir}/llvm-c
-%{_libdir}/libLLVM.so
-%{_libdir}/cmake/llvm
-%exclude %{_libdir}/cmake/llvm/LLVMStaticExports.cmake
-%exclude %{_libdir}/cmake/llvm/LLVMTestExports.cmake
-%else
-%{_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
-%{pkg_bindir}/llvm-config
-%{_mandir}/man1/llvm-config%{exec_suffix}.1.gz
+
 %{install_includedir}/llvm
 %{install_includedir}/llvm-c
+%{install_libdir}/libLLVM.so
+%{install_libdir}/cmake/llvm
+%if %{without compat_build}
+%{install_bindir}/llvm-config-%{maj_ver}-%{__isa_bits}
+%ghost %{_bindir}/llvm-config-%{maj_ver}
+%else
 %{pkg_includedir}/llvm
 %{pkg_includedir}/llvm-c
-%{pkg_libdir}/libLTO.so
-%{pkg_libdir}/libLLVM.so
-%{pkg_libdir}/cmake/llvm
+%{install_libdir}/libLTO.so
 %endif
 
 %files doc
+%license LICENSE.TXT
 %doc %{_pkgdocdir}/html
 
 %files static
+%license LICENSE.TXT
+%{install_libdir}/*.a
 %if %{without compat_build}
-%{_libdir}/*.a
-%exclude %{_libdir}/libLLVMTestingSupport.a
-%{_libdir}/cmake/llvm/LLVMStaticExports.cmake
-%else
-%{_libdir}/%{name}/lib/*.a
+%exclude %{install_libdir}/libLLVMTestingSupport.a
+%exclude %{install_libdir}/libLLVMTestingAnnotations.a
+%exclude %{install_libdir}/libllvm_gtest.a
+%exclude %{install_libdir}/libllvm_gtest_main.a
 %endif
 
+%files cmake-utils
+%license LICENSE.TXT
+%{pkg_datadir}/llvm/cmake
+
 %if %{without compat_build}
 
 %files test
-%{_libexecdir}/tests/llvm/
-%{llvm_libdir}/unittests/
-%{_datadir}/llvm/src/unittests
-%{_datadir}/llvm/src/test.tar.gz
-%{_datadir}/llvm/lit.fedora.cfg.py
+%license LICENSE.TXT
 %{_bindir}/not
 %{_bindir}/count
 %{_bindir}/yaml-bench
 %{_bindir}/lli-child-target
 %{_bindir}/llvm-isel-fuzzer
 %{_bindir}/llvm-opt-fuzzer
-%{_libdir}/BugpointPasses.so
-%{_libdir}/LLVMHello.so
-%{_libdir}/cmake/llvm/LLVMTestExports.cmake
 
 %files googletest
-%{_datadir}/llvm/src/utils
-%{_libdir}/libLLVMTestingSupport.a
+%license LICENSE.TXT
+%{install_libdir}/libLLVMTestingSupport.a
+%{install_libdir}/libLLVMTestingAnnotations.a
+%{install_libdir}/libllvm_gtest.a
+%{install_libdir}/libllvm_gtest_main.a
+%{install_includedir}/llvm-gtest
+%{install_includedir}/llvm-gmock
+
+%if 0%{?rhel}
+%files toolset
+%license LICENSE.TXT
+%endif
 
 %endif
 
 %changelog
+* Fri Feb 02 2024 Nikita Popov <npopov@redhat.com> - 17.0.6-2
+- Fix crash with -fzero-call-used-regs (RHEL-23865)
+
+* Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
+- Update to LLVM 17.0.6
+
+* Mon Oct 23 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-2
+- Add Conflicts to llvm-googletest
+
+* Wed Oct 04 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-1
+- Update to LLVM 17.0.2
+
+* Thu Aug 03 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.6-3
+- Fix rhbz #2228944
+
+* Wed Jul 19 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.6-2
+- Improve error messages for unsupported relocs on s390x (rhbz#2216906)
+- Disable LLVM_UNREACHABLE_OPTIMIZE
+
+* Sat Jun 17 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-1
+- 16.0.6 Release
+
+* Wed Apr 05 2023 Timm Bäder <tbaeder@redhat.com> - 16.0.0-1
+- 16.0.0 Release
+
+* Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
+- 15.0.7 Release
+
+* Mon Oct 31 2022 Tom Stellard <tstellar@redhat.com> - 15.0.0-2
+- Re-enable debuginfo for ppc64le
+
+* Tue Sep 06 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-1
+- Update to LLVM 15.0.0
+
+* Mon Jun 27 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
+- 14.0.6 Release
+
+* Mon May 23 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-3
+- Build gold plugin on s390x as well
+
+* Fri Apr 29 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-2
+- Remove llvm-cmake-devel package again
+
+* Thu Apr 07 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
+- Update to 14.0.0
+
+* Wed Feb 02 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-1
+- 13.0.1 Release
+
+* Sat Jan 29 2022 Tom Stellard <tstellar@redhat.com> - 13.0.0-4
+- Rebuild with gcc fix from rhbz#2028609
+
+* Thu Oct 21 2021 sguelton@redhat.com - 13.0.0-3
+- Correctly set ldflags
+
+* Wed Oct 20 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-2
+- Disable failing test on s390x
+
+* Thu Oct 14 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-1
+- 13.0.0 Release
+
+* Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1
+- 12.0.1 release
+
+* Fri Jul 02 2021 Tom Stellard <tstellar@redhat.com> - 12.0.0-2
+- Stop installing lit tests
+
+* Tue May 25 2021 sguelton@redhat.com - 12.0.0-1
+- Remove obsolete patch
+
+* Thu Oct 29 2020 sguelton@redhat.com - 11.0.0-2
+- Remove obsolete patch
+
+* Wed Sep 30 2020 sguelton@redhat.com - 11.0.0-1
+- 11.0.1 final release
+
+* Wed Sep 30 2020 sguelton@redhat.com - 11.0.0-0.6.rc2
+- Restore default CI behavior wrt. number of threads
+
+* Fri Sep 25 2020 sguelton@redhat.com - 11.0.0-0.5.rc2
+- Fix test case depending on fs capability
+
+* Fri Sep 25 2020 sguelton@redhat.com - 11.0.0-0.4.rc2
+- Fix dependency on dsymutil.rst from CI
+
+* Thu Sep 24 2020 sguelton@redhat.com - 11.0.0-0.3.rc2
+- Fix test file generation
+
+* Wed Sep 23 2020 sguelton@redhat.com - 11.0.0-0.2.rc2
+- Remove runtime dep on libedit-devel
+
+* Mon Sep 14 2020 sguelton@redhat.com - 11.0.0-0.1.rc2
+- 11.0.1.rc2 Release
+
+* Wed Aug 19 2020 Tom Stellard <tstellar@redhat.com> - 10.0.1-3
+- Fix rust crash on ppc64le compiling firefox
+
+* Fri Jul 31 2020 sguelton@redhat.com - 10.0.1-2
+- Fix llvm-config alternative handling, see rhbz#1859996
+
+* Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1
+- 10.0.1 Release
+
+* Wed Jun 24 2020 sguelton@redhat.com - 10.0.0-2
+- Reproducible build of test.tar.gz, see rhbz#1820319
+
+* Tue Apr 7 2020 sguelton@redhat.com - 10.0.0-1
+- 10.0.0 Release
+
 * Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 9.0.1-4
 - Fix a codegen bug for Rust