.clang.metadata

@@ -1,4 +1,10 @@
-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
+64ee5468b8102d32c9c44c16444775383f57dadc SOURCES/clang-15.0.7.src.tar.xz.sig
+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
+8f06060871953422820098346da9a3b63b90120d SOURCES/cmake-15.0.7.src.tar.xz
+1a0f4b832f2aaa9d44c17ff95b7a42bd619292eb SOURCES/cmake-15.0.7.src.tar.xz.sig
+497ca3b2010cc0e3e38bc9dc6dda19041dbd7066 SOURCES/llvm-15.0.7.src.tar.xz
+57d379fd0bc72d98382d465436f15473ec9b02ee SOURCES/llvm-15.0.7.src.tar.xz.sig

.gitignore

@@ -1,4 +1,10 @@
-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-15.0.7.src.tar.xz.sig
+SOURCES/clang-16.0.1.src.tar.xz
+SOURCES/clang-16.0.1.src.tar.xz.sig
+SOURCES/clang-tools-extra-16.0.1.src.tar.xz
+SOURCES/clang-tools-extra-16.0.1.src.tar.xz.sig
+SOURCES/cmake-15.0.7.src.tar.xz
+SOURCES/cmake-15.0.7.src.tar.xz.sig
+SOURCES/llvm-15.0.7.src.tar.xz
+SOURCES/llvm-15.0.7.src.tar.xz.sig

SOURCES/0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch

@@ -0,0 +1,30 @@
+From 2a0175c88ccd8c162901ac0ade56859d2b599f38 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Mon, 17 Apr 2023 16:19:04 +0200
+Subject: [PATCH] Change LLVM_COMMON_CMAKE_UTILS usage
+
+Let LLVM_COMMON_CMAKE_UTILS store the directory where cmake modules are
+available and stop assuming its directory structure.
+---
+ clang/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
+index 1fff005d6525..f4b3ef4bd15a 100644
+--- a/clang/CMakeLists.txt
++++ b/clang/CMakeLists.txt
+@@ -1,9 +1,9 @@
+ cmake_minimum_required(VERSION 3.13.4)
+ 
+ if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
+-  set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
++  set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules)
+ endif()
+-include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
++include(${LLVM_COMMON_CMAKE_UTILS}/CMakePolicy.cmake
+   NO_POLICY_SCOPE)
+ 
+ # If we are not building as a part of LLVM, build Clang as an
+-- 
+2.39.2
+

SOURCES/0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch

@@ -0,0 +1,41 @@
+From 73d3b4047d757ef35850e2cef38285b96be82f0f Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Tue, 23 May 2023 12:17:29 +0200
+Subject: [PATCH] [Driver] Give devtoolset path precedence over InstalledDir
+
+This is a followup to the change from c5fe10f365247c3dd9416b7ec8bad73a60b5946e.
+While that commit correctly adds the bindir from devtoolset to the
+path, the driver dir / install dir still comes first. This means
+we'll still end up picking /usr/bin/ld rather than the one from
+devtoolset.
+
+Unfortunately, I don't see any way to test this. In the environment
+the tests are run, this would only result in a behavior difference
+if there is an ld binary present in the LLVM build directory, which
+isn't the case.
+
+Differential Revision: https://reviews.llvm.org/D151203
+---
+ clang/lib/Driver/ToolChains/Linux.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
+index 853ff99d9fe5..aecabb46d4b9 100644
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -244,9 +244,9 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+     // With devtoolset on RHEL, we want to add a bin directory that is relative
+     // to the detected gcc install, because if we are using devtoolset gcc then
+     // we want to use other tools from devtoolset (e.g. ld) instead of the
+-    // standard system tools.
+-    PPaths.push_back(Twine(GCCInstallation.getParentLibPath() +
+-                     "/../bin").str());
++    // standard system tools. This should take precedence over InstalledDir.
++    PPaths.insert(PPaths.begin(),
++                  Twine(GCCInstallation.getParentLibPath() + "/../bin").str());
+ 
+   if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb)
+     ExtraOpts.push_back("-X");
+-- 
+2.40.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,19 @@ 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,6 +59,9 @@ 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 +81,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/0002-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch

@@ -1,8 +1,7 @@
-From d68a5a7817dc0d43853d8b84c9185dc24338664f Mon Sep 17 00:00:00 2001
+From ccf3e4407e7a5c4c1f2e41c89aad9f86a9c7d81d Mon Sep 17 00:00:00 2001
 From: Tom Stellard <tstellar@redhat.com>
 Date: Wed, 6 Oct 2021 05:32:44 +0000
-Subject: [PATCH] Driver: Add a gcc equivalent triple to the list of triples to
- search
+Subject: Driver: Add a gcc equivalent triple to the list of triples to search
 
 There are some gcc triples, like x86_64-redhat-linux, that provide the
 same behavior as a clang triple with a similar name (e.g.
@@ -15,10 +14,10 @@ Differential Revision: https://reviews.llvm.org/D111207
  1 file changed, 22 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index fe5bda5c6605..fd4a7f72be14 100644
+index f203cae1d329..12fa2da3187e 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -1884,6 +1884,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args,
+@@ -1969,6 +1969,18 @@ static llvm::StringRef getGCCToolchainDir(const ArgList &Args,
    return GCC_INSTALL_PREFIX;
  }
  
@@ -37,7 +36,7 @@ index fe5bda5c6605..fd4a7f72be14 100644
  /// Initialize a GCCInstallationDetector from the driver.
  ///
  /// This performs all of the autodetection and sets up the various paths.
-@@ -1904,6 +1916,16 @@ void Generic_GCC::GCCInstallationDetector::init(
+@@ -1989,6 +2001,16 @@ void Generic_GCC::GCCInstallationDetector::init(
    // The compatible GCC triples for this particular architecture.
    SmallVector<StringRef, 16> CandidateTripleAliases;
    SmallVector<StringRef, 16> CandidateBiarchTripleAliases;
@@ -55,5 +54,5 @@ index fe5bda5c6605..fd4a7f72be14 100644
                             CandidateTripleAliases, CandidateBiarchLibDirs,
                             CandidateBiarchTripleAliases);
 -- 
-2.26.2
+2.37.1
 

SOURCES/0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch

@@ -1,20 +1,21 @@
-From 49f827b09db549de62dcaf8b90b3fcb3e08c0ee5 Mon Sep 17 00:00:00 2001
-From: Serge Guelton <sguelton@redhat.com>
-Date: Mon, 6 Mar 2023 12:37:48 +0100
+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 | 4 ++++
- 1 file changed, 4 insertions(+)
+ 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 24fbdcffc07b..8fed46b49515 100644
+index c8006f3d8412..6ed03adb7702 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:
+@@ -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:

SOURCES/0006-Don-t-install-static-libraries.patch

@@ -1,17 +1,17 @@
-From 88704fc2eabb9dd19a9c3eb81a9b3dc37d95651c Mon Sep 17 00:00:00 2001
+From 6e0c48576740a1da9abeecfb8070127b8e91ab73 Mon Sep 17 00:00:00 2001
 From: Tom Stellard <tstellar@redhat.com>
 Date: Fri, 31 Jan 2020 11:04:57 -0800
-Subject: [PATCH][clang] Don't install static libraries
+Subject: Don't install static libraries
 
 ---
  clang/cmake/modules/AddClang.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
-index 5752f4277444..0f52822d91f0 100644
+index 21ac332e4f5f..d0cf20cced21 100644
 --- a/clang/cmake/modules/AddClang.cmake
 +++ b/clang/cmake/modules/AddClang.cmake
-@@ -113,7 +113,7 @@ macro(add_clang_library name)
+@@ -114,7 +114,7 @@ macro(add_clang_library name)
      if(TARGET ${lib})
        target_link_libraries(${lib} INTERFACE ${LLVM_COMMON_LIBS})
  
@@ -21,5 +21,5 @@ index 5752f4277444..0f52822d91f0 100644
          install(TARGETS ${lib}
            COMPONENT ${lib}
 -- 
-2.30.2
+2.37.1
 

SOURCES/0009-disable-recommonmark.patch

@@ -1,26 +1,38 @@
-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",
+From f4e2d711e5cfd8e357d770e2da7a114086ee8659 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder@redhat.com>
+Date: Thu, 22 Sep 2022 10:49:43 +0200
+Subject: disable recommonmark
+
+---
+ clang/docs/conf.py | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/clang/docs/conf.py b/clang/docs/conf.py
+index b8a42018191a..912449a7f792 100644
+--- a/clang/docs/conf.py
++++ b/clang/docs/conf.py
+@@ -37,20 +37,7 @@ source_suffix = {
+     '.rst': 'restructuredtext',
  }
  
 -try:
 -  import recommonmark
 -except ImportError:
 -  # manpages do not use any .md sources
--    if not tags.has("builder-man"):
+-  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")
+-    extensions.append('recommonmark')
 -  else:
--        source_parsers = {".md": "recommonmark.parser.CommonMarkParser"}
--    source_suffix[".md"] = "markdown"
+-    source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
+-  source_suffix['.md'] = 'markdown'
 +import sphinx
  
  # The encoding of source files.
- # source_encoding = 'utf-8-sig'
+ #source_encoding = 'utf-8-sig'
+-- 
+2.37.1
+

SOURCES/0010-PATCH-clang-Produce-DWARF4-by-default.patch

@@ -1,38 +1,36 @@
-From adbe188f3b1e3a0dd5ec80d9409601ba7f5b0423 Mon Sep 17 00:00:00 2001
+From 4ea62faaaac1aad0fe496cabe9674c809c91c49a Mon Sep 17 00:00:00 2001
 From: Konrad Kleine <kkleine@redhat.com>
-Date: Thu, 24 Mar 2022 09:44:21 +0100
+Date: Mon, 13 Feb 2023 17:11:00 -0300
 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/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(+), 11 deletions(-)
+ 7 files changed, 9 insertions(+), 9 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 f75f35dc9e65..a70ae2b17833 100644
+--- a/clang/include/clang/Driver/ToolChain.h
++++ b/clang/include/clang/Driver/ToolChain.h
+@@ -547,7 +547,7 @@ public:
  
- 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;
- }
+   // 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; }
  
- 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 @@
@@ -69,10 +67,10 @@ index 73d002c7ef7e..71d55f7fd537 100644
  // 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 1d588bdfc1b0..1ad57aedc3a4 100644
 --- a/clang/test/Driver/cl-options.c
 +++ b/clang/test/Driver/cl-options.c
-@@ -569,7 +569,7 @@
+@@ -575,7 +575,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"
@@ -82,7 +80,7 @@ index 6d929b19e7e2..373905c2e0fc 100644
  // 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
+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 +119,5 @@ index 5a33d5eceb61..cedf895b36dc 100644
  ///-----------------------------------------------------------------------------
  /// Checking include-path
 -- 
-2.41.0
+2.39.1
 

SOURCES/D138472.diff

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

SOURCES/D141581.diff

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

SOURCES/fix-ieee128-cross.diff

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

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