.clang.metadata

@@ -1,4 +1,3 @@
-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
+7b4d1188cce1ce4ea1cf2ea362fba685c4aca34d SOURCES/clang-15.0.7.src.tar.xz
+752fe847136eff2dfbfcc8bbddfaa9319532d104 SOURCES/clang-tools-extra-15.0.7.src.tar.xz
+347bdd5ee6d6b93c9644c268511815912c0fb2dc SOURCES/release-keys.asc

.gitignore

@@ -1,4 +1,3 @@
-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/clang-15.0.7.src.tar.xz
+SOURCES/clang-tools-extra-15.0.7.src.tar.xz
+SOURCES/release-keys.asc

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

@@ -1,27 +0,0 @@
-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

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

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

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

@@ -1,30 +0,0 @@
-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

@@ -1,6 +1,6 @@
-From 22d62b32cd3be5fb0ae10723b35a781e0f862b71 Mon Sep 17 00:00:00 2001
+From 581300e447602b9b7a505b0f07e8461d58d041ca Mon Sep 17 00:00:00 2001
 From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 24 Jan 2023 22:46:25 +0000
+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
@@ -55,19 +55,16 @@ index c66a94f458cf..b4e7a5d691e5 100644
  // 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
+index 9b99bfd93440..3fca9f25fb48 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))
+@@ -59,3 +59,6 @@ config.substitutions.append(
+ # Plugins (loadable modules)
  if config.has_plugins and config.llvm_plugin_ext:
-     config.available_features.add("plugins")
- 
+     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
@@ -81,5 +78,5 @@ index 4eb830a1baf1..6e5559348454 100644
  # 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
+2.27.0
 

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
+

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
+

SOURCES/0009-disable-recommonmark.patch

@@ -1,26 +0,0 @@
-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/0010-PATCH-clang-Produce-DWARF4-by-default.patch

@@ -1,4 +1,4 @@
-From adbe188f3b1e3a0dd5ec80d9409601ba7f5b0423 Mon Sep 17 00:00:00 2001
+From 1f68d73910ddee1beaf3582480b8a9738c941a43 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
@@ -7,32 +7,29 @@ Have a look at the following commit to see when the move from DWARF 4 to 5 first
 
 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(-)
+ clang/include/clang/Driver/ToolChain.h | 2 +-
+ clang/test/CodeGen/dwarf-version.c     | 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 +-
+ 6 files changed, 7 insertions(+), 7 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 {
- }
+diff --git a/clang/include/clang/Driver/ToolChain.h b/clang/include/clang/Driver/ToolChain.h
+index f20ab164531b..53c86ee82936 100644
+--- a/clang/include/clang/Driver/ToolChain.h
++++ b/clang/include/clang/Driver/ToolChain.h
+@@ -535,7 +535,7 @@ public:
+   
+   // Return the DWARF version to emit, in the absence of arguments
+   // to the contrary.
+-  virtual unsigned GetDefaultDwarfVersion() const { return 5; }
++  virtual unsigned GetDefaultDwarfVersion() const { return 4; }
  
- 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 {
+   // Some toolchains may have different restrictions on the DWARF version and
+   // may need to adjust it. E.g. NVPTX may need to enforce DWARF2 even when host
 diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c
-index d307eb3f101f..e7e93bf6688c 100644
+index 0a6fa4768026..96f01749d0d8 100644
 --- a/clang/test/CodeGen/dwarf-version.c
 +++ b/clang/test/CodeGen/dwarf-version.c
 @@ -2,8 +2,8 @@
@@ -46,43 +43,21 @@ index d307eb3f101f..e7e93bf6688c 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 6d929b19e7e2..373905c2e0fc 100644
+index a2e350a0a835..01889ba0bf9b 100644
 --- a/clang/test/Driver/cl-options.c
 +++ b/clang/test/Driver/cl-options.c
-@@ -569,7 +569,7 @@
+@@ -570,7 +570,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"
+ // 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/clang-g-opts.c b/clang/test/Driver/clang-g-opts.c
-index 5ee0fe64fe48..985158746137 100644
+index d982b1070cae..bb129e75769c 100644
 --- a/clang/test/Driver/clang-g-opts.c
 +++ b/clang/test/Driver/clang-g-opts.c
 @@ -32,7 +32,7 @@
@@ -121,5 +96,5 @@ index 5a33d5eceb61..cedf895b36dc 100644
  ///-----------------------------------------------------------------------------
  /// Checking include-path
 -- 
-2.41.0
+2.37.1
 

SOURCES/disable-recommonmark.patch

@@ -0,0 +1,26 @@
+diff -ruN clang-14.0.0.src.orig/docs/conf.py clang-14.0.0.src/docs/conf.py
+--- a/clang-14.0.0.src.orig/docs/conf.py	2022-03-14 10:44:55.000000000 +0100
++++ b/clang-14.0.0.src/docs/conf.py	2022-04-11 11:13:44.483641113 +0200
+@@ -37,20 +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,4 +8,9 @@
 # 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 %{_prefix}/lib/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.
+# This macro only changes when clang's major version changes.
+%clang_resource_dir_readonly %{_libdir}/clang/%{clang_major_version}

SOURCES/release-keys.asc

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

SPECS/clang.spec

@@ -1,28 +1,10 @@
-%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 17
+%global maj_ver 15
 %global min_ver 0
-%global patch_ver 6
+%global patch_ver 7
 #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}
 
 %if %{with compat_build}
@@ -33,16 +15,18 @@
 %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 install_datadir %{_datadir}
-%global install_libdir %{_libdir}
+%global pkg_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
@@ -51,19 +35,17 @@
 %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
+
 Name:		%pkg_name
-Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
+Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}
 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}
@@ -71,50 +53,42 @@ Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_
 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:	release-keys.asc
-%endif
-%if %{without compat_build}
+%if !0%{?compat_build}
 Source5:	macros.%{name}
 %endif
 
 # Patches for clang
-Patch1:     0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.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
-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
+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
 
-# RHEL specific patches
-# Avoid unwanted dependency on python-recommonmark
-Patch101:  0009-disable-recommonmark.patch
 
-%if %{without compat_build}
 # Patches for clang-tools-extra
-# See https://reviews.llvm.org/D120301
-Patch201:   0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
+%if %{without compat_build}
+Patch201:  0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
 %endif
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
 BuildRequires:	ninja-build
-
 %if %{with compat_build}
-%global llvm_pkg_name llvm%{maj_ver}
+BuildRequires:	llvm%{maj_ver}-devel = %{version}
+BuildRequires:	llvm%{maj_ver}-static = %{version}
 %else
-%global llvm_pkg_name llvm
-BuildRequires:  llvm-test = %{version}
-BuildRequires:  llvm-googletest = %{version}
-%endif
-
-BuildRequires:	%{llvm_pkg_name}-devel = %{version}
+BuildRequires:	llvm-devel = %{version}
+BuildRequires:	llvm-test = %{version}
 # llvm-static is required, because clang-tablegen needs libLLVMTableGen, which
 # is not included in libLLVM.so.
-BuildRequires:	%{llvm_pkg_name}-static = %{version}
-BuildRequires:	%{llvm_pkg_name}-cmake-utils = %{version}
+BuildRequires:	llvm-static = %{version}
+BuildRequires:	llvm-googletest = %{version}
+%endif
 
 BuildRequires:	libxml2-devel
 BuildRequires:	perl-generators
@@ -188,25 +162,30 @@ libomp-devel to enable -fopenmp.
 
 %package libs
 Summary: Runtime library for clang
-Requires: %{name}-resource-filesystem = %{version}
-# RHEL specific: Use libstdc++ from gcc13 by default. rhbz#2178804
-Requires: gcc-toolset-13-gcc-c++
+Requires: %{name}-resource-filesystem%{?_isa} = %{version}
+# 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.
 Recommends: libomp-devel%{_isa} = %{version}
 Recommends: libomp%{_isa} = %{version}
 
+# Use lld as the default linker on ARM due to rhbz#1918924
+%ifarch %{arm}
+Requires: lld
+%endif
+
 %description libs
 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
@@ -215,10 +194,9 @@ 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: lib/clang/$version/
+This package owns the clang resouce directory: $libdir/clang/$version/
 
 %if %{without compat_build}
 %package analyzer
@@ -241,13 +219,6 @@ 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.
@@ -263,7 +234,7 @@ clang-format integration for git.
 
 %package -n python3-clang
 Summary:       Python3 bindings for clang
-Requires:      %{name}-devel%{?_isa} = %{version}-%{release}
+Requires:      %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:      python3
 %description -n python3-clang
 %{summary}.
@@ -273,18 +244,13 @@ 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
 
@@ -292,12 +258,13 @@ Requires:      python3
 rm test/clang-tidy/checkers/altera/struct-pack-align.cpp
 
 %py3_shebang_fix \
-	clang-tidy/tool/ \
+	clang-tidy/tool/run-clang-tidy.py \
+	clang-tidy/tool/clang-tidy-diff.py \
 	clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 
 
 %setup -q -n %{clang_srcdir}
-%autopatch -M%{?!rhel:100}%{?rhel:200} -p2
+%autopatch -M200 -p2
 
 # failing test case
 rm test/CodeGen/profile-filter.c
@@ -319,72 +286,66 @@ find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pa
 %endif
 
 %build
-
-%undefine __cmake_in_source_build
-
-# And disable LTO on AArch64 entirely.
-%ifarch aarch64
+# We run the builders out of memory on armv7 and i686 when LTO is enabled
+%ifarch %{arm} i686
 %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
 
-# Disable LTO to speed up builds
-%if %{with snapshot_build}
-%global _lto_cflags %nil
+# 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
 %endif
 
-%ifarch s390 s390x aarch64 %ix86 ppc64le
+mkdir -p %{_vpath_builddir}
+cd %{_vpath_builddir}
+
+%ifarch s390 s390x %{arm} %ix86 ppc64le aarch64
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
-# 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 \
+# -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 \
-%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_SKIP_RPATH:BOOL=ON \
-%ifarch s390 s390x %ix86 ppc64le aarch64
+%ifarch s390 s390x %{arm} %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=%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} \
 	-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_BUILD_UTILS:BOOL=ON \
-	-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../%{clang_tools_srcdir} \
+	-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}
@@ -392,7 +353,6 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
 %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 \
@@ -401,22 +361,28 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
 	-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 \
 	-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
+%ifarch %{arm}
+	-DCLANG_DEFAULT_LINKER=lld \
+%endif
+	-DCLANG_DEFAULT_UNWINDLIB=libgcc \
+	-DGCC_INSTALL_PREFIX=/opt/rh/gcc-toolset-12/root/usr
 
 %cmake_build
 
 %install
 
+pushd %{_vpath_builddir}
 %cmake_install
+popd
 
 %if %{with compat_build}
 
@@ -444,7 +410,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
@@ -483,13 +449,25 @@ 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}%{install_prefix}/lib/clang/%{maj_ver}/{bin,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.
+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
@@ -498,12 +476,14 @@ 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.
-%cmake_build --target clang-test-depends \
-    ExtraToolsUnitTests ClangdUnitTests ClangIncludeCleanerUnitTests ClangPseudoUnitTests
 # requires lit.py from LLVM utilities
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir}
+# FIXME: Fix failing ARM tests
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir} || \
+%ifarch %{arm}
+:
+%else
+false
+%endif
 %endif
 %endif
 
@@ -524,8 +504,13 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %
 %endif
 
 %files libs
-%{install_prefix}/lib/clang/%{maj_ver}/include/*
-%{install_libdir}/*.so.*
+%if %{without compat_build}
+%{_libdir}/clang/
+%{_libdir}/*.so.*
+%else
+%{pkg_libdir}/*.so.*
+%{pkg_libdir}/clang/%{version}
+%endif
 
 %files devel
 %if %{without compat_build}
@@ -533,26 +518,25 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %
 %{_includedir}/clang/
 %{_includedir}/clang-c/
 %{_libdir}/cmake/*
-%{_bindir}/clang-tblgen
 %dir %{_datadir}/clang/
+%{_rpmmacrodir}/macros.%{name}
 %else
-%{install_libdir}/*.so
+%{pkg_libdir}/*.so
 %{pkg_includedir}/clang/
 %{pkg_includedir}/clang-c/
-%{install_libdir}/cmake/
+%{pkg_libdir}/cmake/
 %endif
 
 %files resource-filesystem
-%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/
+%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}
-%{_rpmmacrodir}/macros.%{name}
-
+%{pkg_libdir}/clang/%{maj_ver}
+%endif
 
+%if %{without compat_build}
 %files analyzer
 %{_bindir}/scan-view
 %{_bindir}/scan-build
@@ -573,19 +557,19 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %
 
 
 %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-nvlink-wrapper
 %{_bindir}/clang-pseudo
 %{_bindir}/clang-query
 %{_bindir}/clang-refactor
@@ -597,7 +581,6 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %
 %{_bindir}/clangd
 %{_bindir}/diagtool
 %{_bindir}/hmaptool
-%{_bindir}/nvptx-arch
 %{_bindir}/pp-trace
 %{_bindir}/c-index-test
 %{_bindir}/find-all-symbols
@@ -615,9 +598,6 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %
 %{_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
 
@@ -627,24 +607,6 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %
 
 %endif
 %changelog
-* 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