diff --git a/.clang.metadata b/.clang.metadata
index 035653a..c02da4d 100644
--- a/.clang.metadata
+++ b/.clang.metadata
@@ -1,6 +1,5 @@
-f005e3b6d41cf92c083d2a16960aaeb1a6e3c76c SOURCES/clang-16.0.6.src.tar.xz
-bc19124e64c0ffe7ada3d4bad8aec42c0cd05f04 SOURCES/clang-16.0.6.src.tar.xz.sig
-41c06d541cfcc126ddc344e7f162148f2ecf0461 SOURCES/clang-tools-extra-16.0.6.src.tar.xz
-cc29485778a6c94ed98f3b2dfb754ef513535691 SOURCES/clang-tools-extra-16.0.6.src.tar.xz.sig
-0de534cfef38697e115c3ae80634765f05e78e5b SOURCES/cmake-16.0.6.src.tar.xz
-2db5c88fe9277bb0fa85f49b58e946e49ff235c2 SOURCES/cmake-16.0.6.src.tar.xz.sig
+88442d295bc0b96df7cf3d526ed9eabd7a214ac2 SOURCES/clang-14.0.6.src.tar.xz
+39f39cafd4e96c88fe22dbedd2828121ebb4d00c SOURCES/clang-14.0.6.src.tar.xz.sig
+dac5046f0eb81e6c47432cf80229599befbf273e SOURCES/clang-tools-extra-14.0.6.src.tar.xz
+bcbd2b4a4f52ff561413a0774fd919d91574c597 SOURCES/clang-tools-extra-14.0.6.src.tar.xz.sig
+b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc
diff --git a/.gitignore b/.gitignore
index 8a6c0cd..91b2a8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-SOURCES/clang-16.0.6.src.tar.xz
-SOURCES/clang-16.0.6.src.tar.xz.sig
-SOURCES/clang-tools-extra-16.0.6.src.tar.xz
-SOURCES/clang-tools-extra-16.0.6.src.tar.xz.sig
-SOURCES/cmake-16.0.6.src.tar.xz
-SOURCES/cmake-16.0.6.src.tar.xz.sig
+SOURCES/clang-14.0.6.src.tar.xz
+SOURCES/clang-14.0.6.src.tar.xz.sig
+SOURCES/clang-tools-extra-14.0.6.src.tar.xz
+SOURCES/clang-tools-extra-14.0.6.src.tar.xz.sig
+SOURCES/tstellar-gpg-key.asc
diff --git a/SOURCES/0001-PATCH-clang-Reorganize-gtest-integration.patch b/SOURCES/0001-PATCH-clang-Reorganize-gtest-integration.patch
new file mode 100644
index 0000000..e854f01
--- /dev/null
+++ b/SOURCES/0001-PATCH-clang-Reorganize-gtest-integration.patch
@@ -0,0 +1,42 @@
+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
+
diff --git a/SOURCES/0001-PowerPC-clang-Fix-triple.patch b/SOURCES/0001-PowerPC-clang-Fix-triple.patch
deleted file mode 100644
index 6dd8060..0000000
--- a/SOURCES/0001-PowerPC-clang-Fix-triple.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 701750a896a08d5841a7bc0d187bcddaa6c0f616 Mon Sep 17 00:00:00 2001
-From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
-Date: Thu, 16 Mar 2023 17:22:24 -0300
-Subject: [PATCH] [PowerPC][clang] Fix triple
-
-Some Linux distributions use ppc64le instead of powerpc.
----
- clang/test/CodeGenCoroutines/pr56329.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clang/test/CodeGenCoroutines/pr56329.cpp b/clang/test/CodeGenCoroutines/pr56329.cpp
-index 31d4849af4e7..69e0f1d337cf 100644
---- a/clang/test/CodeGenCoroutines/pr56329.cpp
-+++ b/clang/test/CodeGenCoroutines/pr56329.cpp
-@@ -2,7 +2,7 @@
- //
- // RUN: %clang_cc1 -triple %itanium_abi_triple -std=c++20 %s -O3 -S -emit-llvm -o - | FileCheck %s
- // This test is expected to fail on PowerPC.
--// XFAIL: target=powerpc{{.*}}
-+// XFAIL: target={{(ppc|powerpc).*}}
- 
- #include "Inputs/coroutine.h"
- 
--- 
-2.39.2
--
diff --git a/SOURCES/0001-Work-around-gcc-miscompile.patch b/SOURCES/0001-Work-around-gcc-miscompile.patch
new file mode 100644
index 0000000..16c1467
--- /dev/null
+++ b/SOURCES/0001-Work-around-gcc-miscompile.patch
@@ -0,0 +1,33 @@
+From 0f97b7209eed4a428171af6044fe7e0aaf81ee2a Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Thu, 3 Feb 2022 10:34:44 +0100
+Subject: [PATCH] Work around gcc miscompile
+
+This works around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104334,
+which miscompiles clang on s390x and ppc64le. The issue is already
+fixed on the gcc side, but including this as a temporary workaround
+to get a working build.
+---
+ clang/lib/Sema/DeclSpec.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/clang/lib/Sema/DeclSpec.cpp b/clang/lib/Sema/DeclSpec.cpp
+index d4dc790c008a..77a1e6c32c6f 100644
+--- a/clang/lib/Sema/DeclSpec.cpp
++++ b/clang/lib/Sema/DeclSpec.cpp
+@@ -1203,8 +1203,9 @@ void DeclSpec::Finish(Sema &S, const PrintingPolicy &Policy) {
+     } else if (TypeSpecType == TST_double) {
+       // vector long double and vector long long double are never allowed.
+       // vector double is OK for Power7 and later, and ZVector.
+-      if (getTypeSpecWidth() == TypeSpecifierWidth::Long ||
+-          getTypeSpecWidth() == TypeSpecifierWidth::LongLong)
++      TypeSpecifierWidth TypeSpecWidth = getTypeSpecWidth();
++      if (TypeSpecWidth == TypeSpecifierWidth::Long ||
++          TypeSpecWidth == TypeSpecifierWidth::LongLong)
+         S.Diag(TSWRange.getBegin(),
+                diag::err_invalid_vector_long_double_decl_spec);
+       else if (!S.Context.getTargetInfo().hasFeature("vsx") &&
+--
+2.34.1
+
+
diff --git a/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch b/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
deleted file mode 100644
index a0b8cb0..0000000
--- a/SOURCES/0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 581300e447602b9b7a505b0f07e8461d58d041ca Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Fri, 1 Jul 2022 21:24:17 -0700
-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 9b99bfd93440..3fca9f25fb48 100644
---- a/clang-tools-extra/test/lit.cfg.py
-+++ b/clang-tools-extra/test/lit.cfg.py
-@@ -59,6 +59,9 @@ config.substitutions.append(
- # Plugins (loadable modules)
- 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
-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.27.0
-
diff --git a/SOURCES/0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch b/SOURCES/0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
new file mode 100644
index 0000000..e425475
--- /dev/null
+++ b/SOURCES/0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
@@ -0,0 +1,39 @@
+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
+
diff --git a/SOURCES/0002-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch b/SOURCES/0002-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
new file mode 100644
index 0000000..e6671f9
--- /dev/null
+++ b/SOURCES/0002-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
@@ -0,0 +1,29 @@
+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 d0808d061c82..de9c9743cd38 100644
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2701,6 +2701,11 @@ bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {
+   case llvm::Triple::ppc64le:
+   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 true;
+   default:
+     return false;
+-- 
+2.27.0
+
diff --git a/SOURCES/0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch b/SOURCES/0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch
deleted file mode 100644
index ce920f9..0000000
--- a/SOURCES/0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d95d3fbff661c0390072ed0bb4544d5e2aae5c9a 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] Make -funwind-tables the default on all archs
-
----
- clang/lib/Driver/ToolChains/Gnu.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index c8006f3d8412..6ed03adb7702 100644
---- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2863,6 +2863,11 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const {
-   case llvm::Triple::ppc64le:
-   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
-
diff --git a/SOURCES/0010-PATCH-clang-Produce-DWARF4-by-default.patch b/SOURCES/0010-PATCH-clang-Produce-DWARF4-by-default.patch
index ea81f74..d05b776 100644
--- a/SOURCES/0010-PATCH-clang-Produce-DWARF4-by-default.patch
+++ b/SOURCES/0010-PATCH-clang-Produce-DWARF4-by-default.patch
@@ -1,7 +1,7 @@
-From 4ea62faaaac1aad0fe496cabe9674c809c91c49a Mon Sep 17 00:00:00 2001
+From 6509777d4c12a42c7487814d868375a86712bf5b Mon Sep 17 00:00:00 2001
 From: Konrad Kleine <kkleine@redhat.com>
-Date: Mon, 13 Feb 2023 17:11:00 -0300
-Subject: [PATCH] Produce DWARF4 by default
+Date: Thu, 24 Mar 2022 09:44:21 +0100
+Subject: [PATCH][clang]Produce DWARF4 by default
 
 Have a look at the following commit to see when the move from DWARF 4 to 5 first happened upstream:
 
@@ -9,18 +9,16 @@ https://github.com/llvm/llvm-project/commit/d3b26dea16108c427b19b5480c9edc76edf8
 ---
  clang/include/clang/Driver/ToolChain.h | 2 +-
  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(+), 9 deletions(-)
+ 5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h
-index f75f35dc9e65..a70ae2b17833 100644
+index adf1753e8d3a..c8adc4d917ce 100644
 --- a/clang/include/clang/Driver/ToolChain.h
 +++ b/clang/include/clang/Driver/ToolChain.h
-@@ -547,7 +547,7 @@ public:
+@@ -515,7 +515,7 @@ public:
  
    // Return the DWARF version to emit, in the absence of arguments
    // to the contrary.
@@ -44,80 +42,57 @@ index 0a6fa4768026..96f01749d0d8 100644
  
  // 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 1d588bdfc1b0..1ad57aedc3a4 100644
+index f332cd83b26e..911779fffbef 100644
 --- a/clang/test/Driver/cl-options.c
 +++ b/clang/test/Driver/cl-options.c
-@@ -575,7 +575,7 @@
+@@ -597,7 +597,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 d982b1070cae..bb129e75769c 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"
+ // RUN: %clang_cl -fmsc-version=1800 -TP -### -- %s 2>&1 | FileCheck -check-prefix=CXX11 %s
+ // CXX11: -std=c++11
 diff --git a/clang/test/Driver/ve-toolchain.c b/clang/test/Driver/ve-toolchain.c
-index 32e25769b6da..b8a2852daba8 100644
+index 753dee19fcbf..dfd12cc0bba4 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
+ // 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
+index 4b2b9c5747fe..3a196dd94ca1 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: %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
+diff -ruN clang-14.0.0.src.orig/test/Driver/clang-g-opts.c clang-14.0.0.src/test/Driver/clang-g-opts.c
+--- a/clang-14.0.0.src.orig/test/Driver/clang-g-opts.c	2022-03-14 10:44:55.000000000 +0100
++++ b/clang-14.0.0.src/test/Driver/clang-g-opts.c	2022-04-13 06:36:55.832253890 +0200
+@@ -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"
 -- 
-2.39.1
+2.35.1
 
diff --git a/SOURCES/D138472.diff b/SOURCES/D138472.diff
deleted file mode 100644
index 5d3cd60..0000000
--- a/SOURCES/D138472.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-From 04b642c646048dd9df652eba05d45beaa13bc895 Mon Sep 17 00:00:00 2001
-From: Konrad Kleine <kkleine@redhat.com>
-Date: Mon, 23 Jan 2023 13:14:17 +0000
-Subject: [PATCH] Rebased D138472
-
----
- clang/CMakeLists.txt | 23 ++++++++++-------------
- 1 file changed, 10 insertions(+), 13 deletions(-)
-
-diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
-index 090cfa352078..f87838776c32 100644
---- a/clang/CMakeLists.txt
-+++ b/clang/CMakeLists.txt
-@@ -118,12 +118,11 @@ if(CLANG_BUILT_STANDALONE)
-         set(LLVM_UTILS_PROVIDED ON)
-         set(CLANG_TEST_DEPS FileCheck count not)
-       endif()
--      set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/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} third-party/unittest)
--      endif()
-+    endif()
-+
-+    find_package(LLVMGTest HINTS "${LLVM_CMAKE_DIR}")
-+    if (NOT TARGET llvm_gtest)
-+        message(FATAL_ERROR "llvm-gtest not found. Please install llvm-gtest or disable tests with -DLLVM_INCLUDE_TESTS=OFF")
-     endif()
- 
-     if(LLVM_LIT)
-@@ -506,13 +505,11 @@ endif()
- 
- 
- if( CLANG_INCLUDE_TESTS )
--  if(EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h)
--    add_subdirectory(unittests)
--    list(APPEND CLANG_TEST_DEPS ClangUnitTests)
--    list(APPEND CLANG_TEST_PARAMS
--      clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/test/Unit/lit.site.cfg
--      )
--  endif()
-+  add_subdirectory(unittests)
-+  list(APPEND CLANG_TEST_DEPS ClangUnitTests)
-+  list(APPEND CLANG_TEST_PARAMS
-+    clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/test/Unit/lit.site.cfg
-+  )
-   add_subdirectory(test)
-   add_subdirectory(bindings/python/tests)
- 
--- 
-2.34.3
-
diff --git a/SOURCES/D141581.diff b/SOURCES/D141581.diff
deleted file mode 100644
index c227e22..0000000
--- a/SOURCES/D141581.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt
---- a/clang/lib/Basic/CMakeLists.txt
-+++ b/clang/lib/Basic/CMakeLists.txt
-@@ -110,7 +110,7 @@
- 
-   DEPENDS
-   omp_gen
--  RISCVTargetParserTableGen
-+  LLVMTargetParser
-   )
- 
- target_link_libraries(clangBasic
-diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
---- a/clang/lib/Driver/CMakeLists.txt
-+++ b/clang/lib/Driver/CMakeLists.txt
-@@ -93,7 +93,7 @@
- 
-   DEPENDS
-   ClangDriverOptions
--  RISCVTargetParserTableGen
-+  LLVMTargetParser
- 
-   LINK_LIBS
-   clangBasic
-
diff --git a/SOURCES/clangd-tests.patch b/SOURCES/clangd-tests.patch
new file mode 100644
index 0000000..eee0014
--- /dev/null
+++ b/SOURCES/clangd-tests.patch
@@ -0,0 +1,128 @@
+diff --git a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp
+index 0c9455f..22638ee 100644
+--- a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp
++++ b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp
+@@ -451,123 +451,6 @@ TEST_F(TUSchedulerTests, InvalidationUnchanged) {
+   EXPECT_EQ(1, Actions.load()) << "All actions should run";
+ }
+ 
+-TEST_F(TUSchedulerTests, ManyUpdates) {
+-  const int FilesCount = 3;
+-  const int UpdatesPerFile = 10;
+-
+-  std::mutex Mut;
+-  int TotalASTReads = 0;
+-  int TotalPreambleReads = 0;
+-  int TotalUpdates = 0;
+-  llvm::StringMap<int> LatestDiagVersion;
+-
+-  // Run TUScheduler and collect some stats.
+-  {
+-    auto Opts = optsForTest();
+-    Opts.UpdateDebounce = DebouncePolicy::fixed(std::chrono::milliseconds(50));
+-    TUScheduler S(CDB, Opts, captureDiags());
+-
+-    std::vector<std::string> Files;
+-    for (int I = 0; I < FilesCount; ++I) {
+-      std::string Name = "foo" + std::to_string(I) + ".cpp";
+-      Files.push_back(testPath(Name));
+-      this->FS.Files[Files.back()] = "";
+-    }
+-
+-    StringRef Contents1 = R"cpp(int a;)cpp";
+-    StringRef Contents2 = R"cpp(int main() { return 1; })cpp";
+-    StringRef Contents3 = R"cpp(int a; int b; int sum() { return a + b; })cpp";
+-
+-    StringRef AllContents[] = {Contents1, Contents2, Contents3};
+-    const int AllContentsSize = 3;
+-
+-    // Scheduler may run tasks asynchronously, but should propagate the
+-    // context. We stash a nonce in the context, and verify it in the task.
+-    static Key<int> NonceKey;
+-    int Nonce = 0;
+-
+-    for (int FileI = 0; FileI < FilesCount; ++FileI) {
+-      for (int UpdateI = 0; UpdateI < UpdatesPerFile; ++UpdateI) {
+-        auto Contents = AllContents[(FileI + UpdateI) % AllContentsSize];
+-
+-        auto File = Files[FileI];
+-        auto Inputs = getInputs(File, Contents.str());
+-        {
+-          WithContextValue WithNonce(NonceKey, ++Nonce);
+-          Inputs.Version = std::to_string(UpdateI);
+-          updateWithDiags(
+-              S, File, Inputs, WantDiagnostics::Auto,
+-              [File, Nonce, Version(Inputs.Version), &Mut, &TotalUpdates,
+-               &LatestDiagVersion](std::vector<Diag>) {
+-                EXPECT_THAT(Context::current().get(NonceKey), Pointee(Nonce));
+-                EXPECT_EQ(File, boundPath());
+-
+-                std::lock_guard<std::mutex> Lock(Mut);
+-                ++TotalUpdates;
+-                EXPECT_EQ(File, *TUScheduler::getFileBeingProcessedInContext());
+-                // Make sure Diags are for a newer version.
+-                auto It = LatestDiagVersion.try_emplace(File, -1);
+-                const int PrevVersion = It.first->second;
+-                int CurVersion;
+-                ASSERT_TRUE(llvm::to_integer(Version, CurVersion, 10));
+-                EXPECT_LT(PrevVersion, CurVersion);
+-                It.first->getValue() = CurVersion;
+-              });
+-        }
+-        {
+-          WithContextValue WithNonce(NonceKey, ++Nonce);
+-          S.runWithAST(
+-              "CheckAST", File,
+-              [File, Inputs, Nonce, &Mut,
+-               &TotalASTReads](Expected<InputsAndAST> AST) {
+-                EXPECT_THAT(Context::current().get(NonceKey), Pointee(Nonce));
+-                EXPECT_EQ(File, boundPath());
+-
+-                ASSERT_TRUE((bool)AST);
+-                EXPECT_EQ(AST->Inputs.Contents, Inputs.Contents);
+-                EXPECT_EQ(AST->Inputs.Version, Inputs.Version);
+-                EXPECT_EQ(AST->AST.version(), Inputs.Version);
+-
+-                std::lock_guard<std::mutex> Lock(Mut);
+-                ++TotalASTReads;
+-                EXPECT_EQ(File, *TUScheduler::getFileBeingProcessedInContext());
+-              });
+-        }
+-
+-        {
+-          WithContextValue WithNonce(NonceKey, ++Nonce);
+-          S.runWithPreamble(
+-              "CheckPreamble", File, TUScheduler::Stale,
+-              [File, Inputs, Nonce, &Mut,
+-               &TotalPreambleReads](Expected<InputsAndPreamble> Preamble) {
+-                EXPECT_THAT(Context::current().get(NonceKey), Pointee(Nonce));
+-                EXPECT_EQ(File, boundPath());
+-
+-                ASSERT_TRUE((bool)Preamble);
+-                EXPECT_EQ(Preamble->Contents, Inputs.Contents);
+-
+-                std::lock_guard<std::mutex> Lock(Mut);
+-                ++TotalPreambleReads;
+-                EXPECT_EQ(File, *TUScheduler::getFileBeingProcessedInContext());
+-              });
+-        }
+-      }
+-    }
+-    ASSERT_TRUE(S.blockUntilIdle(timeoutSeconds(10)));
+-  } // TUScheduler destructor waits for all operations to finish.
+-
+-  std::lock_guard<std::mutex> Lock(Mut);
+-  // Updates might get coalesced in preamble thread and result in dropping
+-  // diagnostics for intermediate snapshots.
+-  EXPECT_GE(TotalUpdates, FilesCount);
+-  EXPECT_LE(TotalUpdates, FilesCount * UpdatesPerFile);
+-  // We should receive diags for last update.
+-  for (const auto &Entry : LatestDiagVersion)
+-    EXPECT_EQ(Entry.second, UpdatesPerFile - 1);
+-  EXPECT_EQ(TotalASTReads, FilesCount * UpdatesPerFile);
+-  EXPECT_EQ(TotalPreambleReads, FilesCount * UpdatesPerFile);
+-}
+-
+ TEST_F(TUSchedulerTests, EvictedAST) {
+   std::atomic<int> BuiltASTCounter(0);
+   auto Opts = optsForTest();
diff --git a/SOURCES/fix-ieee128-cross.diff b/SOURCES/fix-ieee128-cross.diff
deleted file mode 100644
index 218c229..0000000
--- a/SOURCES/fix-ieee128-cross.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/clang/test/Driver/ppc-float-abi-warning.cpp b/clang/test/Driver/ppc-float-abi-warning.cpp
-index e3baa9f4c059..87d6d87a3b31 100644
---- a/clang/test/Driver/ppc-float-abi-warning.cpp
-+++ b/clang/test/Driver/ppc-float-abi-warning.cpp
-@@ -17,10 +17,12 @@
- // RUN:  -mabi=ieeelongdouble -stdlib=libc++ -Wno-unsupported-abi 2>&1 | \
- // RUN:  FileCheck %s --check-prefix=NOWARN
- // RUN: %clang -### --driver-mode=g++ -target powerpc64le-linux-gnu %s\
-+// RUN:  --dyld-prefix=%S/Inputs/powerpc64le-linux-gnu-tree/gcc-12 \
- // RUN:  -mabi=%if ppc_linux_default_ieeelongdouble %{ieeelongdouble%} \
- // RUN:  %else %{ibmlongdouble%} -stdlib=libc++ 2>&1 | \
- // RUN:  FileCheck %s --check-prefix=NOWARN
- // RUN: %clang -### --driver-mode=g++ -target powerpc64le-linux-gnu %s\
-+// RUN:  --dyld-prefix=%S/Inputs/powerpc64le-linux-gnu-tree/gcc-12 \
- // RUN:  -mabi=%if ppc_linux_default_ieeelongdouble %{ibmlongdouble%} \
- // RUN:  %else %{ieeelongdouble%} -stdlib=libc++ 2>&1 | FileCheck %s
diff --git a/SOURCES/llvm-hello.patch b/SOURCES/llvm-hello.patch
new file mode 100644
index 0000000..d28e349
--- /dev/null
+++ b/SOURCES/llvm-hello.patch
@@ -0,0 +1,61 @@
+diff -ruN a/clang-tools-extra-14.0.0rc2.src.orig/test/clang-tidy/CTTestTidyModule.cpp a/clang-tools-extra-14.0.0rc2.src/test/clang-tidy/CTTestTidyModule.cpp
+--- a/clang-tools-extra-14.0.0rc2.src.orig/test/clang-tidy/CTTestTidyModule.cpp	2022-03-02 01:46:37.000000000 +0100
++++ a/clang-tools-extra-14.0.0rc2.src/test/clang-tidy/CTTestTidyModule.cpp	2022-03-07 08:52:20.009112976 +0100
+@@ -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 -ruN a/clang-tools-extra-14.0.0rc2.src.orig/test/CMakeLists.txt a/clang-tools-extra-14.0.0rc2.src/test/CMakeLists.txt
+--- a/clang-tools-extra-14.0.0rc2.src.orig/test/CMakeLists.txt	2022-03-02 01:46:37.000000000 +0100
++++ a/clang-tools-extra-14.0.0rc2.src/test/CMakeLists.txt	2022-03-07 10:58:56.172490672 +0100
+@@ -15,10 +15,15 @@
+ 
+ string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
+ 
++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(
+@@ -97,7 +102,10 @@
+   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)  # Should be LLVMHello?
++      endif()
+       target_include_directories(CTTestTidyModule PUBLIC BEFORE "${CLANG_TOOLS_SOURCE_DIR}")
+       if(CLANG_PLUGIN_SUPPORT AND (WIN32 OR CYGWIN))
+         set(LLVM_LINK_COMPONENTS
+diff -ruN a/clang-tools-extra-14.0.0rc2.src.orig/test/lit.cfg.py a/clang-tools-extra-14.0.0rc2.src/test/lit.cfg.py
+--- a/clang-tools-extra-14.0.0rc2.src.orig/test/lit.cfg.py	2022-03-02 01:46:37.000000000 +0100
++++ a/clang-tools-extra-14.0.0rc2.src/test/lit.cfg.py	2022-03-07 08:52:20.010112983 +0100
+@@ -155,3 +155,6 @@
+ # Plugins (loadable modules)
+ 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')
+diff -ruN a/clang-tools-extra-14.0.0rc2.src.orig/test/lit.site.cfg.py.in a/clang-tools-extra-14.0.0rc2.src/test/lit.site.cfg.py.in
+--- a/clang-tools-extra-14.0.0rc2.src.orig/test/lit.site.cfg.py.in	2022-03-02 01:46:37.000000000 +0100
++++ a/clang-tools-extra-14.0.0rc2.src/test/lit.site.cfg.py.in	2022-03-07 10:59:17.202663983 +0100
+@@ -13,6 +13,7 @@
+ config.target_triple = "@TARGET_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.
diff --git a/SOURCES/macros.clang b/SOURCES/macros.clang
index 6f35452..1f26e35 100644
--- a/SOURCES/macros.clang
+++ b/SOURCES/macros.clang
@@ -8,7 +8,7 @@
 # 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_major_version}
+%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.
diff --git a/SOURCES/release-keys.asc b/SOURCES/release-keys.asc
deleted file mode 100644
index 0d3789a..0000000
--- a/SOURCES/release-keys.asc
+++ /dev/null
@@ -1,104 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBGLtemUBDADClvDIromq0Y4TX+wyRyYCq5WusPQheQuY8dVCXd9KhMpYAv8U
-X15E5boH/quGpJ0ZlVkWcf+1WUHIrQWlbzQdIx514CDM7DBgO92CXsnn86kIMDW+
-9S+Hkn8upbizT1fWritlHwzD9osz7ZQRq7ac03PPgw27tqeIizHGuG4VNLyhbbjA
-w+0VLFSu3r219eevS+lzBIvR5U9W720jFxWxts4UvaGuD6XW1ErcsTvuhgyCKrrs
-gxO5Ma/V7r0+lqRL688ZPr4HxthwsON1YCfpNiMZ6sgxT8rOE0qL/d07ItbnXxz6
-KdcNWIXamTJKJgag6Tl0gYX4KIuUCcivXaRdJtUcFFsveCorkdHkdGNos403XR89
-5u9gq7Ef10Zahsv5GjE2DV5oFCEhXvfIWxvyeJa65iBkJafElb2stgUjkIut2a2u
-+XmpKpwpGSFklce1ABLrmazlLjhsYiJVrz5l5ktoT9moE4GaF7Q5LD6JgsxzLE0U
-Tzo9/AQPd8qG2REAEQEAAbQeVG9iaWFzIEhpZXRhIDx0b2JpYXNAaGlldGEuc2U+
-iQHUBBMBCAA+FiEE1XS9XR0OmIleO/kARPJIXkXVkEIFAmLtemUCGwMFCRLMAwAF
-CwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQRPJIXkXVkEKoNwv+MEMVzdnzJarx
-ZJ0OzHrGJJG8/chkuoejTjCLG73li9yWQigy5KmvynB5yW0fk0PAQ90vvp2wr/Hd
-mUh0Zda3CwF6sWlO3N6DEDjVA3lZUuofTtvMn/tdGvvOOXYXAP9N+SZfp/7q8dxX
-zn5SA1AO87nXq5lrwVzlVzUCdwOeqDlJ+2U9VEqvukP/FdkgaR2bEb8Wm/h+encW
-UIQEqPDE+qOyJ9dRaiL0CUI4x+1wXeXB3OA7VybF2LvaZDbMlocdy+vs825iUWfa
-n8g3mE2TpV8jkc9UHgGGopzxqNquvkkIB7ZFZm/PSW40W3OeHKhYsZZbHrz9403t
-3R4SAzA3ApmMP/P8ue9irsbe24g3rzYMvck1w4C1a4Uy9buT0OCfA+dA16IRAPgV
-5SJEIS62cFbUxkw8el3rUK9V+6kwoq4k8Fs8f1U7DEnOKS/v8BJJCNEc1cvimZai
-Y5/3r5BeneEmuZFKX4iIIfcn5PmLSDB4aw+gKAIAAus+E2DxBqE+uQGNBGLtemUB
-DADBCNyvUdv0OV//6pQ/0YC2bYXL/ElF0rOjFFl4H7O3TRxgIz2C4nQJHUOrXSmo
-iL7ldfUjoAMgebcoWDpgE8S2Vjw2Gd+UJBQXj+3J6dPKLBUCjj9CLyb5hwOHITMV
-b9UC/E+iwpn4vgTbI6K1O847brkBC+GuDT4g9D3O3sRbja0GjN0n2yZiS8NtRQm1
-MXAVy1IffeXKpGLookAhoUArSN88koMe+4Nx6Qun4/aUcwz0P2QUr5MA5jUzFLy1
-R3M5p1nctX15oLOU33nwCWuyjvqkxAeAfJMlkKDKYX25u1R2RmQ4ju2kAbw0PiiZ
-yYft8fGlrwT4/PB3AqfKeSpx8l9Vs15ePvcuJITauo3fhBjJ6Y4WCKlTG1FbDYUl
-KvPhyGO8yLhtZJg3+LbA5M/CEHsDmUh7YEQVxM0RTQMTxNBVBF5IG/4y8v/+19DZ
-89VdpsQF3ThoPV0yh57YMemTBeIxpF9Swp5N7kUWct4872kBnXOmbp/jhU4MpLj6
-iLEAEQEAAYkBvAQYAQgAJhYhBNV0vV0dDpiJXjv5AETySF5F1ZBCBQJi7XplAhsM
-BQkSzAMAAAoJEETySF5F1ZBCdPwL/3Ox6MwrKFzYJNz3NpQFpKFdDrkwhf25D/Qw
-vu5e8Lql/q62NIhEKH3jxXXgoFYas2G7r8CSCRehraDqvXygbaiWUIkxSU0xuDTl
-lNqHSkCRqIxhi/yxNm1Pk84NVGTLXWW0+CwT9cRwWn5foIPJhoDdZ732zJ7rcY3R
-g71SJTe3R6MnGBzIF1LzT7Znwkh7YfcmeTfInareIWXpeNaeKy8KrQmr/0+5AIer
-Ax1gu03o8GD5LFDUuGbESgDJU6nVtVyht7C6AlJWqSX6QS3+lPCw5BOCKbxakYNR
-/oBNauzyDISdbUwzHM2d+XGCjBsXKRA0Tft2NlG6EC83/PuY2J9MSA2gg3iPHsiN
-J5iipbdZNpZ3XL0l8/t/7T60nM7UZDqt3twLMA0eRFRlCnhMjvFE5Zgj5DE7BsJh
-w2nCoGWkAcfeuih+jfyEjN24NK+sE/bM+krwVv430ewJwm1bVUqKrbOb9aa6V9gP
-9RmlwZlOTFGcWBYl/cfRONn9qi9a6w==
-=Lvw+
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=tMzl
------END PGP PUBLIC KEY BLOCK-----
diff --git a/SOURCES/remove-test.patch b/SOURCES/remove-test.patch
new file mode 100644
index 0000000..ba43de9
--- /dev/null
+++ b/SOURCES/remove-test.patch
@@ -0,0 +1,20 @@
+diff --git a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
+index 253f78eb36ea..1199da3e4cfd 100644
+--- a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
++++ b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
+@@ -30,7 +30,6 @@ add_extra_unittest(ClangTidyTests
+   OptionsProviderTest.cpp
+   OverlappingReplacementsTest.cpp
+   UsingInserterTest.cpp
+-  ReadabilityModuleTest.cpp
+   TransformerClangTidyCheckTest.cpp
+   )
+ 
+@@ -54,7 +53,6 @@ target_link_libraries(ClangTidyTests
+   clangTidyGoogleModule
+   clangTidyLLVMModule
+   clangTidyObjCModule
+-  clangTidyReadabilityModule
+   clangTidyUtils
+   LLVMTestingSupport
+   )
diff --git a/SPECS/clang.spec b/SPECS/clang.spec
index f073e86..2820e6c 100644
--- a/SPECS/clang.spec
+++ b/SPECS/clang.spec
@@ -1,7 +1,7 @@
 %bcond_with compat_build
 %bcond_without check
 
-%global maj_ver 16
+%global maj_ver 14
 %global min_ver 0
 %global patch_ver 6
 #global rc_ver 4
@@ -33,7 +33,6 @@
 %endif
 
 %global clang_srcdir clang-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src
-%global cmake_srcdir cmake-%{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}
@@ -42,7 +41,7 @@
 
 Name:		%pkg_name
 Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -53,39 +52,28 @@ Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_
 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:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
-Source5:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
-Source6:	release-keys.asc
-%if %{without compat_build}
-Source7:	macros.%{name}
+Source4:	tstellar-gpg-key.asc
+%if !0%{?compat_build}
+Source5:	macros.%{name}
 %endif
 
 # Patches for clang
-Patch1:     0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch
+Patch0:     0001-PATCH-clang-Reorganize-gtest-integration.patch
+Patch1:     0002-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
-# Drop the following patch after debugedit adds support to DWARF-5:
-# https://sourceware.org/bugzilla/show_bug.cgi?id=28728
-Patch5:     0010-PATCH-clang-Produce-DWARF4-by-default.patch
-# Fix a test based on the triple used on RHEL-based systems.
-Patch6:     0001-PowerPC-clang-Fix-triple.patch
-# Make clangBasic and clangDriver depend on LLVMTargetParser
-# See https://reviews.llvm.org/D141581
-Patch7:     D141581.diff
-# clang/cmake: Use installed gtest libraries for stand-alone builds
-# See https://reviews.llvm.org/D138472
-Patch8:     D138472.diff
-
-Patch10:    fix-ieee128-cross.diff
-
-
-
-Patch100:     disable-recommonmark.patch
+Patch4:     0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
+# This patch can be dropped once gcc-12.0.1-0.5.fc36 is in the repo.
+Patch5:     0001-Work-around-gcc-miscompile.patch
+Patch7:     0010-PATCH-clang-Produce-DWARF4-by-default.patch
+Patch8:     disable-recommonmark.patch
 
 
 # Patches for clang-tools-extra
 %if %{without compat_build}
-Patch201:  0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
+Patch201:   clangd-tests.patch
+Patch202:   llvm-hello.patch
+Patch203:   remove-test.patch
 %endif
 
 BuildRequires:	gcc
@@ -177,8 +165,8 @@ libomp-devel to enable -fopenmp.
 %package libs
 Summary: Runtime library for clang
 Requires: %{name}-resource-filesystem%{?_isa} = %{version}
-# RHEL specific: Use libstdc++ from gcc13 by default. rhbz#2178804
-Requires: gcc-toolset-13-gcc-c++
+# RHEL specific: Use libstdc++ from gcc12 by default. rhbz#2064507
+Requires: gcc-toolset-12-gcc-c++
 Recommends: compiler-rt%{?_isa} = %{version}
 # libomp-devel is required, so clang can find the omp.h header when compiling
 # with -fopenmp.
@@ -258,25 +246,24 @@ Requires:      python3
 
 
 %prep
-%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE3}' --data='%{SOURCE0}'
-%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE5}' --data='%{SOURCE4}'
-
-%setup -T -q -b 4 -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
+%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}'
 
 %if %{with compat_build}
 %autosetup -n %{clang_srcdir} -p2
 %else
 
-%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE2}' --data='%{SOURCE1}'
+%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE1}'
 %setup -T -q -b 1 -n %{clang_tools_srcdir}
 %autopatch -m200 -p2
 
+
+# This test is broken upstream. It is a clang-tidy unittest
+# that includes a file from clang, breaking standalone builds.
+# https://github.com/llvm/llvm-project/issues/54116
+rm unittests/clang-tidy/ReadabilityModuleTest.cpp
+
 # failing test case
-rm test/clang-tidy/checkers/altera/struct-pack-align.cpp
+rm test/clang-tidy/checkers/altera-struct-pack-align.cpp
 
 %py3_shebang_fix \
 	clang-tidy/tool/run-clang-tidy.py \
@@ -340,9 +327,7 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
 
 # -DLLVM_ENABLE_NEW_PASS_MANAGER=ON can be removed once this patch is committed:
 # https://reviews.llvm.org/D107628
-# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF to match the default used by Fedora's GCC.
 %cmake .. -G Ninja \
-	-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -395,7 +380,7 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
 	-DCLANG_DEFAULT_LINKER=lld \
 %endif
 	-DCLANG_DEFAULT_UNWINDLIB=libgcc \
-	-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-13/root/usr
+	-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-12/root/usr
 
 %cmake_build
 
@@ -419,7 +404,7 @@ rm -Rf %{buildroot}%{install_prefix}/lib/{libear,libscanbuild}
 # File in the macros file for other packages to use.  We are not doing this
 # in the compat package, because the version macros would # conflict with
 # eachother if both clang and the clang compat package were installed together.
-install -p -m0644 -D %{SOURCE7} %{buildroot}%{_rpmmacrodir}/macros.%{name}
+install -p -m0644 -D %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.%{name}
 sed -i -e "s|@@CLANG_MAJOR_VERSION@@|%{maj_ver}|" \
        -e "s|@@CLANG_MINOR_VERSION@@|%{min_ver}|" \
        -e "s|@@CLANG_PATCH_VERSION@@|%{patch_ver}|" \
@@ -431,7 +416,7 @@ 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
@@ -470,11 +455,20 @@ 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/%{maj_ver}/{include,lib,share}/
+mkdir -p %{buildroot}%{pkg_libdir}/clang/%{version}/{include,lib,share}/
 
 
 # Remove clang-tidy headers.  We don't ship the libraries for these.
@@ -488,15 +482,9 @@ ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format
 %check
 %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.
-pushd %{_vpath_builddir}
-%cmake_build --target clang-test-depends \
-    ExtraToolsUnitTests ClangdUnitTests ClangIncludeCleanerUnitTests ClangPseudoUnitTests
-popd
 # requires lit.py from LLVM utilities
 # FIXME: Fix failing ARM tests
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir} || \
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} check-all -C %{_vpath_builddir} || \
 %ifarch %{arm}
 :
 %else
@@ -523,11 +511,11 @@ false
 
 %files libs
 %if %{without compat_build}
-%{_libdir}/clang/%{maj_ver}/include/*
+%{_libdir}/clang/
 %{_libdir}/*.so.*
 %else
 %{pkg_libdir}/*.so.*
-%{pkg_libdir}/clang/%{maj_ver}/include/*
+%{pkg_libdir}/clang/%{version}
 %endif
 
 %files devel
@@ -546,11 +534,13 @@ false
 %endif
 
 %files resource-filesystem
-%dir %{pkg_libdir}/clang/
-%dir %{pkg_libdir}/clang/%{maj_ver}/
-%dir %{pkg_libdir}/clang/%{maj_ver}/include/
-%dir %{pkg_libdir}/clang/%{maj_ver}/lib/
-%dir %{pkg_libdir}/clang/%{maj_ver}/share/
+%dir %{pkg_libdir}/clang/%{version}/
+%dir %{pkg_libdir}/clang/%{version}/include/
+%dir %{pkg_libdir}/clang/%{version}/lib/
+%dir %{pkg_libdir}/clang/%{version}/share/
+%if %{without compat_build}
+%{pkg_libdir}/clang/%{maj_ver}
+%endif
 
 %if %{without compat_build}
 %files analyzer
@@ -573,20 +563,18 @@ false
 
 
 %files tools-extra
-%{_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-offload-wrapper
 %{_bindir}/clang-linker-wrapper
-%{_bindir}/clang-pseudo
+%{_bindir}/clang-nvlink-wrapper
 %{_bindir}/clang-query
 %{_bindir}/clang-refactor
 %{_bindir}/clang-rename
@@ -597,7 +585,6 @@ false
 %{_bindir}/clangd
 %{_bindir}/diagtool
 %{_bindir}/hmaptool
-%{_bindir}/nvptx-arch
 %{_bindir}/pp-trace
 %{_bindir}/c-index-test
 %{_bindir}/find-all-symbols
@@ -624,24 +611,6 @@ false
 
 %endif
 %changelog
-* 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