import UBI clang-17.0.6-1.module+el8.10.0+20808+e12784c0

.clang.metadata

@@ -1,3 +1,4 @@
-9cdc305550fbd27d52d023e8506c50c41e97b7fa SOURCES/clang-13.0.1.src.tar.xz
-ee28b71609e57e677205f44076e450fe5f577a22 SOURCES/clang-tools-extra-13.0.1.src.tar.xz
-b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc
+2822ff10a016df1fffdeb296f753e9c5fce764ee SOURCES/clang-17.0.6.src.tar.xz
+576ef9aeccf3febe1828c68b3e11ffa921f3fc92 SOURCES/clang-17.0.6.src.tar.xz.sig
+1ec17cc98c397d6b4d30f57f14646fa085c9ccce SOURCES/clang-tools-extra-17.0.6.src.tar.xz
+cba7dea96b093d9989ceb949a21b4180b9d9985e SOURCES/clang-tools-extra-17.0.6.src.tar.xz.sig

.gitignore

@@ -1,3 +1,4 @@
-SOURCES/clang-13.0.1.src.tar.xz
-SOURCES/clang-tools-extra-13.0.1.src.tar.xz
-SOURCES/tstellar-gpg-key.asc
+SOURCES/clang-17.0.6.src.tar.xz
+SOURCES/clang-17.0.6.src.tar.xz.sig
+SOURCES/clang-tools-extra-17.0.6.src.tar.xz
+SOURCES/clang-tools-extra-17.0.6.src.tar.xz.sig

SOURCES/0001-PATCH-clang-Fix-scan-build-py-executable-lookup-path.patch

@@ -1,36 +0,0 @@
-From 62eaebcb6bb872830299efa3f87506f1d23ef366 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Mon, 13 Sep 2021 10:25:45 +0200
-Subject: [PATCH][clang] Fix scan-build-py executable lookup path
-
-Once installed, scan-build-py doesn't know anything about its auxiliary
-executable and can't find them.
-Use relative path wrt. scan-build-py script.
-
-Differential Revision: https://reviews.llvm.org/D109659
-
-(cherry picked from commit c84755a046bbdcd0564693e30b2508034b06002b)
----
- clang/tools/scan-build-py/lib/libscanbuild/analyze.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/clang/tools/scan-build-py/lib/libscanbuild/analyze.py b/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
-index 9a249a8..d83ff2a 100644
---- a/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
-+++ b/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
-@@ -39,8 +39,10 @@ from libscanbuild.shell import decode
- 
- __all__ = ['scan_build', 'analyze_build', 'analyze_compiler_wrapper']
- 
--COMPILER_WRAPPER_CC = 'analyze-cc'
--COMPILER_WRAPPER_CXX = 'analyze-c++'
-+scanbuild_dir = os.path.dirname(__import__('sys').argv[0])
-+
-+COMPILER_WRAPPER_CC = os.path.join(scanbuild_dir, '..', 'libexec', 'analyze-cc')
-+COMPILER_WRAPPER_CXX = os.path.join(scanbuild_dir, '..', 'libexec', 'analyze-c++')
- 
- CTU_EXTDEF_MAP_FILENAME = 'externalDefMap.txt'
- CTU_TEMP_DEFMAP_FOLDER = 'tmpExternalDefMaps'
--- 
-1.8.3.1
-

SOURCES/0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch

@@ -0,0 +1,27 @@
+From 49f827b09db549de62dcaf8b90b3fcb3e08c0ee5 Mon Sep 17 00:00:00 2001
+From: Serge Guelton <sguelton@redhat.com>
+Date: Mon, 6 Mar 2023 12:37:48 +0100
+Subject: [PATCH] Make -funwind-tables the default on all archs
+
+---
+ clang/lib/Driver/ToolChains/Gnu.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
+index 24fbdcffc07b..8fed46b49515 100644
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2904,6 +2904,10 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const {
+   case llvm::Triple::riscv64:
+   case llvm::Triple::x86:
+   case llvm::Triple::x86_64:
++  // Enable -funwind-tables on all architectures supported by Fedora:
++  // rhbz#1655546
++  case llvm::Triple::systemz:
++  case llvm::Triple::arm:
+     return UnwindTableLevel::Asynchronous;
+   default:
+     return UnwindTableLevel::None;
+-- 
+2.39.1
+

SOURCES/0001-PATCH-clang-Reorganize-gtest-integration.patch

@@ -1,42 +0,0 @@
-From c6b921c8d833546946b70a8c2640032fd7c62461 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Thu, 25 Feb 2021 14:04:52 +0100
-Subject: [PATCH 1/6] [PATCH][clang] Reorganize gtest integration
-
----
- clang/CMakeLists.txt | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
-index 9e74014..0185276 100644
---- a/clang/CMakeLists.txt
-+++ b/clang/CMakeLists.txt
-@@ -153,12 +153,6 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
-         set(LLVM_UTILS_PROVIDED ON)
-         set(CLANG_TEST_DEPS FileCheck count not)
-       endif()
--      set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
--      if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
--          AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
--          AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
--        add_subdirectory(${UNITTEST_DIR} utils/unittest)
--      endif()
-     else()
-       # Seek installed Lit.
-       find_program(LLVM_LIT
-@@ -537,7 +531,11 @@ endif()
- 
- 
- if( CLANG_INCLUDE_TESTS )
--  if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h)
-+  set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
-+  if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
-+      AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
-+      AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
-+    add_subdirectory(${UNITTEST_DIR} utils/unittest)
-     add_subdirectory(unittests)
-     list(APPEND CLANG_TEST_DEPS ClangUnitTests)
-     list(APPEND CLANG_TEST_PARAMS
--- 
-1.8.3.1
-

SOURCES/0001-Produce-DWARF4-by-default.patch

@@ -0,0 +1,125 @@
+From adbe188f3b1e3a0dd5ec80d9409601ba7f5b0423 Mon Sep 17 00:00:00 2001
+From: Konrad Kleine <kkleine@redhat.com>
+Date: Thu, 24 Mar 2022 09:44:21 +0100
+Subject: [PATCH] Produce DWARF4 by default
+
+Have a look at the following commit to see when the move from DWARF 4 to 5 first happened upstream:
+
+https://github.com/llvm/llvm-project/commit/d3b26dea16108c427b19b5480c9edc76edf8f5b4?diff=unified
+---
+ clang/lib/Driver/ToolChain.cpp     | 4 +---
+ clang/test/CodeGen/dwarf-version.c | 4 ++--
+ clang/test/Driver/as-options.s     | 4 ++--
+ clang/test/Driver/cl-options.c     | 2 +-
+ clang/test/Driver/clang-g-opts.c   | 2 +-
+ clang/test/Driver/ve-toolchain.c   | 2 +-
+ clang/test/Driver/ve-toolchain.cpp | 2 +-
+ 7 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
+index 8dafc3d481c2..92bf26dc8ec6 100644
+--- a/clang/lib/Driver/ToolChain.cpp
++++ b/clang/lib/Driver/ToolChain.cpp
+@@ -428,9 +428,7 @@ ToolChain::getDefaultUnwindTableLevel(const ArgList &Args) const {
+ }
+ 
+ unsigned ToolChain::GetDefaultDwarfVersion() const {
+-  // TODO: Remove the RISC-V special case when R_RISCV_SET_ULEB128 linker
+-  // support becomes more widely available.
+-  return getTriple().isRISCV() ? 4 : 5;
++  return 4;
+ }
+ 
+ Tool *ToolChain::getClang() const {
+diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c
+index d307eb3f101f..e7e93bf6688c 100644
+--- a/clang/test/CodeGen/dwarf-version.c
++++ b/clang/test/CodeGen/dwarf-version.c
+@@ -2,8 +2,8 @@
+ // RUN: %clang -target x86_64-linux-gnu -gdwarf-3 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER3
+ // RUN: %clang -target x86_64-linux-gnu -gdwarf-4 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
+ // RUN: %clang -target x86_64-linux-gnu -gdwarf-5 -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5
+-// RUN: %clang -target x86_64-linux-gnu -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5
+-// RUN: %clang -target x86_64-linux-gnu -gdwarf -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5
++// RUN: %clang -target x86_64-linux-gnu -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
++// RUN: %clang -target x86_64-linux-gnu -gdwarf -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
+ 
+ // The -isysroot is used as a hack to avoid LIT messing with the SDKROOT
+ // environment variable which indirecty overrides the version in the target
+diff --git a/clang/test/Driver/as-options.s b/clang/test/Driver/as-options.s
+index 73d002c7ef7e..71d55f7fd537 100644
+--- a/clang/test/Driver/as-options.s
++++ b/clang/test/Driver/as-options.s
+@@ -122,7 +122,7 @@
+ // RUN:   FileCheck --check-prefix=DEBUG %s
+ // RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -g0 -g %s -### 2>&1 | \
+ // RUN:   FileCheck --check-prefix=DEBUG %s
+-// DEBUG: "-g" "-gdwarf-5"
++// DEBUG: "-g" "-gdwarf-4"
+ // RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -g -g0 %s -### 2>&1 | \
+ // RUN:   FileCheck --check-prefix=NODEBUG %s
+ // RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 -g0 %s -### 2>&1 | \
+@@ -141,7 +141,7 @@
+ // RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-2 %s -### 2>&1 | \
+ // RUN:   FileCheck --check-prefix=GDWARF2 %s
+ // RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf %s -### 2>&1 | \
+-// RUN:   FileCheck --check-prefix=GDWARF5 %s
++// RUN:   FileCheck --check-prefix=GDWARF4 %s
+ 
+ // RUN: %clang --target=aarch64-linux-gnu -fno-integrated-as -gdwarf-5 %s -### 2>&1 | \
+ // RUN:   FileCheck --check-prefix=GDWARF5 %s
+diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
+index 6d929b19e7e2..373905c2e0fc 100644
+--- a/clang/test/Driver/cl-options.c
++++ b/clang/test/Driver/cl-options.c
+@@ -569,7 +569,7 @@
+ // RUN: %clang_cl /Z7 -gdwarf /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s
+ // Z7_gdwarf: "-gcodeview"
+ // Z7_gdwarf: "-debug-info-kind=constructor"
+-// Z7_gdwarf: "-dwarf-version=
++// Z7_gdwarf: "-dwarf-version=4
+ 
+ // RUN: %clang_cl /ZH:MD5 /c -### -- %s 2>&1 | FileCheck -check-prefix=ZH_MD5 %s
+ // ZH_MD5: "-gsrc-hash=md5"
+diff --git a/clang/test/Driver/clang-g-opts.c b/clang/test/Driver/clang-g-opts.c
+index 5ee0fe64fe48..985158746137 100644
+--- a/clang/test/Driver/clang-g-opts.c
++++ b/clang/test/Driver/clang-g-opts.c
+@@ -32,7 +32,7 @@
+ 
+ // CHECK-WITHOUT-G-NOT: -debug-info-kind
+ // CHECK-WITH-G: "-debug-info-kind=constructor"
+-// CHECK-WITH-G: "-dwarf-version=5"
++// CHECK-WITH-G: "-dwarf-version=4"
+ // CHECK-WITH-G-DWARF2: "-dwarf-version=2"
+ 
+ // CHECK-WITH-G-STANDALONE: "-debug-info-kind=standalone"
+diff --git a/clang/test/Driver/ve-toolchain.c b/clang/test/Driver/ve-toolchain.c
+index 32e25769b6da..b8a2852daba8 100644
+--- a/clang/test/Driver/ve-toolchain.c
++++ b/clang/test/Driver/ve-toolchain.c
+@@ -6,7 +6,7 @@
+ /// Checking dwarf-version
+ 
+ // RUN: %clang -### -g --target=ve %s 2>&1 | FileCheck -check-prefix=DWARF_VER %s
+-// DWARF_VER: "-dwarf-version=5"
++// DWARF_VER: "-dwarf-version=4"
+ 
+ ///-----------------------------------------------------------------------------
+ /// Checking include-path
+diff --git a/clang/test/Driver/ve-toolchain.cpp b/clang/test/Driver/ve-toolchain.cpp
+index 5a33d5eceb61..cedf895b36dc 100644
+--- a/clang/test/Driver/ve-toolchain.cpp
++++ b/clang/test/Driver/ve-toolchain.cpp
+@@ -7,7 +7,7 @@
+ 
+ // RUN: %clangxx -### -g --target=ve-unknown-linux-gnu \
+ // RUN:     %s 2>&1 | FileCheck -check-prefix=DWARF_VER %s
+-// DWARF_VER: "-dwarf-version=5"
++// DWARF_VER: "-dwarf-version=4"
+ 
+ ///-----------------------------------------------------------------------------
+ /// Checking include-path
+-- 
+2.41.0
+

SOURCES/0001-Workaround-a-bug-in-ORC-on-ppc64le.patch

@@ -0,0 +1,30 @@
+From a2449cee8c995b56f1892502aab3dfad3d6f3ca1 Mon Sep 17 00:00:00 2001
+From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
+Date: Fri, 8 Sep 2023 11:45:34 -0300
+Subject: [PATCH] Workaround a bug in ORC on ppc64le
+
+The Jit code appears to be returning the wrong printf symbol on ppc64le
+after the transition of the default long double to IEEE 128-bit floating
+point.
+---
+ clang/unittests/Interpreter/InterpreterTest.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/clang/unittests/Interpreter/InterpreterTest.cpp b/clang/unittests/Interpreter/InterpreterTest.cpp
+index abb8e6377aab..7b6697ebc6ed 100644
+--- a/clang/unittests/Interpreter/InterpreterTest.cpp
++++ b/clang/unittests/Interpreter/InterpreterTest.cpp
+@@ -243,7 +243,9 @@ TEST(IncrementalProcessing, FindMangledNameSymbol) {
+   EXPECT_FALSE(!Addr);
+ 
+   // FIXME: Re-enable when we investigate the way we handle dllimports on Win.
+-#ifndef _WIN32
++  // FIXME: The printf symbol returned from the Jit may not be correct on
++  //        ppc64le when the default long double is IEEE 128-bit fp.
++#if !defined _WIN32 && !(defined __PPC64__ && defined __LITTLE_ENDIAN__)
+   EXPECT_EQ((uintptr_t)&printf, Addr->getValue());
+ #endif // _WIN32
+ }
+-- 
+2.41.0
+

SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch

@@ -0,0 +1,85 @@
+From 22d62b32cd3be5fb0ae10723b35a781e0f862b71 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Tue, 24 Jan 2023 22:46:25 +0000
+Subject: [PATCH] clang-tools-extra: Make test dependency on LLVMHello optional
+
+This fixes clang + clang-tools-extra standalone build after
+36892727e4f19a60778e371d78f8fb09d8122c85.
+---
+ clang-tools-extra/test/CMakeLists.txt                  | 10 +++++++++-
+ clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp |  2 +-
+ clang-tools-extra/test/lit.cfg.py                      |  3 +++
+ clang-tools-extra/test/lit.site.cfg.py.in              |  1 +
+ 4 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt
+index f4c529ee8af2..1cfb4dd529aa 100644
+--- a/clang-tools-extra/test/CMakeLists.txt
++++ b/clang-tools-extra/test/CMakeLists.txt
+@@ -7,10 +7,15 @@
+ set(CLANG_TOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
+ set(CLANG_TOOLS_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/..")
+ 
++if (TARGET LLVMHello)
++  set (LLVM_HAS_LLVM_HELLO 1)
++endif()
++
+ llvm_canonicalize_cmake_booleans(
+   CLANG_TIDY_ENABLE_STATIC_ANALYZER
+   CLANG_PLUGIN_SUPPORT
+   LLVM_INSTALL_TOOLCHAIN_ONLY
++  LLVM_HAS_LLVM_HELLO
+   )
+ 
+ configure_lit_site_cfg(
+@@ -86,7 +91,10 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+   endif()
+ 
+   if(TARGET CTTestTidyModule)
+-      list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule LLVMHello)
++      list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule)
++      if (TARGET  LLVMHello)
++        list(APPEND CLANG_TOOLS_TEST_DEPS CTTestTidyModule)
++      endif()
+       target_include_directories(CTTestTidyModule PUBLIC BEFORE "${CLANG_TOOLS_SOURCE_DIR}")
+       if(CLANG_PLUGIN_SUPPORT AND (WIN32 OR CYGWIN))
+         set(LLVM_LINK_COMPONENTS
+diff --git a/clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp b/clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp
+index c66a94f458cf..b4e7a5d691e5 100644
+--- a/clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp
++++ b/clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp
+@@ -1,4 +1,4 @@
+-// REQUIRES: plugins
++// REQUIRES: plugins, llvm-hello
+ // RUN: clang-tidy -checks='-*,mytest*' --list-checks -load %llvmshlibdir/CTTestTidyModule%pluginext -load %llvmshlibdir/LLVMHello%pluginext | FileCheck --check-prefix=CHECK-LIST %s
+ // CHECK-LIST: Enabled checks:
+ // CHECK-LIST-NEXT:    mytest1
+diff --git a/clang-tools-extra/test/lit.cfg.py b/clang-tools-extra/test/lit.cfg.py
+index 9f64fd3d2ffa..1b258a00ddf9 100644
+--- a/clang-tools-extra/test/lit.cfg.py
++++ b/clang-tools-extra/test/lit.cfg.py
+@@ -75,6 +75,9 @@ config.substitutions.append(("%clang_tidy_headers", clang_tidy_headers))
+ if config.has_plugins and config.llvm_plugin_ext:
+     config.available_features.add("plugins")
+ 
++if config.has_llvm_hello:
++    config.available_features.add("llvm-hello")
++
+ # It is not realistically possible to account for all options that could
+ # possibly be present in system and user configuration files, so disable
+ # default configs for the test runs.
+diff --git a/clang-tools-extra/test/lit.site.cfg.py.in b/clang-tools-extra/test/lit.site.cfg.py.in
+index 4eb830a1baf1..6e5559348454 100644
+--- a/clang-tools-extra/test/lit.site.cfg.py.in
++++ b/clang-tools-extra/test/lit.site.cfg.py.in
+@@ -11,6 +11,7 @@ config.target_triple = "@LLVM_TARGET_TRIPLE@"
+ config.host_triple = "@LLVM_HOST_TRIPLE@"
+ config.clang_tidy_staticanalyzer = @CLANG_TIDY_ENABLE_STATIC_ANALYZER@
+ config.has_plugins = @CLANG_PLUGIN_SUPPORT@ & ~@LLVM_INSTALL_TOOLCHAIN_ONLY@
++config.has_llvm_hello = @LLVM_HAS_LLVM_HELLO@
+ # Support substitution of the tools and libs dirs with user parameters. This is
+ # used when we can't determine the tool dir at configuration time.
+ config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@")
+-- 
+2.40.1
+

SOURCES/0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch

@@ -1,39 +0,0 @@
-From 3dc5722d5c7673a879f2b4680369d3ac8b6b64b6 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Wed, 4 Aug 2021 14:05:38 -0700
-Subject: [PATCH] cmake: Allow shared libraries to customize the soname using
- LLVM_ABI_REVISION
-
-The LLVM_ABI_REVISION variable is intended to be used for release
-candidates which introduce an ABI change to a shared library.  This
-variable can be specified per library, so there is not one global value
-for all of LLVM.
-
-For example, if we LLVM X.0.0-rc2 introduces an ABI change for a library
-compared with LLVM X.0.0-rc1, then the LLVM_ABI_REVISION number for
-library will be incremented by 1.
-
-In the main branch, LLVM_ABI_REVISION should always be 0, it is only
-meant to be used in the release branch.
-
-Differential Revision: https://reviews.llvm.org/D105594
----
- clang/tools/clang-shlib/CMakeLists.txt | 5 +++++
- 3 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
-index 9c1f8ea452b3..4d785924e4bb 100644
---- a/clang/tools/clang-shlib/CMakeLists.txt
-+++ b/clang/tools/clang-shlib/CMakeLists.txt
-@@ -1,3 +1,8 @@
-+# In the main branch, LLVM_ABI_REVISION should always be 0.  In the release
-+# branches, this should be incremented before each release candidate every
-+# time the ABI of libclang-cpp.so changes.
-+set(LLVM_ABI_REVISION 0)
-+
- # Building libclang-cpp.so fails if LLVM_ENABLE_PIC=Off
- if (NOT LLVM_ENABLE_PIC)
-   return()
--- 
-2.27.0
-

SOURCES/0002-Misleading-bidirectional-detection.patch

@@ -1,340 +0,0 @@
-From e7ab823a5f3f57e843069d43033a16165809723a Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Thu, 4 Nov 2021 11:11:53 +0100
-Subject: [PATCH 2/3] Misleading bidirectional detection
-
-Differential Revision: https://reviews.llvm.org/D112913
----
- clang-tools-extra/clang-tidy/misc/CMakeLists.txt   |   1 +
- .../clang-tidy/misc/MiscTidyModule.cpp             |   3 +
- .../clang-tidy/misc/MisleadingBidirectional.cpp    | 131 +++++++++++++++++++++
- .../clang-tidy/misc/MisleadingBidirectional.h      |  38 ++++++
- clang-tools-extra/docs/ReleaseNotes.rst            |   5 +
- clang-tools-extra/docs/clang-tidy/checks/list.rst  |   3 +-
- .../checks/misc-misleading-bidirectional.rst       |  21 ++++
- .../checkers/misc-misleading-bidirectional.cpp     |  31 +++++
- 8 files changed, 232 insertions(+), 1 deletion(-)
- create mode 100644 clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
- create mode 100644 clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h
- create mode 100644 clang-tools-extra/docs/clang-tidy/checks/misc-misleading-bidirectional.rst
- create mode 100644 clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp
-
-diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-index 7cafe54..e6abac8 100644
---- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-@@ -16,6 +16,7 @@ add_clang_library(clangTidyMiscModule
-   DefinitionsInHeadersCheck.cpp
-   Homoglyph.cpp
-   MiscTidyModule.cpp
-+  MisleadingBidirectional.cpp
-   MisplacedConstCheck.cpp
-   NewDeleteOverloadsCheck.cpp
-   NoRecursionCheck.cpp
-diff --git a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
-index 5c7bd0c..bb5fde2 100644
---- a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
-+++ b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
-@@ -11,6 +11,7 @@
- #include "../ClangTidyModuleRegistry.h"
- #include "DefinitionsInHeadersCheck.h"
- #include "Homoglyph.h"
-+#include "MisleadingBidirectional.h"
- #include "MisplacedConstCheck.h"
- #include "NewDeleteOverloadsCheck.h"
- #include "NoRecursionCheck.h"
-@@ -35,6 +36,8 @@ public:
-     CheckFactories.registerCheck<DefinitionsInHeadersCheck>(
-         "misc-definitions-in-headers");
-     CheckFactories.registerCheck<Homoglyph>("misc-homoglyph");
-+    CheckFactories.registerCheck<MisleadingBidirectionalCheck>(
-+        "misc-misleading-bidirectional");
-     CheckFactories.registerCheck<MisplacedConstCheck>("misc-misplaced-const");
-     CheckFactories.registerCheck<NewDeleteOverloadsCheck>(
-         "misc-new-delete-overloads");
-diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
-new file mode 100644
-index 0000000..7a2f06b
---- /dev/null
-+++ b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
-@@ -0,0 +1,139 @@
-+//===--- MisleadingBidirectional.cpp - clang-tidy -------------------------===//
-+//
-+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-+// See https://llvm.org/LICENSE.txt for license information.
-+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+//
-+//===----------------------------------------------------------------------===//
-+
-+#include "MisleadingBidirectional.h"
-+
-+#include "clang/Frontend/CompilerInstance.h"
-+#include "clang/Lex/Preprocessor.h"
-+#include "llvm/Support/ConvertUTF.h"
-+
-+using namespace clang;
-+using namespace clang::tidy::misc;
-+
-+static bool containsMisleadingBidi(StringRef Buffer,
-+                                   bool HonorLineBreaks = true) {
-+  const char *CurPtr = Buffer.begin();
-+
-+  enum BidiChar {
-+    PS = 0x2029,
-+    RLO = 0x202E,
-+    RLE = 0x202B,
-+    LRO = 0x202D,
-+    LRE = 0x202A,
-+    PDF = 0x202C,
-+    RLI = 0x2067,
-+    LRI = 0x2066,
-+    FSI = 0x2068,
-+    PDI = 0x2069
-+  };
-+
-+  SmallVector<BidiChar> BidiContexts;
-+
-+  // Scan each character while maintaining a stack of opened bidi context.
-+  // RLO/RLE/LRO/LRE all are closed by PDF while RLI LRI and FSI are closed by
-+  // PDI. New lines reset the context count. Extra PDF / PDI are ignored.
-+  //
-+  // Warn if we end up with an unclosed context.
-+  while (CurPtr < Buffer.end()) {
-+    unsigned char C = *CurPtr;
-+    if (isASCII(C)) {
-+      ++CurPtr;
-+      bool IsParagrapSep =
-+          (C == 0xA || C == 0xD || (0x1C <= C && C <= 0x1E) || C == 0x85);
-+      bool IsSegmentSep = (C == 0x9 || C == 0xB || C == 0x1F);
-+      if (IsParagrapSep || IsSegmentSep)
-+        BidiContexts.clear();
-+      continue;
-+    }
-+    llvm::UTF32 CodePoint;
-+    llvm::ConversionResult Result = llvm::convertUTF8Sequence(
-+        (const llvm::UTF8 **)&CurPtr, (const llvm::UTF8 *)Buffer.end(),
-+        &CodePoint, llvm::strictConversion);
-+
-+    // If conversion fails, utf-8 is designed so that we can just try next char.
-+    if (Result != llvm::conversionOK) {
-+      ++CurPtr;
-+      continue;
-+    }
-+
-+    // Open a PDF context.
-+    if (CodePoint == RLO || CodePoint == RLE || CodePoint == LRO ||
-+        CodePoint == LRE)
-+      BidiContexts.push_back(PDF);
-+    // Close PDF Context.
-+    else if (CodePoint == PDF) {
-+      if (!BidiContexts.empty() && BidiContexts.back() == PDF)
-+        BidiContexts.pop_back();
-+    }
-+    // Open a PDI Context.
-+    else if (CodePoint == RLI || CodePoint == LRI || CodePoint == FSI)
-+      BidiContexts.push_back(PDI);
-+    // Close a PDI Context.
-+    else if (CodePoint == PDI) {
-+      auto R = std::find(BidiContexts.rbegin(), BidiContexts.rend(), PDI);
-+      if (R != BidiContexts.rend())
-+        BidiContexts.resize(BidiContexts.rend() - R - 1);
-+    }
-+    // Line break or equivalent
-+    else if (CodePoint == PS)
-+      BidiContexts.clear();
-+  }
-+  return !BidiContexts.empty();
-+}
-+
-+class MisleadingBidirectionalCheck::MisleadingBidirectionalHandler
-+    : public CommentHandler {
-+public:
-+  MisleadingBidirectionalHandler(MisleadingBidirectionalCheck &Check,
-+                                 llvm::Optional<std::string> User)
-+      : Check(Check) {}
-+
-+  bool HandleComment(Preprocessor &PP, SourceRange Range) override {
-+    // FIXME: check that we are in a /* */ comment
-+    StringRef Text =
-+        Lexer::getSourceText(CharSourceRange::getCharRange(Range),
-+                             PP.getSourceManager(), PP.getLangOpts());
-+
-+    if (containsMisleadingBidi(Text, true))
-+      Check.diag(
-+          Range.getBegin(),
-+          "comment contains misleading bidirectional Unicode characters");
-+    return false;
-+  }
-+
-+private:
-+  MisleadingBidirectionalCheck &Check;
-+};
-+
-+MisleadingBidirectionalCheck::MisleadingBidirectionalCheck(
-+    StringRef Name, ClangTidyContext *Context)
-+    : ClangTidyCheck(Name, Context),
-+      Handler(std::make_unique<MisleadingBidirectionalHandler>(
-+          *this, Context->getOptions().User)) {}
-+
-+MisleadingBidirectionalCheck::~MisleadingBidirectionalCheck() = default;
-+
-+void MisleadingBidirectionalCheck::registerPPCallbacks(
-+    const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) {
-+  PP->addCommentHandler(Handler.get());
-+}
-+
-+void MisleadingBidirectionalCheck::check(
-+    const ast_matchers::MatchFinder::MatchResult &Result) {
-+  if (const auto *SL = Result.Nodes.getNodeAs<StringLiteral>("strlit")) {
-+    StringRef Literal = SL->getBytes();
-+    if (containsMisleadingBidi(Literal, false))
-+      diag(SL->getBeginLoc(), "string literal contains misleading "
-+                              "bidirectional Unicode characters");
-+  }
-+}
-+
-+void MisleadingBidirectionalCheck::registerMatchers(
-+    ast_matchers::MatchFinder *Finder) {
-+  Finder->addMatcher(ast_matchers::stringLiteral().bind("strlit"), this);
-+}
-diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h
-new file mode 100644
-index 0000000..18e7060
---- /dev/null
-+++ b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h
-@@ -0,0 +1,38 @@
-+//===--- MisleadingBidirectionalCheck.h - clang-tidy ------------*- C++ -*-===//
-+//
-+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-+// See https://llvm.org/LICENSE.txt for license information.
-+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+//
-+//===----------------------------------------------------------------------===//
-+
-+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGBIDIRECTIONALCHECK_H
-+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGBIDIRECTIONALCHECK_H
-+
-+#include "../ClangTidyCheck.h"
-+
-+namespace clang {
-+namespace tidy {
-+namespace misc {
-+
-+class MisleadingBidirectionalCheck : public ClangTidyCheck {
-+public:
-+  MisleadingBidirectionalCheck(StringRef Name, ClangTidyContext *Context);
-+  ~MisleadingBidirectionalCheck();
-+
-+  void registerPPCallbacks(const SourceManager &SM, Preprocessor *PP,
-+                           Preprocessor *ModuleExpanderPP) override;
-+
-+  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
-+  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
-+
-+private:
-+  class MisleadingBidirectionalHandler;
-+  std::unique_ptr<MisleadingBidirectionalHandler> Handler;
-+};
-+
-+} // namespace misc
-+} // namespace tidy
-+} // namespace clang
-+
-+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGBIDIRECTIONALCHECK_H
-diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst
-index 37a717e..1eec7db 100644
---- a/clang-tools-extra/docs/ReleaseNotes.rst
-+++ b/clang-tools-extra/docs/ReleaseNotes.rst
-@@ -218,6 +218,11 @@ New checks
- 
-   Detects confusable unicode identifiers.
- 
-+- New :doc:`misc-misleading-bidirectional <clang-tidy/checks/misc-misleading-bidirectional>` check.
-+
-+  Inspect string literal and comments for unterminated bidirectional Unicode
-+  characters.
-+
- New check aliases
- ^^^^^^^^^^^^^^^^^
- 
-diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst
-index df9a95c..b118639 100644
---- a/clang-tools-extra/docs/clang-tidy/checks/list.rst
-+++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst
-@@ -207,7 +207,8 @@ Clang-Tidy Checks
-    `llvmlibc-implementation-in-namespace <llvmlibc-implementation-in-namespace.html>`_,
-    `llvmlibc-restrict-system-libc-headers <llvmlibc-restrict-system-libc-headers.html>`_, "Yes"
-    `misc-definitions-in-headers <misc-definitions-in-headers.html>`_, "Yes"
--   `misc-homoglyph <misc-homoglyph.html>`_, "Yes"
-+   `misc-homoglyph <misc-homoglyph.html>`_,
-+   `misc-misleading-bidirectional <misc-misleading-bidirectional.html>`_,
-    `misc-misplaced-const <misc-misplaced-const.html>`_,
-    `misc-new-delete-overloads <misc-new-delete-overloads.html>`_,
-    `misc-no-recursion <misc-no-recursion.html>`_,
-diff --git a/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-bidirectional.rst b/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-bidirectional.rst
-new file mode 100644
-index 0000000..16ffc97
---- /dev/null
-+++ b/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-bidirectional.rst
-@@ -0,0 +1,21 @@
-+.. title:: clang-tidy - misc-misleading-bidirectional
-+
-+misc-misleading-bidirectional
-+=============================
-+
-+Warn about unterminated bidirectional unicode sequence, detecting potential attack
-+as described in the `Trojan Source <https://www.trojansource.codes>`_ attack.
-+
-+Example:
-+
-+.. code-block:: c++
-+
-+    #include <iostream>
-+
-+    int main() {
-+        bool isAdmin = false;
-+        /*‮ } ⁦if (isAdmin)⁩ ⁦ begin admins only */
-+            std::cout << "You are an admin.\n";
-+        /* end admins only ‮ { ⁦*/
-+        return 0;
-+    }
-diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp
-new file mode 100644
-index 0000000..7a1746d
---- /dev/null
-+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp
-@@ -0,0 +1,31 @@
-+// RUN: %check_clang_tidy %s misc-misleading-bidirectional %t
-+
-+void func(void) {
-+  int admin = 0;
-+  /*‮ }⁦if(admin)⁩ ⁦ begin*/
-+  // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: comment contains misleading bidirectional Unicode characters [misc-misleading-bidirectional]
-+  const char msg[] = "‮⁦if(admin)⁩ ⁦tes";
-+  // CHECK-MESSAGES: :[[@LINE-1]]:22: warning: string literal contains misleading bidirectional Unicode characters [misc-misleading-bidirectional]
-+}
-+
-+void all_fine(void) {
-+  char valid[] = "some‮valid‬sequence";
-+  /* EOL ends bidi‮ sequence
-+   * end it's fine to do so.
-+   * EOL ends ⁧isolate too
-+   */
-+}
-+
-+int invalid_utf_8(void) {
-+  bool isAdmin = false;
-+
-+  // the comment below contains an invalid utf8 character, but should still be
-+  // processed.
-+
-+  // CHECK-MESSAGES: :[[@LINE+1]]:3: warning: comment contains misleading bidirectional Unicode characters [misc-misleading-bidirectional]
-+  /*€‮ } ⁦if (isAdmin)⁩ ⁦ begin admins only */
-+  return 1;
-+  /* end admins only ‮ { ⁦*/
-+  // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: comment contains misleading bidirectional Unicode characters [misc-misleading-bidirectional]
-+  return 0;
-+}
--- 
-1.8.3.1
-

SOURCES/0002-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch

@@ -1,29 +0,0 @@
-From c87abee7356b8fde81512ffceadd520776c465d2 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Thu, 25 Feb 2021 14:09:29 +0100
-Subject: [PATCH] [PATCH][clang] Make -funwind-tables the default on all archs
-
----
- clang/lib/Driver/ToolChains/Gnu.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index a27841dc5985..7489e6785150 100644
---- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2709,6 +2709,12 @@ bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {
-   case llvm::Triple::ppc64:
-   case llvm::Triple::ppc64le:
-   case llvm::Triple::x86_64:
-+
-+  // Enable -funwind-tables on all architectures supported by Fedora:
-+  // rhbz#1655546
-+  case llvm::Triple::x86:
-+  case llvm::Triple::systemz:
-+  case llvm::Triple::arm:
-     return true;
-   default:
-     return false;
--- 
-2.27.0
-

SOURCES/0003-Misleading-unicode-identifier-detection-pass.patch

@@ -1,363 +0,0 @@
-From dbfbbab65139552549604931dfa2759c9aa392de Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Fri, 15 Oct 2021 15:18:52 +0200
-Subject: [PATCH 3/3] Misleading unicode identifier detection pass
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Detect when an identifier contains some Right-To-Left characters.
-This pass relates to https://trojansource.codes/
-
-Example of misleading source:
-
-    short int א = (short int)0;
-    short int ג = (short int)12345;
-
-    int main() {
-      int א = ג; // a local variable, set to zero?
-      printf("ג is %d\n", ג);
-      printf("א is %d\n", א);
-    }
-
-This is a recommit of 299aa4dfa1d8c120648b1404b481d858b76c8173 with missing
-option registration fixed.
-
-Differential Revision: https://reviews.llvm.org/D112914
----
- clang-tools-extra/clang-tidy/misc/CMakeLists.txt   |   1 +
- .../clang-tidy/misc/MiscTidyModule.cpp             |   3 +
- .../clang-tidy/misc/MisleadingIdentifier.cpp       | 166 +++++++++++++++++++++
- .../clang-tidy/misc/MisleadingIdentifier.h         |  31 ++++
- clang-tools-extra/docs/ReleaseNotes.rst            |   4 +
- clang-tools-extra/docs/clang-tidy/checks/list.rst  |   1 +
- .../checks/misc-misleading-identifier.rst          |  23 +++
- .../checkers/misc-misleading-identifier.cpp        |  15 ++
- 8 files changed, 244 insertions(+)
- create mode 100644 clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
- create mode 100644 clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h
- create mode 100644 clang-tools-extra/docs/clang-tidy/checks/misc-misleading-identifier.rst
- create mode 100644 clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp
-
-diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-index e6abac8..22d1659 100644
---- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
-@@ -17,6 +17,7 @@ add_clang_library(clangTidyMiscModule
-   Homoglyph.cpp
-   MiscTidyModule.cpp
-   MisleadingBidirectional.cpp
-+  MisleadingIdentifier.cpp
-   MisplacedConstCheck.cpp
-   NewDeleteOverloadsCheck.cpp
-   NoRecursionCheck.cpp
-diff --git a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
-index bb5fde2..b484db8 100644
---- a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
-+++ b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
-@@ -12,6 +12,7 @@
- #include "DefinitionsInHeadersCheck.h"
- #include "Homoglyph.h"
- #include "MisleadingBidirectional.h"
-+#include "MisleadingIdentifier.h"
- #include "MisplacedConstCheck.h"
- #include "NewDeleteOverloadsCheck.h"
- #include "NoRecursionCheck.h"
-@@ -38,6 +39,8 @@ public:
-     CheckFactories.registerCheck<Homoglyph>("misc-homoglyph");
-     CheckFactories.registerCheck<MisleadingBidirectionalCheck>(
-         "misc-misleading-bidirectional");
-+    CheckFactories.registerCheck<MisleadingIdentifierCheck>(
-+        "misc-misleading-identifier");
-     CheckFactories.registerCheck<MisplacedConstCheck>("misc-misplaced-const");
-     CheckFactories.registerCheck<NewDeleteOverloadsCheck>(
-         "misc-new-delete-overloads");
-diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
-new file mode 100644
-index 0000000..4ddb8ba
---- /dev/null
-+++ b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
-@@ -0,0 +1,166 @@
-+//===--- MisleadingIdentifier.cpp - clang-tidy-----------------------------===//
-+//
-+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-+// See https://llvm.org/LICENSE.txt for license information.
-+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+//
-+//===----------------------------------------------------------------------===//
-+
-+#include "MisleadingIdentifier.h"
-+
-+#include "clang/Frontend/CompilerInstance.h"
-+#include "llvm/Support/ConvertUTF.h"
-+
-+namespace clang {
-+namespace tidy {
-+namespace misc {
-+
-+// See https://www.unicode.org/Public/14.0.0/ucd/extracted/DerivedBidiClass.txt
-+static bool isUnassignedAL(llvm::UTF32 CP) {
-+  return (0x0600 <= CP && CP <= 0x07BF) || (0x0860 <= CP && CP <= 0x08FF) ||
-+         (0xFB50 <= CP && CP <= 0xFDCF) || (0xFDF0 <= CP && CP <= 0xFDFF) ||
-+         (0xFE70 <= CP && CP <= 0xFEFF) ||
-+         (0x00010D00 <= CP && CP <= 0x00010D3F) ||
-+         (0x00010F30 <= CP && CP <= 0x00010F6F) ||
-+         (0x0001EC70 <= CP && CP <= 0x0001ECBF) ||
-+         (0x0001ED00 <= CP && CP <= 0x0001ED4F) ||
-+         (0x0001EE00 <= CP && CP <= 0x0001EEFF);
-+}
-+
-+// See https://www.unicode.org/Public/14.0.0/ucd/extracted/DerivedBidiClass.txt
-+static bool isUnassignedR(llvm::UTF32 CP) {
-+  return (0x0590 <= CP && CP <= 0x05FF) || (0x07C0 <= CP && CP <= 0x085F) ||
-+         (0xFB1D <= CP && CP <= 0xFB4F) ||
-+         (0x00010800 <= CP && CP <= 0x00010CFF) ||
-+         (0x00010D40 <= CP && CP <= 0x00010F2F) ||
-+         (0x00010F70 <= CP && CP <= 0x00010FFF) ||
-+         (0x0001E800 <= CP && CP <= 0x0001EC6F) ||
-+         (0x0001ECC0 <= CP && CP <= 0x0001ECFF) ||
-+         (0x0001ED50 <= CP && CP <= 0x0001EDFF) ||
-+         (0x0001EF00 <= CP && CP <= 0x0001EFFF);
-+}
-+
-+// See https://www.unicode.org/Public/14.0.0/ucd/extracted/DerivedBidiClass.txt
-+static bool isR(llvm::UTF32 CP) {
-+  return (CP == 0x0590) || (CP == 0x05BE) || (CP == 0x05C0) || (CP == 0x05C3) ||
-+         (CP == 0x05C6) || (0x05C8 <= CP && CP <= 0x05CF) ||
-+         (0x05D0 <= CP && CP <= 0x05EA) || (0x05EB <= CP && CP <= 0x05EE) ||
-+         (0x05EF <= CP && CP <= 0x05F2) || (0x05F3 <= CP && CP <= 0x05F4) ||
-+         (0x05F5 <= CP && CP <= 0x05FF) || (0x07C0 <= CP && CP <= 0x07C9) ||
-+         (0x07CA <= CP && CP <= 0x07EA) || (0x07F4 <= CP && CP <= 0x07F5) ||
-+         (CP == 0x07FA) || (0x07FB <= CP && CP <= 0x07FC) ||
-+         (0x07FE <= CP && CP <= 0x07FF) || (0x0800 <= CP && CP <= 0x0815) ||
-+         (CP == 0x081A) || (CP == 0x0824) || (CP == 0x0828) ||
-+         (0x082E <= CP && CP <= 0x082F) || (0x0830 <= CP && CP <= 0x083E) ||
-+         (CP == 0x083F) || (0x0840 <= CP && CP <= 0x0858) ||
-+         (0x085C <= CP && CP <= 0x085D) || (CP == 0x085E) || (CP == 0x085F) ||
-+         (CP == 0x200F) || (CP == 0xFB1D) || (0xFB1F <= CP && CP <= 0xFB28) ||
-+         (0xFB2A <= CP && CP <= 0xFB36) || (CP == 0xFB37) ||
-+         (0xFB38 <= CP && CP <= 0xFB3C) || (CP == 0xFB3D) || (CP == 0xFB3E) ||
-+         (CP == 0xFB3F) || (0xFB40 <= CP && CP <= 0xFB41) || (CP == 0xFB42) ||
-+         (0xFB43 <= CP && CP <= 0xFB44) || (CP == 0xFB45) ||
-+         (0xFB46 <= CP && CP <= 0xFB4F) || (0x10800 <= CP && CP <= 0x10805) ||
-+         (0x10806 <= CP && CP <= 0x10807) || (CP == 0x10808) ||
-+         (CP == 0x10809) || (0x1080A <= CP && CP <= 0x10835) ||
-+         (CP == 0x10836) || (0x10837 <= CP && CP <= 0x10838) ||
-+         (0x10839 <= CP && CP <= 0x1083B) || (CP == 0x1083C) ||
-+         (0x1083D <= CP && CP <= 0x1083E) || (0x1083F <= CP && CP <= 0x10855) ||
-+         (CP == 0x10856) || (CP == 0x10857) ||
-+         (0x10858 <= CP && CP <= 0x1085F) || (0x10860 <= CP && CP <= 0x10876) ||
-+         (0x10877 <= CP && CP <= 0x10878) || (0x10879 <= CP && CP <= 0x1087F) ||
-+         (0x10880 <= CP && CP <= 0x1089E) || (0x1089F <= CP && CP <= 0x108A6) ||
-+         (0x108A7 <= CP && CP <= 0x108AF) || (0x108B0 <= CP && CP <= 0x108DF) ||
-+         (0x108E0 <= CP && CP <= 0x108F2) || (CP == 0x108F3) ||
-+         (0x108F4 <= CP && CP <= 0x108F5) || (0x108F6 <= CP && CP <= 0x108FA) ||
-+         (0x108FB <= CP && CP <= 0x108FF) || (0x10900 <= CP && CP <= 0x10915) ||
-+         (0x10916 <= CP && CP <= 0x1091B) || (0x1091C <= CP && CP <= 0x1091E) ||
-+         (0x10920 <= CP && CP <= 0x10939) || (0x1093A <= CP && CP <= 0x1093E) ||
-+         (CP == 0x1093F) || (0x10940 <= CP && CP <= 0x1097F) ||
-+         (0x10980 <= CP && CP <= 0x109B7) || (0x109B8 <= CP && CP <= 0x109BB) ||
-+         (0x109BC <= CP && CP <= 0x109BD) || (0x109BE <= CP && CP <= 0x109BF) ||
-+         (0x109C0 <= CP && CP <= 0x109CF) || (0x109D0 <= CP && CP <= 0x109D1) ||
-+         (0x109D2 <= CP && CP <= 0x109FF) || (CP == 0x10A00) ||
-+         (CP == 0x10A04) || (0x10A07 <= CP && CP <= 0x10A0B) ||
-+         (0x10A10 <= CP && CP <= 0x10A13) || (CP == 0x10A14) ||
-+         (0x10A15 <= CP && CP <= 0x10A17) || (CP == 0x10A18) ||
-+         (0x10A19 <= CP && CP <= 0x10A35) || (0x10A36 <= CP && CP <= 0x10A37) ||
-+         (0x10A3B <= CP && CP <= 0x10A3E) || (0x10A40 <= CP && CP <= 0x10A48) ||
-+         (0x10A49 <= CP && CP <= 0x10A4F) || (0x10A50 <= CP && CP <= 0x10A58) ||
-+         (0x10A59 <= CP && CP <= 0x10A5F) || (0x10A60 <= CP && CP <= 0x10A7C) ||
-+         (0x10A7D <= CP && CP <= 0x10A7E) || (CP == 0x10A7F) ||
-+         (0x10A80 <= CP && CP <= 0x10A9C) || (0x10A9D <= CP && CP <= 0x10A9F) ||
-+         (0x10AA0 <= CP && CP <= 0x10ABF) || (0x10AC0 <= CP && CP <= 0x10AC7) ||
-+         (CP == 0x10AC8) || (0x10AC9 <= CP && CP <= 0x10AE4) ||
-+         (0x10AE7 <= CP && CP <= 0x10AEA) || (0x10AEB <= CP && CP <= 0x10AEF) ||
-+         (0x10AF0 <= CP && CP <= 0x10AF6) || (0x10AF7 <= CP && CP <= 0x10AFF) ||
-+         (0x10B00 <= CP && CP <= 0x10B35) || (0x10B36 <= CP && CP <= 0x10B38) ||
-+         (0x10B40 <= CP && CP <= 0x10B55) || (0x10B56 <= CP && CP <= 0x10B57) ||
-+         (0x10B58 <= CP && CP <= 0x10B5F) || (0x10B60 <= CP && CP <= 0x10B72) ||
-+         (0x10B73 <= CP && CP <= 0x10B77) || (0x10B78 <= CP && CP <= 0x10B7F) ||
-+         (0x10B80 <= CP && CP <= 0x10B91) || (0x10B92 <= CP && CP <= 0x10B98) ||
-+         (0x10B99 <= CP && CP <= 0x10B9C) || (0x10B9D <= CP && CP <= 0x10BA8) ||
-+         (0x10BA9 <= CP && CP <= 0x10BAF) || (0x10BB0 <= CP && CP <= 0x10BFF) ||
-+         (0x10C00 <= CP && CP <= 0x10C48) || (0x10C49 <= CP && CP <= 0x10C7F) ||
-+         (0x10C80 <= CP && CP <= 0x10CB2) || (0x10CB3 <= CP && CP <= 0x10CBF) ||
-+         (0x10CC0 <= CP && CP <= 0x10CF2) || (0x10CF3 <= CP && CP <= 0x10CF9) ||
-+         (0x10CFA <= CP && CP <= 0x10CFF) || (0x10D40 <= CP && CP <= 0x10E5F) ||
-+         (CP == 0x10E7F) || (0x10E80 <= CP && CP <= 0x10EA9) ||
-+         (CP == 0x10EAA) || (CP == 0x10EAD) ||
-+         (0x10EAE <= CP && CP <= 0x10EAF) || (0x10EB0 <= CP && CP <= 0x10EB1) ||
-+         (0x10EB2 <= CP && CP <= 0x10EFF) || (0x10F00 <= CP && CP <= 0x10F1C) ||
-+         (0x10F1D <= CP && CP <= 0x10F26) || (CP == 0x10F27) ||
-+         (0x10F28 <= CP && CP <= 0x10F2F) || (0x10F70 <= CP && CP <= 0x10F81) ||
-+         (0x10F86 <= CP && CP <= 0x10F89) || (0x10F8A <= CP && CP <= 0x10FAF) ||
-+         (0x10FB0 <= CP && CP <= 0x10FC4) || (0x10FC5 <= CP && CP <= 0x10FCB) ||
-+         (0x10FCC <= CP && CP <= 0x10FDF) || (0x10FE0 <= CP && CP <= 0x10FF6) ||
-+         (0x10FF7 <= CP && CP <= 0x10FFF) || (0x1E800 <= CP && CP <= 0x1E8C4) ||
-+         (0x1E8C5 <= CP && CP <= 0x1E8C6) || (0x1E8C7 <= CP && CP <= 0x1E8CF) ||
-+         (0x1E8D7 <= CP && CP <= 0x1E8FF) || (0x1E900 <= CP && CP <= 0x1E943) ||
-+         (CP == 0x1E94B) || (0x1E94C <= CP && CP <= 0x1E94F) ||
-+         (0x1E950 <= CP && CP <= 0x1E959) || (0x1E95A <= CP && CP <= 0x1E95D) ||
-+         (0x1E95E <= CP && CP <= 0x1E95F) || (0x1E960 <= CP && CP <= 0x1EC6F) ||
-+         (0x1ECC0 <= CP && CP <= 0x1ECFF) || (0x1ED50 <= CP && CP <= 0x1EDFF);
-+}
-+
-+static bool hasRTLCharacters(StringRef Buffer) {
-+  const char *CurPtr = Buffer.begin();
-+  const char *EndPtr = Buffer.end();
-+  while (CurPtr < EndPtr) {
-+    llvm::UTF32 CodePoint;
-+    llvm::ConversionResult Result = llvm::convertUTF8Sequence(
-+        (const llvm::UTF8 **)&CurPtr, (const llvm::UTF8 *)EndPtr, &CodePoint,
-+        llvm::strictConversion);
-+    if (Result != llvm::conversionOK)
-+      break;
-+    if (isUnassignedAL(CodePoint) || isUnassignedR(CodePoint) || isR(CodePoint))
-+      return true;
-+  }
-+  return false;
-+}
-+
-+MisleadingIdentifierCheck::MisleadingIdentifierCheck(StringRef Name,
-+                                                     ClangTidyContext *Context)
-+    : ClangTidyCheck(Name, Context) {}
-+
-+MisleadingIdentifierCheck::~MisleadingIdentifierCheck() = default;
-+
-+void MisleadingIdentifierCheck::check(
-+    const ast_matchers::MatchFinder::MatchResult &Result) {
-+  if (const auto *ND = Result.Nodes.getNodeAs<NamedDecl>("nameddecl")) {
-+    IdentifierInfo *II = ND->getIdentifier();
-+    if (II) {
-+      StringRef NDName = II->getName();
-+      if (hasRTLCharacters(NDName))
-+        diag(ND->getBeginLoc(), "identifier has right-to-left codepoints");
-+    }
-+  }
-+}
-+
-+void MisleadingIdentifierCheck::registerMatchers(
-+    ast_matchers::MatchFinder *Finder) {
-+  Finder->addMatcher(ast_matchers::namedDecl().bind("nameddecl"), this);
-+}
-+
-+} // namespace misc
-+} // namespace tidy
-+} // namespace clang
-diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h
-new file mode 100644
-index 0000000..9580ae6
---- /dev/null
-+++ b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h
-@@ -0,0 +1,31 @@
-+//===--- MisleadingIdentifierCheck.h - clang-tidy ---------------*- C++ -*-===//
-+//
-+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-+// See https://llvm.org/LICENSE.txt for license information.
-+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-+//
-+//===----------------------------------------------------------------------===//
-+
-+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGIDENTIFIERCHECK_H
-+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGIDENTIFIERCHECK_H
-+
-+#include "../ClangTidyCheck.h"
-+
-+namespace clang {
-+namespace tidy {
-+namespace misc {
-+
-+class MisleadingIdentifierCheck : public ClangTidyCheck {
-+public:
-+  MisleadingIdentifierCheck(StringRef Name, ClangTidyContext *Context);
-+  ~MisleadingIdentifierCheck();
-+
-+  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
-+  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
-+};
-+
-+} // namespace misc
-+} // namespace tidy
-+} // namespace clang
-+
-+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGIDENTIFIERCHECK_H
-diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst
-index 1eec7db..07977d0 100644
---- a/clang-tools-extra/docs/ReleaseNotes.rst
-+++ b/clang-tools-extra/docs/ReleaseNotes.rst
-@@ -223,6 +223,10 @@ New checks
-   Inspect string literal and comments for unterminated bidirectional Unicode
-   characters.
- 
-+- New :doc:`misc-misleading-identifier <clang-tidy/checks/misc-misleading-identifier>` check.
-+
-+  Reports identifier with unicode right-to-left characters.
-+
- New check aliases
- ^^^^^^^^^^^^^^^^^
- 
-diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst
-index b118639..592d69b 100644
---- a/clang-tools-extra/docs/clang-tidy/checks/list.rst
-+++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst
-@@ -209,6 +209,7 @@ Clang-Tidy Checks
-    `misc-definitions-in-headers <misc-definitions-in-headers.html>`_, "Yes"
-    `misc-homoglyph <misc-homoglyph.html>`_,
-    `misc-misleading-bidirectional <misc-misleading-bidirectional.html>`_,
-+   `misc-misleading-identifier <misc-mileading-identifier.html>`_,
-    `misc-misplaced-const <misc-misplaced-const.html>`_,
-    `misc-new-delete-overloads <misc-new-delete-overloads.html>`_,
-    `misc-no-recursion <misc-no-recursion.html>`_,
-diff --git a/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-identifier.rst b/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-identifier.rst
-new file mode 100644
-index 0000000..8bd9999
---- /dev/null
-+++ b/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-identifier.rst
-@@ -0,0 +1,23 @@
-+.. title:: clang-tidy - misc-misleading-identifier
-+
-+misc-misleading-identifier
-+==========================
-+
-+Finds identifiers that contain Unicode characters with right-to-left direction,
-+which can be confusing as they may change the understanding of a whole statement
-+line, as described in `Trojan Source <https://trojansource.codes>`_.
-+
-+An example of such misleading code follows:
-+
-+.. code-block:: c
-+
-+  #include <stdio.h>
-+
-+  short int א = (short int)0;
-+  short int ג = (short int)12345;
-+
-+  int main() {
-+    int א = ג; // a local variable, set to zero?
-+    printf("ג is %d\n", ג);
-+    printf("א is %d\n", א);
-+  }
-diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp
-new file mode 100644
-index 0000000..cb036f9
---- /dev/null
-+++ b/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp
-@@ -0,0 +1,15 @@
-+// RUN: %check_clang_tidy %s misc-misleading-identifier %t
-+
-+#include <stdio.h>
-+
-+// CHECK-MESSAGES: :[[#@LINE+1]]:1: warning: identifier has right-to-left codepoints [misc-misleading-identifier]
-+short int א = (short int)0;
-+// CHECK-MESSAGES: :[[#@LINE+1]]:1: warning: identifier has right-to-left codepoints [misc-misleading-identifier]
-+short int ג = (short int)12345;
-+
-+int main() {
-+  // CHECK-MESSAGES: :[[#@LINE+1]]:3: warning: identifier has right-to-left codepoints [misc-misleading-identifier]
-+  int א = ג; // a local variable, set to zero?
-+  printf("ג is %d\n", ג);
-+  printf("א is %d\n", א);
-+}
--- 
-1.8.3.1
-

SOURCES/0009-disable-recommonmark.patch

@@ -0,0 +1,26 @@
+diff -Naur a/clang/docs/conf.py b/clang/docs/conf.py
+--- a/clang/docs/conf.py	2020-09-15 09:12:24.318287611 +0000
++++ b/clang/docs/conf.py	2020-09-15 15:01:00.025893199 +0000
+@@ -37,21 +37,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/macros.clang

@@ -8,9 +8,4 @@
 # headers and libraries.  This path should be used by packages that need to
 # install files into this directory.  This macro's value changes every time
 # clang's version changes.
-%clang_resource_dir %{_libdir}/clang/%{clang_version}
-
-# This is the path to the clang resource directory that should be used
-# by packages that need to read files from this directory at runtime.
-# This macro only changes when clang's major version changes.
-%clang_resource_dir_readonly %{_libdir}/clang/%{clang_major_version}
+%clang_resource_dir %{_prefix}/lib/clang/%{clang_major_version}

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-----

SPECS/clang.spec

@@ -1,43 +1,30 @@
+%bcond_with snapshot_build
+
+%if %{with snapshot_build}
+%{llvm_sb}
+%endif
+
+# 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
+
 %bcond_with compat_build
 %bcond_without check
 
-%global maj_ver 13
+%global maj_ver 17
 %global min_ver 0
-%global patch_ver 1
+%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 clang_version %{maj_ver}.%{min_ver}.%{patch_ver}
 
-%global clang_tools_binaries \
-	%{_bindir}/clang-apply-replacements \
-	%{_bindir}/clang-change-namespace \
-	%{_bindir}/clang-check \
-	%{_bindir}/clang-doc \
-	%{_bindir}/clang-extdef-mapping \
-	%{_bindir}/clang-format \
-	%{_bindir}/clang-include-fixer \
-	%{_bindir}/clang-move \
-	%{_bindir}/clang-offload-bundler \
-	%{_bindir}/clang-offload-wrapper \
-	%{_bindir}/clang-query \
-	%{_bindir}/clang-refactor \
-	%{_bindir}/clang-rename \
-	%{_bindir}/clang-reorder-fields \
-	%{_bindir}/clang-repl \
-	%{_bindir}/clang-scan-deps \
-	%{_bindir}/clang-tidy \
-	%{_bindir}/clangd \
-	%{_bindir}/diagtool \
-	%{_bindir}/hmaptool \
-	%{_bindir}/pp-trace
-
-%global clang_binaries \
-	%{_bindir}/clang \
-	%{_bindir}/clang++ \
-	%{_bindir}/clang-%{maj_ver} \
-	%{_bindir}/clang++-%{maj_ver} \
-	%{_bindir}/clang-cl \
-	%{_bindir}/clang-cpp \
-
 %if %{with compat_build}
 %global pkg_name clang%{maj_ver}
 # Install clang to same prefix as llvm, so that apps that use llvm-config
@@ -46,18 +33,16 @@
 %global install_bindir %{install_prefix}/bin
 %global install_includedir %{install_prefix}/include
 %global install_libdir %{install_prefix}/lib
+%global install_datadir %{install_prefix}/share
 
-%global pkg_bindir %{install_bindir}
 %global pkg_includedir %{install_includedir}
-%global pkg_libdir %{install_libdir}
 %else
 %global pkg_name clang
 %global install_prefix /usr
-%global pkg_libdir %{_libdir}
+%global install_datadir %{_datadir}
+%global install_libdir %{_libdir}
 %endif
 
-%global build_install_prefix %{buildroot}%{install_prefix}
-
 %ifarch ppc64le aarch64
 # Too many threads on some systems causes OOM errors.
 %global _smp_mflags -j8
@@ -66,75 +51,70 @@
 %global clang_srcdir clang-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
 %global clang_tools_srcdir clang-tools-extra-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
 
-%if !%{maj_ver} && 0%{?rc_ver}
-%global abi_revision 2
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
-
-%if 0%{?rhel}
-%global gcc_toolset_version 11
-%global gcc_pkg_prefix gcc-toolset-%{gcc_toolset_version}-
-%global gcc_install_prefix /opt/rh/gcc-toolset-%{gcc_toolset_version}/root/usr/
-%endif
-
 Name:		%pkg_name
-Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	2%{?dist}
+Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
+Release:	1%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
 URL:		http://llvm.org
+%if %{with snapshot_build}
+Source0:    %{llvm_snapshot_source_prefix}clang-%{llvm_snapshot_yyyymmdd}.src.tar.xz
+Source1:    %{llvm_snapshot_source_prefix}clang-tools-extra-%{llvm_snapshot_yyyymmdd}.src.tar.xz
+%{llvm_snapshot_extra_source_tags}
+
+%else
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz
 Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig
 %if %{without compat_build}
 Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz
 Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig
 %endif
-Source4:	tstellar-gpg-key.asc
-%if !0%{?compat_build}
+Source4:	release-keys.asc
+%endif
+%if %{without compat_build}
 Source5:	macros.%{name}
 %endif
 
 # Patches for clang
-Patch0:     0001-PATCH-clang-Reorganize-gtest-integration.patch
-Patch1:     0002-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
+Patch1:     0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
 Patch2:     0003-PATCH-clang-Don-t-install-static-libraries.patch
 Patch3:     0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch
-Patch4:     0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
-Patch5:     0001-PATCH-clang-Fix-scan-build-py-executable-lookup-path.patch
+# Drop the following patch after debugedit adds support to DWARF-5:
+# https://sourceware.org/bugzilla/show_bug.cgi?id=28728
+Patch4:     0001-Produce-DWARF4-by-default.patch
+# Workaround a bug in ORC on ppc64le.
+# More info is available here: https://reviews.llvm.org/D159115#4641826
+Patch5:     0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
 
+# RHEL specific patches
+# Avoid unwanted dependency on python-recommonmark
+Patch101:  0009-disable-recommonmark.patch
 
+%if %{without compat_build}
 # Patches for clang-tools-extra
-%if !0%{?compat_build}
-%ifarch ix86
-Patch201    clangd-tests.patch
+# See https://reviews.llvm.org/D120301
+Patch201:   0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
 %endif
-%endif
-
-Patch202:   0001-Confusable-identifiers-detection.patch
-Patch203:   0002-Misleading-bidirectional-detection.patch
-Patch204:   0003-Misleading-unicode-identifier-detection-pass.patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
 BuildRequires:	ninja-build
+
 %if %{with compat_build}
-BuildRequires:	llvm%{maj_ver}-devel = %{version}
-BuildRequires:	llvm%{maj_ver}-static = %{version}
+%global llvm_pkg_name llvm%{maj_ver}
 %else
-BuildRequires:	llvm-devel = %{version}
-BuildRequires:	llvm-test = %{version}
+%global llvm_pkg_name llvm
+BuildRequires:  llvm-test = %{version}
+BuildRequires:  llvm-googletest = %{version}
+%endif
+
+BuildRequires:	%{llvm_pkg_name}-devel = %{version}
 # llvm-static is required, because clang-tablegen needs libLLVMTableGen, which
 # is not included in libLLVM.so.
-BuildRequires:	llvm-static = %{version}
-BuildRequires:	llvm-googletest = %{version}
-%endif
+BuildRequires:	%{llvm_pkg_name}-static = %{version}
+BuildRequires:	%{llvm_pkg_name}-cmake-utils = %{version}
 
 BuildRequires:	libxml2-devel
 BuildRequires:	perl-generators
@@ -143,16 +123,14 @@ BuildRequires:	ncurses-devel
 # should BuildRequires: emacs if it packages emacs integration files.
 BuildRequires:	emacs
 
-# These build dependencies are required for the test suite.
-%if %with python3
 # The testsuite uses /usr/bin/lit which is part of the python3-lit package.
 BuildRequires:	python3-lit
-%endif
 
 BuildRequires:	python3-sphinx
+BuildRequires:	pandoc
 BuildRequires:	libatomic
 
-# We need python3-devel for pathfix.py.
+# We need python3-devel for %%py3_shebang_fix
 BuildRequires:	python3-devel
 
 %if ! 0%{?rhel}
@@ -165,6 +143,9 @@ BuildRequires: /usr/bin/marshalparser
 # Needed for %%multilib_fix_c_header
 BuildRequires:	multilib-rpm-config
 
+# For origin certification
+BuildRequires:	gnupg2
+
 # scan-build uses these perl modules so they need to be installed in order
 # to run the tests.
 BuildRequires: perl(Digest::MD5)
@@ -184,13 +165,12 @@ Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 # clang requires gcc, clang++ requires libstdc++-devel
 # - https://bugzilla.redhat.com/show_bug.cgi?id=1021645
 # - https://bugzilla.redhat.com/show_bug.cgi?id=1158594
-Requires:	%{?gcc_pkg_prefix}libstdc++-devel
-Requires:	%{?gcc_pkg_prefix}gcc-c++
+Requires:	libstdc++-devel
+Requires:	gcc-c++
 
 Provides:	clang(major) = %{maj_ver}
 
-Conflicts:	compiler-rt < %{version}
-Conflicts:	compiler-rt > %{version}
+Conflicts:	compiler-rt < 11.0.0
 
 %description
 clang: noun
@@ -208,7 +188,9 @@ libomp-devel to enable -fopenmp.
 
 %package libs
 Summary: Runtime library for clang
-Requires: %{name}-resource-filesystem%{?_isa} = %{version}
+Requires: %{name}-resource-filesystem = %{version}
+# RHEL specific: Use libstdc++ from gcc13 by default. rhbz#2178804
+Requires: gcc-toolset-13-gcc-c++
 Recommends: compiler-rt%{?_isa} = %{version}
 # libomp-devel is required, so clang can find the omp.h header when compiling
 # with -fopenmp.
@@ -220,11 +202,11 @@ Runtime library for clang.
 
 %package devel
 Summary: Development header files for clang
+Requires: %{name}-libs = %{version}-%{release}
 %if %{without compat_build}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 # The clang CMake files reference tools from clang-tools-extra.
 Requires: %{name}-tools-extra%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
 %endif
 
 %description devel
@@ -233,9 +215,10 @@ Development header files for clang.
 %package resource-filesystem
 Summary: Filesystem package that owns the clang resource directory
 Provides: %{name}-resource-filesystem(major) = %{maj_ver}
+BuildArch: noarch
 
 %description resource-filesystem
-This package owns the clang resouce directory: $libdir/clang/$version/
+This package owns the clang resouce directory: lib/clang/$version/
 
 %if %{without compat_build}
 %package analyzer
@@ -258,6 +241,13 @@ Requires:	emacs-filesystem
 %description tools-extra
 A set of extra tools built using Clang's tooling API.
 
+%package tools-extra-devel
+Summary: Development header files for clang tools
+Requires: %{name}-tools-extra = %{version}-%{release}
+
+%description tools-extra-devel
+Development header files for clang tools.
+
 # Put git-clang-format in its own package, because it Requires git
 # and we don't want to force users to install all those dependenices if they
 # just want clang.
@@ -273,7 +263,7 @@ clang-format integration for git.
 
 %package -n python3-clang
 Summary:       Python3 bindings for clang
-Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:      %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:      python3
 %description -n python3-clang
 %{summary}.
@@ -283,91 +273,118 @@ Requires:      python3
 
 
 %prep
+%if %{without snapshot_build}
+%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}'
+%endif
+
 %if %{with compat_build}
 %autosetup -n %{clang_srcdir} -p2
 %else
+
+%if %{without snapshot_build}
+%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE1}'
+%endif
+
 %setup -T -q -b 1 -n %{clang_tools_srcdir}
 %autopatch -m200 -p2
 
 # failing test case
-rm test/clang-tidy/checkers/altera-struct-pack-align.cpp
+rm test/clang-tidy/checkers/altera/struct-pack-align.cpp
 
-pathfix.py -i %{__python3} -pn \
-	clang-tidy/tool/*.py \
+%py3_shebang_fix \
+	clang-tidy/tool/ \
 	clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 
+
 %setup -q -n %{clang_srcdir}
-%autopatch -M200 -p2
+%autopatch -M%{?!rhel:100}%{?rhel:200} -p2
 
 # failing test case
 rm test/CodeGen/profile-filter.c
 
-pathfix.py -i %{__python3} -pn \
-	tools/clang-format/*.py \
+%py3_shebang_fix \
+	tools/clang-format/ \
 	tools/clang-format/git-clang-format \
 	utils/hmaptool/hmaptool \
 	tools/scan-view/bin/scan-view \
+	tools/scan-view/share/Reporter.py \
+	tools/scan-view/share/startfile.py \
 	tools/scan-build-py/bin/* \
 	tools/scan-build-py/libexec/*
+
+# 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
 
-# We run the builders out of memory on armv7 and i686 when LTO is enabled
-%ifarch %{arm} i686
+%undefine __cmake_in_source_build
+
+# And disable LTO on AArch64 entirely.
+%ifarch aarch64
 %define _lto_cflags %{nil}
-%else
-# This package does not ship any object files or static libraries, so we
-# don't need -ffat-lto-objects.
-%global _lto_cflags %(echo %{_lto_cflags} | sed 's/-ffat-lto-objects//')
 %endif
 
-# lto builds with gcc 11 fail while running the lit tests.
-%define _lto_cflags %{nil}
-
-%if 0%{?__isa_bits} == 64
-sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py
-%else
-sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
+# Disable LTO to speed up builds
+%if %{with snapshot_build}
+%global _lto_cflags %nil
 %endif
 
-mkdir -p %{_vpath_builddir}
-cd %{_vpath_builddir}
-
-%ifarch s390 s390x %{arm} %ix86 ppc64le
+%ifarch s390 s390x aarch64 %ix86 ppc64le
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
-# -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 \
+# Disable dwz on aarch64, because it takes a huge amount of time to decide not to optimize things.
+%ifarch aarch64
+%define _find_debuginfo_dwz_opts %{nil}
+%endif
+
+
+%set_build_flags
+CXXFLAGS="$CXXFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
+CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
+
+# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF and PPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON to match the
+# defaults used by Fedora's GCC.
+%cmake -G Ninja \
+	-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
+%if 0%{?fedora} || 0%{?rhel} > 9
+	-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON \
+%endif
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DPYTHON_EXECUTABLE=%{__python3} \
-	-DCMAKE_INSTALL_RPATH:BOOL=";" \
-%ifarch s390 s390x %{arm} %ix86 ppc64le
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
+%ifarch s390 s390x %ix86 ppc64le aarch64
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
 %if %{with compat_build}
 	-DCLANG_BUILD_TOOLS:BOOL=OFF \
-	-DLLVM_CONFIG:FILEPATH=%{_bindir}/llvm-config-%{maj_ver} \
 	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
 	-DCLANG_INCLUDE_TESTS:BOOL=OFF \
+	-DLLVM_INCLUDE_TESTS:BOOL=OFF \
+	-DLLVM_CMAKE_DIR=%{install_libdir}/cmake/llvm \
 %else
 	-DCLANG_INCLUDE_TESTS:BOOL=ON \
-	-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../../%{clang_tools_srcdir} \
+	-DLLVM_BUILD_UTILS:BOOL=ON \
+	-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../%{clang_tools_srcdir} \
 	-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
+	-DLLVM_LIT_ARGS="-vv" \
 	-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
 %if 0%{?__isa_bits} == 64
 	-DLLVM_LIBDIR_SUFFIX=64 \
 %else
 	-DLLVM_LIBDIR_SUFFIX= \
 %endif
+%endif
+	\
+%if %{with snapshot_build}
+	-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
 %endif
 	\
 %if %{with compat_build}
@@ -375,6 +392,7 @@ cd %{_vpath_builddir}
 %else
 	-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
 %endif
+	-DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \
 	-DCLANG_ENABLE_ARCMT:BOOL=ON \
 	-DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
 	-DCLANG_INCLUDE_DOCS:BOOL=ON \
@@ -383,25 +401,22 @@ cd %{_vpath_builddir}
 	-DLLVM_ENABLE_EH=ON \
 	-DLLVM_ENABLE_RTTI=ON \
 	-DLLVM_BUILD_DOCS=ON \
-	-DLLVM_ENABLE_NEW_PASS_MANAGER=ON \
 	-DLLVM_ENABLE_SPHINX=ON \
 	-DCLANG_LINK_CLANG_DYLIB=ON \
-	%{?abi_revision:-DLLVM_ABI_REVISION=%{abi_revision}} \
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 	\
 	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS=OFF \
-	%{?gcc_install_prefix:-DGCC_INSTALL_PREFIX=%{gcc_install_prefix}} \
 	-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \
+	-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-13/root/usr \
+	-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
 	-DCLANG_DEFAULT_UNWINDLIB=libgcc
 
 %cmake_build
 
 %install
 
-pushd %{_vpath_builddir}
 %cmake_install
-popd
 
 %if %{with compat_build}
 
@@ -409,6 +424,8 @@ popd
 rm -Rf %{buildroot}%{install_bindir}
 rm -Rf %{buildroot}%{install_prefix}/share
 rm -Rf %{buildroot}%{install_prefix}/libexec
+# Remove scanview-py helper libs
+rm -Rf %{buildroot}%{install_prefix}/lib/{libear,libscanbuild}
 
 %else
 
@@ -427,9 +444,12 @@ install -p -m644 bindings/python/clang/* %{buildroot}%{python3_sitelib}/clang/
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/clang
 
 # install scanbuild-py to python sitelib.
-mv %{buildroot}%{_prefix}/lib/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
+mv %{buildroot}%{_prefix}/%{_lib}/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/{libear,libscanbuild}
 
+# Fix permissions of scan-view scripts
+chmod a+x %{buildroot}%{_datadir}/scan-view/{Reporter.py,startfile.py}
+
 # multilib fix
 %multilib_fix_c_header --file %{_includedir}/clang/Config/config.h
 
@@ -444,7 +464,7 @@ rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript
 rm -vf %{buildroot}%{_datadir}/clang/clang-format-sublime.py*
 
 # TODO: Package html docs
-rm -Rvf %{buildroot}%{_docdir}/clang/html
+rm -Rvf %{buildroot}%{_docdir}/Clang/clang/html
 rm -Rvf %{buildroot}%{_datadir}/clang/clang-doc-default-stylesheet.css
 rm -Rvf %{buildroot}%{_datadir}/clang/index.js
 
@@ -463,52 +483,40 @@ ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}
 # Fix permission
 chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
 
-# create a link to clang's resource directory that is "constant" across minor
-# version bumps
-# this is required for packages like ccls that hardcode the link to clang's
-# resource directory to not require rebuilds on minor version bumps
-# Fix for bugs like rhbz#1807574
-pushd %{buildroot}%{_libdir}/clang/
-ln -s %{version} %{maj_ver}
-popd
-
 %endif
 
 # Create sub-directories in the clang resource directory that will be
 # populated by other packages
-mkdir -p %{buildroot}%{pkg_libdir}/clang/%{version}/{include,lib,share}/
+mkdir -p %{buildroot}%{install_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/
 
 
-# Remove clang-tidy headers.  We don't ship the libraries for these.
-rm -Rvf %{buildroot}%{_includedir}/clang-tidy/
-
 %if %{without compat_build}
 # Add a symlink in /usr/bin to clang-format-diff
 ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format-diff
 %endif
 
 %check
-cd %{_vpath_builddir}
-
 %if %{without compat_build}
 %if %{with check}
+# Build test dependencies separately, to prevent invocations of host clang from being affected
+# by LD_LIBRARY_PATH below.
+%cmake_build --target clang-test-depends \
+    ExtraToolsUnitTests ClangdUnitTests ClangIncludeCleanerUnitTests ClangPseudoUnitTests
 # requires lit.py from LLVM utilities
-# FIXME: Fix failing ARM tests
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %cmake_build --target check-all || \
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir}
 %endif
-%ifarch %{arm}
-:
-%else
-false
-%endif
-
 %endif
 
 
 %if %{without compat_build}
 %files
 %license LICENSE.TXT
-%{clang_binaries}
+%{_bindir}/clang
+%{_bindir}/clang++
+%{_bindir}/clang-%{maj_ver}
+%{_bindir}/clang++-%{maj_ver}
+%{_bindir}/clang-cl
+%{_bindir}/clang-cpp
 %{_mandir}/man1/clang.1.gz
 %{_mandir}/man1/clang++.1.gz
 %{_mandir}/man1/clang-%{maj_ver}.1.gz
@@ -516,13 +524,8 @@ false
 %endif
 
 %files libs
-%if %{without compat_build}
-%{_libdir}/clang/
-%{_libdir}/*.so.*
-%else
-%{pkg_libdir}/*.so.*
-%{pkg_libdir}/clang/%{version}
-%endif
+%{install_prefix}/lib/clang/%{maj_ver}/include/*
+%{install_libdir}/*.so.*
 
 %files devel
 %if %{without compat_build}
@@ -530,25 +533,26 @@ false
 %{_includedir}/clang/
 %{_includedir}/clang-c/
 %{_libdir}/cmake/*
+%{_bindir}/clang-tblgen
 %dir %{_datadir}/clang/
-%{_rpmmacrodir}/macros.%{name}
 %else
-%{pkg_libdir}/*.so
+%{install_libdir}/*.so
 %{pkg_includedir}/clang/
 %{pkg_includedir}/clang-c/
-%{pkg_libdir}/cmake/
+%{install_libdir}/cmake/
 %endif
 
 %files resource-filesystem
-%dir %{pkg_libdir}/clang/%{version}/
-%dir %{pkg_libdir}/clang/%{version}/include/
-%dir %{pkg_libdir}/clang/%{version}/lib/
-%dir %{pkg_libdir}/clang/%{version}/share/
+%dir %{install_prefix}/lib/clang/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/bin/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/include/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/lib/
+%dir %{install_prefix}/lib/clang/%{maj_ver}/share/
 %if %{without compat_build}
-%{pkg_libdir}/clang/%{maj_ver}
-%endif
+%{_rpmmacrodir}/macros.%{name}
+
 
-%if %{without compat_build}
 %files analyzer
 %{_bindir}/scan-view
 %{_bindir}/scan-build
@@ -567,8 +571,34 @@ false
 %{python3_sitelib}/libear
 %{python3_sitelib}/libscanbuild
 
+
 %files tools-extra
-%{clang_tools_binaries}
+%{_bindir}/amdgpu-arch
+%{_bindir}/clang-apply-replacements
+%{_bindir}/clang-change-namespace
+%{_bindir}/clang-check
+%{_bindir}/clang-doc
+%{_bindir}/clang-extdef-mapping
+%{_bindir}/clang-format
+%{_bindir}/clang-include-cleaner
+%{_bindir}/clang-include-fixer
+%{_bindir}/clang-move
+%{_bindir}/clang-offload-bundler
+%{_bindir}/clang-offload-packager
+%{_bindir}/clang-linker-wrapper
+%{_bindir}/clang-pseudo
+%{_bindir}/clang-query
+%{_bindir}/clang-refactor
+%{_bindir}/clang-rename
+%{_bindir}/clang-reorder-fields
+%{_bindir}/clang-repl
+%{_bindir}/clang-scan-deps
+%{_bindir}/clang-tidy
+%{_bindir}/clangd
+%{_bindir}/diagtool
+%{_bindir}/hmaptool
+%{_bindir}/nvptx-arch
+%{_bindir}/pp-trace
 %{_bindir}/c-index-test
 %{_bindir}/find-all-symbols
 %{_bindir}/modularize
@@ -585,6 +615,9 @@ false
 %{_datadir}/clang/run-find-all-symbols.py*
 %{_datadir}/clang/clang-rename.py*
 
+%files tools-extra-devel
+%{_includedir}/clang-tidy/
+
 %files -n git-clang-format
 %{_bindir}/git-clang-format
 
@@ -594,9 +627,39 @@ false
 
 %endif
 %changelog
-* Tue May 24 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-2
-- Use libstdc++ from gcc-toolset-11
-- Resolves: rhbz#2088672
+* Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
+- Update to LLVM 17.0.6
+
+* Wed Oct 04 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-1
+- Update to LLVM 17.0.2
+
+* Thu Jun 29 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-2
+- Use gcc-toolset-13 by default
+
+* Sat Jun 17 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-1
+- 16.0.6 Release
+
+* Fri May 12 2023 Tom Stellard <tstellar@redhat.com> - 16.0.0-2
+- Fix clang_resource_dir macro
+
+* Fri Apr 28 2023 Tom Stellard <tstelar@redhat.com> - 16.0.0-1
+- 16.0.0 Release
+
+* Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
+- Update to LLVM 15.0.7
+
+* Tue Sep 06 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-1
+- Update to LLVM 15.0.0
+
+* Tue Jun 28 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
+- 14.0.6 Release
+
+* Wed Jun 01 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-2
+- Increate gcc-toolset dependency to 12
+- Set GCC_INSTALL_PREFIX variable
+
+* Thu Apr 07 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
+- Update to 14.0.0
 
 * Thu Feb 03 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-1
 - 13.0.1 Release