.clang.metadata

@@ -1,4 +1,4 @@
-76a25621ce7ee6db8a63fc553dd351cf549b87bf clang-18.1.2.src.tar.xz
-3007d760f7871108f177efd638db211a38e8e8ee clang-18.1.2.src.tar.xz.sig
-710ff8628728b66eef763d735621ebb7dfdc963f clang-tools-extra-18.1.2.src.tar.xz
-a903398f4fd00774ffcab92ac8e7f9ccf99a4d44 clang-tools-extra-18.1.2.src.tar.xz.sig
+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

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,24 +1,4 @@
-SOURCES/clang-15.0.7.src.tar.xz
-SOURCES/clang-tools-extra-15.0.7.src.tar.xz
-/clang-15.0.7.src.tar.xz
-/clang-tools-extra-15.0.7.src.tar.xz
-/clang-16.0.0.src.tar.xz
-/clang-tools-extra-16.0.0.src.tar.xz
-/cmake-16.0.0.src.tar.xz
-/clang-16.0.0.src.tar.xz.sig
-/clang-tools-extra-16.0.0.src.tar.xz.sig
-/cmake-16.0.0.src.tar.xz.sig
-/clang-16.0.6.src.tar.xz
-/clang-tools-extra-16.0.6.src.tar.xz
-/clang-tools-extra-16.0.6.src.tar.xz.sig
-/clang-16.0.6.src.tar.xz.sig
-/cmake-16.0.6.src.tar.xz
-/cmake-16.0.6.src.tar.xz.sig
-/clang-17.0.2.src.tar.xz
-/clang-17.0.2.src.tar.xz.sig
-/clang-tools-extra-17.0.2.src.tar.xz
-/clang-tools-extra-17.0.2.src.tar.xz.sig
-/clang-17.0.6.src.tar.xz
-/clang-17.0.6.src.tar.xz.sig
-/clang-tools-extra-17.0.6.src.tar.xz
-/clang-tools-extra-17.0.6.src.tar.xz.sig
+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

0001-Restore-fopenmp-implicit-rpath-disabled-by-default.patch

@@ -1,92 +0,0 @@
-From ba9cfbe8e1d034d823dabf1c76d270fce8085f1b Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Thu, 9 Mar 2023 21:52:41 -0800
-Subject: [PATCH] Restore -fopenmp-implicit-rpath, disabled by default
-
-Used by redhat-rpm-config on older Fedora versions.
----
- clang/include/clang/Driver/Options.td      |  6 ++++++
- clang/lib/Driver/ToolChains/CommonArgs.cpp | 19 +++++++++++++++++++
- clang/lib/Driver/ToolChains/CommonArgs.h   |  3 +++
- clang/test/OpenMP/Inputs/libomp.a          |  1 +
- 4 files changed, 29 insertions(+)
- create mode 100644 clang/test/OpenMP/Inputs/libomp.a
-
-diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
-index 31ecf98b806b..46aa49e1d0d1 100644
---- a/clang/include/clang/Driver/Options.td
-+++ b/clang/include/clang/Driver/Options.td
-@@ -5194,6 +5194,12 @@ def offload_add_rpath: Flag<["--"], "offload-add-rpath">,
- def no_offload_add_rpath: Flag<["--"], "no-offload-add-rpath">,
-   Flags<[NoArgumentUnused]>,
-   Alias<frtlib_add_rpath>;
-+defm openmp_implicit_rpath: BoolFOption<"openmp-implicit-rpath",
-+  LangOpts<"OpenMP">,
-+  DefaultFalse,
-+  PosFlag<SetTrue, [], [ClangOption], "Set rpath on OpenMP executables">,
-+  NegFlag<SetFalse>,
-+  BothFlags<[NoArgumentUnused]>>;
- def r : Flag<["-"], "r">, Flags<[LinkerInput, NoArgumentUnused]>,
-         Group<Link_Group>;
- def regcall4 : Flag<["-"], "regcall4">, Group<m_Group>,
-diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-index 483ecd0ae592..55c673460a2f 100644
---- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
-+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-@@ -889,6 +889,22 @@ static void addOpenMPDeviceLibC(const ToolChain &TC, const ArgList &Args,
-   }
- }
- 
-+void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
-+                                          const ArgList &Args,
-+                                          ArgStringList &CmdArgs) {
-+
-+  if (Args.hasFlag(options::OPT_fopenmp_implicit_rpath,
-+                   options::OPT_fno_openmp_implicit_rpath, false)) {
-+    // Default to clang lib / lib64 folder, i.e. the same location as device
-+    // runtime
-+    SmallString<256> DefaultLibPath =
-+        llvm::sys::path::parent_path(TC.getDriver().Dir);
-+    llvm::sys::path::append(DefaultLibPath, CLANG_INSTALL_LIBDIR_BASENAME);
-+    CmdArgs.push_back("-rpath");
-+    CmdArgs.push_back(Args.MakeArgString(DefaultLibPath));
-+  }
-+}
-+
- void tools::addOpenMPRuntimeLibraryPath(const ToolChain &TC,
-                                         const ArgList &Args,
-                                         ArgStringList &CmdArgs) {
-@@ -963,6 +979,9 @@ bool tools::addOpenMPRuntime(ArgStringList &CmdArgs, const ToolChain &TC,
-     addOpenMPDeviceLibC(TC, Args, CmdArgs);
- 
-   addArchSpecificRPath(TC, Args, CmdArgs);
-+
-+  if (RTKind == Driver::OMPRT_OMP)
-+    addOpenMPRuntimeSpecificRPath(TC, Args, CmdArgs);
-   addOpenMPRuntimeLibraryPath(TC, Args, CmdArgs);
- 
-   return true;
-diff --git a/clang/lib/Driver/ToolChains/CommonArgs.h b/clang/lib/Driver/ToolChains/CommonArgs.h
-index 096152bfbdcf..7e8bf6b8830c 100644
---- a/clang/lib/Driver/ToolChains/CommonArgs.h
-+++ b/clang/lib/Driver/ToolChains/CommonArgs.h
-@@ -117,6 +117,9 @@ void AddAssemblerKPIC(const ToolChain &ToolChain,
-                       const llvm::opt::ArgList &Args,
-                       llvm::opt::ArgStringList &CmdArgs);
- 
-+void addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
-+                                   const llvm::opt::ArgList &Args,
-+                                   llvm::opt::ArgStringList &CmdArgs);
- void addArchSpecificRPath(const ToolChain &TC, const llvm::opt::ArgList &Args,
-                           llvm::opt::ArgStringList &CmdArgs);
- void addOpenMPRuntimeLibraryPath(const ToolChain &TC,
-diff --git a/clang/test/OpenMP/Inputs/libomp.a b/clang/test/OpenMP/Inputs/libomp.a
-new file mode 100644
-index 000000000000..8b277f0dd5dc
---- /dev/null
-+++ b/clang/test/OpenMP/Inputs/libomp.a
-@@ -0,0 +1 @@
-+!<arch>
--- 
-2.41.0
-

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

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

0009-disable-myst-parser.patch

@@ -1,26 +0,0 @@
-From 988dd3f3363d8ab4ee53f61e0eb5afc6646c9d4f Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npopov@redhat.com>
-Date: Tue, 26 Sep 2023 13:06:29 +0200
-Subject: [PATCH] disable myst parser
-
----
- clang/docs/conf.py | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/clang/docs/conf.py b/clang/docs/conf.py
-index ca310026f53e..dfb74273b5b2 100644
---- a/clang/docs/conf.py
-+++ b/clang/docs/conf.py
-@@ -35,9 +35,6 @@ templates_path = ["_templates"]
- 
- import sphinx
- 
--if sphinx.version_info >= (3, 0):
--    extensions.append("myst_parser")
--
- # The encoding of source files.
- # source_encoding = 'utf-8-sig'
- 
--- 
-2.41.0
-

D138472.diff

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

D141581.diff

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

SOURCES/0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch

@@ -0,0 +1,59 @@
+From d68a5a7817dc0d43853d8b84c9185dc24338664f 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
+
+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.
+x86_64-redhat-linux-gnu).  When searching for a gcc install, also search
+for a gcc equivalent triple if one exists.
+
+Differential Revision: https://reviews.llvm.org/D111207
+---
+ clang/lib/Driver/ToolChains/Gnu.cpp | 22 ++++++++++++++++++++++
+ 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
+--- 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,
+   return GCC_INSTALL_PREFIX;
+ }
+ 
++/// This function takes a 'clang' triple and converts it to an equivalent gcc
++/// triple.
++static const char *ConvertToGccTriple(StringRef CandidateTriple) {
++  return llvm::StringSwitch<const char *>(CandidateTriple)
++      .Case("aarch64-redhat-linux-gnu", "aarch64-redhat-linux")
++      .Case("i686-redhat-linux-gnu", "i686-redhat-linux")
++      .Case("ppc64le-redhat-linux-gnu", "ppc64le-redhat-linux")
++      .Case("s390x-redhat-linux-gnu", "s390x-redhat-linux")
++      .Case("x86_64-redhat-linux-gnu", "x86_64-redhat-linux")
++      .Default(NULL);
++}
++
+ /// 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(
+   // The compatible GCC triples for this particular architecture.
+   SmallVector<StringRef, 16> CandidateTripleAliases;
+   SmallVector<StringRef, 16> CandidateBiarchTripleAliases;
++
++  // In some cases gcc uses a slightly different triple than clang for the
++  // same target.  Convert the clang triple to the gcc equivalent and use that
++  // to search for the gcc install.
++  const char *ConvertedTriple = ConvertToGccTriple(TargetTriple.str());
++  if (ConvertedTriple) {
++    CandidateTripleAliases.push_back(ConvertedTriple);
++    CandidateBiarchTripleAliases.push_back(ConvertedTriple);
++  }
++
+   CollectLibDirsAndTriples(TargetTriple, BiarchVariantTriple, CandidateLibDirs,
+                            CandidateTripleAliases, CandidateBiarchLibDirs,
+                            CandidateBiarchTripleAliases);
+-- 
+2.26.2
+

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

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

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

@@ -4,6 +4,7 @@ Date: Tue, 24 Jan 2023 22:46:25 +0000
 Subject: [PATCH] clang-tools-extra: Make test dependency on LLVMHello optional
 
 This fixes clang + clang-tools-extra standalone build after
+36892727e4f19a60778e371d78f8fb09d8122c85.
 ---
  clang-tools-extra/test/CMakeLists.txt                  | 10 +++++++++-
  clang-tools-extra/test/clang-tidy/CTTestTidyModule.cpp |  2 +-

SOURCES/0009-disable-recommonmark.patch

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

SPECS/clang.spec

@@ -11,23 +11,9 @@
 %bcond_with compat_build
 %bcond_without check
 
-%ifarch aarch64
-# Use lld on aarch64, becuase ld.bfd will occasionally fail with the error:
-# `Could not create temporary file: Too many open files`
-%bcond_without linker_lld
-%if 0%{?rhel} == 8
-# RHEL8 does not pass --build-id to the linker by default, so we need
-# to manually specify the build-id algorith that rpmbuild expects.
-# lld defaults to a different algorithm.
-%global build_ldflags %(echo %{build_ldflags} -Wl,--build-id=sha1)
-%endif
-%else
-%bcond_with linker_lld
-%endif
-
-%global maj_ver 18
-%global min_ver 1
-%global patch_ver 2
+%global maj_ver 17
+%global min_ver 0
+%global patch_ver 6
 #global rc_ver 4
 
 %if %{with snapshot_build}
@@ -48,19 +34,13 @@
 %global install_includedir %{install_prefix}/include
 %global install_libdir %{install_prefix}/lib
 %global install_datadir %{install_prefix}/share
-%global install_libexecdir %{install_prefix}/libexec
-%global install_docdir %{install_datadir}/doc
 
 %global pkg_includedir %{install_includedir}
 %else
 %global pkg_name clang
-%global install_prefix %{_prefix}
-%global install_bindir %{_bindir}
+%global install_prefix /usr
 %global install_datadir %{_datadir}
 %global install_libdir %{_libdir}
-%global install_includedir %{_includedir}
-%global install_libexecdir %{_libexecdir}
-%global install_docdir %{_docdir}
 %endif
 
 %ifarch ppc64le aarch64
@@ -68,19 +48,12 @@
 %global _smp_mflags -j8
 %endif
 
-# Try to limit memory use on i686.
-%if !0%{?rhel} > 8
-%ifarch %ix86
-%constrain_build -m 3072
-%endif
-%endif
-
 %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
 
 Name:		%pkg_name
 Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	NCSA
@@ -93,38 +66,39 @@ Source1:    %{llvm_snapshot_source_prefix}clang-tools-extra-%{llvm_snapshot_yyyy
 %else
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz
 Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig
+%if %{without compat_build}
 Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz
 Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig
+%endif
 Source4:	release-keys.asc
 %endif
 %if %{without compat_build}
 Source5:	macros.%{name}
 %endif
-# This file is still needed because We still build on F38 in the
-# upstream-snapshot branch.
-Source6:	clang.cfg
 
 # Patches for clang
 Patch1:     0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
 Patch2:     0003-PATCH-clang-Don-t-install-static-libraries.patch
+Patch3:     0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch
+# Drop the following patch after debugedit adds support to DWARF-5:
+# https://sourceware.org/bugzilla/show_bug.cgi?id=28728
+Patch4:     0001-Produce-DWARF4-by-default.patch
 # Workaround a bug in ORC on ppc64le.
 # More info is available here: https://reviews.llvm.org/D159115#4641826
 Patch5:     0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
 
 # RHEL specific patches
-# Avoid unwanted dependency on python-myst-parser
-Patch101:  0009-disable-myst-parser.patch
+# 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
+%endif
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
-BuildRequires:	clang
-%if %{with linker_lld}
-BuildRequires:	lld
-%endif
 BuildRequires:	cmake
 BuildRequires:	ninja-build
 
@@ -132,8 +106,8 @@ BuildRequires:	ninja-build
 %global llvm_pkg_name llvm%{maj_ver}
 %else
 %global llvm_pkg_name llvm
-BuildRequires:  %{llvm_pkg_name}-test = %{version}
-BuildRequires:  %{llvm_pkg_name}-googletest = %{version}
+BuildRequires:  llvm-test = %{version}
+BuildRequires:  llvm-googletest = %{version}
 %endif
 
 BuildRequires:	%{llvm_pkg_name}-devel = %{version}
@@ -154,9 +128,6 @@ BuildRequires:	python3-lit
 
 BuildRequires:	python3-sphinx
 BuildRequires:	pandoc
-%if %{undefined rhel}
-BuildRequires:	python3-myst-parser
-%endif
 BuildRequires:	libatomic
 
 # We need python3-devel for %%py3_shebang_fix
@@ -166,10 +137,8 @@ BuildRequires:	python3-devel
 # For reproducible pyc file generation
 # See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility
 BuildRequires: /usr/bin/marshalparser
-%if %{without compat_build}
 %global py_reproducible_pyc_path %{buildroot}%{python3_sitelib}
 %endif
-%endif
 
 # Needed for %%multilib_fix_c_header
 BuildRequires:	multilib-rpm-config
@@ -234,22 +203,24 @@ 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}
-Provides: clang-devel(major) = %{maj_ver}
+%endif
 
 %description devel
 Development header files for clang.
 
 %package resource-filesystem
 Summary: Filesystem package that owns the clang resource directory
-Provides: clang-resource-filesystem(major) = %{maj_ver}
+Provides: %{name}-resource-filesystem(major) = %{maj_ver}
 BuildArch: noarch
 
 %description resource-filesystem
 This package owns the clang resouce directory: lib/clang/$version/
 
+%if %{without compat_build}
 %package analyzer
 Summary:	A source code analysis framework
 License:	NCSA and MIT
@@ -289,7 +260,7 @@ Requires:	python3
 %description -n git-clang-format
 clang-format integration for git.
 
-%if %{without compat_build}
+
 %package -n python3-clang
 Summary:       Python3 bindings for clang
 Requires:      %{name}-devel%{?_isa} = %{version}-%{release}
@@ -298,11 +269,17 @@ Requires:      python3
 %{summary}.
 
 
+%endif
+
+
 %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}'
@@ -345,8 +322,8 @@ find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pa
 
 %undefine __cmake_in_source_build
 
-# Disable lto on i686 due to memory constraints.
-%ifarch %ix86
+# And disable LTO on AArch64 entirely.
+%ifarch aarch64
 %define _lto_cflags %{nil}
 %endif
 
@@ -360,12 +337,6 @@ find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pa
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
-%if %{with linker_lld}
-# TODO: Use LLVM_USE_LLD cmake option, but this doesn't seem to work with
-# standalone builds.
-%global build_ldflags %(echo %{build_ldflags} -fuse-ld=lld)
-%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}
@@ -393,21 +364,24 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
 %if %{with compat_build}
+	-DCLANG_BUILD_TOOLS:BOOL=OFF \
 	-DCMAKE_INSTALL_PREFIX=%{install_prefix} \
+	-DCLANG_INCLUDE_TESTS:BOOL=OFF \
+	-DLLVM_INCLUDE_TESTS:BOOL=OFF \
 	-DLLVM_CMAKE_DIR=%{install_libdir}/cmake/llvm \
 %else
-%if 0%{?__isa_bits} == 64
-	-DLLVM_LIBDIR_SUFFIX=64 \
-%else
-	-DLLVM_LIBDIR_SUFFIX= \
-%endif
-%endif
 	-DCLANG_INCLUDE_TESTS:BOOL=ON \
 	-DLLVM_BUILD_UTILS:BOOL=ON \
 	-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../%{clang_tools_srcdir} \
 	-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
 	-DLLVM_LIT_ARGS="-vv" \
 	-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
+%if 0%{?__isa_bits} == 64
+	-DLLVM_LIBDIR_SUFFIX=64 \
+%else
+	-DLLVM_LIBDIR_SUFFIX= \
+%endif
+%endif
 	\
 %if %{with snapshot_build}
 	-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
@@ -427,7 +401,6 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
 	-DLLVM_ENABLE_EH=ON \
 	-DLLVM_ENABLE_RTTI=ON \
 	-DLLVM_BUILD_DOCS=ON \
-	-DLLVM_RAM_PER_COMPILE_JOB=3000 \
 	-DLLVM_ENABLE_SPHINX=ON \
 	-DCLANG_LINK_CLANG_DYLIB=ON \
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
@@ -437,10 +410,6 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
 	-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_CONFIG_FILE_SYSTEM_DIR=%{_sysconfdir}/%{name}/ \
-%ifarch %{arm}
-	-DCLANG_DEFAULT_LINKER=lld \
-%endif
 	-DCLANG_DEFAULT_UNWINDLIB=libgcc
 
 %cmake_build
@@ -449,13 +418,20 @@ CFLAGS="$CFLAGS -Wno-address -Wno-nonnull -Wno-maybe-uninitialized"
 
 %cmake_install
 
-# Add a symlink in /usr/bin to clang-format-diff
-ln -s %{install_datadir}/clang/clang-format-diff.py %{buildroot}%{install_bindir}/clang-format-diff
+%if %{with compat_build}
+
+# Remove binaries/other files
+rm -Rf %{buildroot}%{install_bindir}
+rm -Rf %{buildroot}%{install_prefix}/share
+rm -Rf %{buildroot}%{install_prefix}/libexec
+# Remove scanview-py helper libs
+rm -Rf %{buildroot}%{install_prefix}/lib/{libear,libscanbuild}
+
+%else
 
 # 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.
-%if %{without compat_build}
 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}|" \
@@ -471,135 +447,100 @@ install -p -m644 bindings/python/clang/* %{buildroot}%{python3_sitelib}/clang/
 mv %{buildroot}%{_prefix}/%{_lib}/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/{libear,libscanbuild}
 
+# Fix permissions of scan-view scripts
+chmod a+x %{buildroot}%{_datadir}/scan-view/{Reporter.py,startfile.py}
+
+# multilib fix
+%multilib_fix_c_header --file %{_includedir}/clang/Config/config.h
+
 # Move emacs integration files to the correct directory
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
 for f in clang-format.el clang-rename.el clang-include-fixer.el; do
 mv %{buildroot}{%{_datadir}/clang,%{_emacs_sitestartdir}}/$f
 done
 
+# remove editor integrations (bbedit, sublime, emacs, vim)
+rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript
+rm -vf %{buildroot}%{_datadir}/clang/clang-format-sublime.py*
+
+# TODO: Package html docs
+rm -Rvf %{buildroot}%{_docdir}/Clang/clang/html
+rm -Rvf %{buildroot}%{_datadir}/clang/clang-doc-default-stylesheet.css
+rm -Rvf %{buildroot}%{_datadir}/clang/index.js
+
+# TODO: What are the Fedora guidelines for packaging bash autocomplete files?
+rm -vf %{buildroot}%{_datadir}/clang/bash-autocomplete.sh
+
 # Create Manpage symlinks
 ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++.1.gz
 ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang-%{maj_ver}.1.gz
 ln -s clang.1.gz %{buildroot}%{_mandir}/man1/clang++-%{maj_ver}.1.gz
 
-# Fix permission
-chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
-
 # Add clang++-{version} symlink
 ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}
 
-%else
-# Not sure where to put these python modules for the compat build.
-rm -Rf %{buildroot}%{install_libdir}/{libear,libscanbuild}
 
-# Not sure where to put the emacs integration files for the compat build.
-rm -Rf %{buildroot}%{install_datadir}/clang/*.el
-
-# Not sure what to do with man pages for the compat builds
-rm -Rf %{buildroot}%{install_prefix}/share/man/
-
-# Add version suffix to binaries
-mkdir -p %{buildroot}%{_bindir}
-for f in %{buildroot}/%{install_bindir}/*; do
-  filename=`basename $f`
-  if echo $filename | grep -e '%{maj_ver}'; then
-    continue
-  fi
-  ln -s ../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename-%{maj_ver}
-done
-
-# Add clang++-{version} symlink
-ln -s ../../%{install_bindir}/clang++  %{buildroot}%{install_bindir}/clang++-%{maj_ver}
+# Fix permission
+chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
 
 %endif
 
-%if 0%{?fedora} == 38 || 0%{?rhel} <= 8
-# Install config file
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
-mv %{SOURCE6} %{buildroot}%{_sysconfdir}/%{name}/%{_target_platform}.cfg
-%endif
-
-# Install config file for clang
-%if %{maj_ver} >=18
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
-echo "--gcc-triple=%{_target_cpu}-redhat-linux" >> %{buildroot}%{_sysconfdir}/%{name}/%{_target_platform}.cfg
-%endif
-
-# Fix permissions of scan-view scripts
-chmod a+x %{buildroot}%{install_datadir}/scan-view/{Reporter.py,startfile.py}
-
-# multilib fix
-%multilib_fix_c_header --file %{install_includedir}/clang/Config/config.h
-
-# remove editor integrations (bbedit, sublime, emacs, vim)
-rm -vf %{buildroot}%{install_datadir}/clang/clang-format-bbedit.applescript
-rm -vf %{buildroot}%{install_datadir}/clang/clang-format-sublime.py*
-
-# TODO: Package html docs
-rm -Rvf %{buildroot}%{install_docdir}/Clang/clang/html
-rm -Rvf %{buildroot}%{install_datadir}/clang/clang-doc-default-stylesheet.css
-rm -Rvf %{buildroot}%{install_datadir}/clang/index.js
-
-# TODO: What are the Fedora guidelines for packaging bash autocomplete files?
-rm -vf %{buildroot}%{install_datadir}/clang/bash-autocomplete.sh
-
-
 # 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}/
 
-#Add versioned resource directory macro
-mkdir -p %{buildroot}%{_rpmmacrodir}/
-echo "%%clang%{maj_ver}_resource_dir %%{_prefix}/lib/clang/%{maj_ver}" >> %{buildroot}%{_rpmmacrodir}/macros.%{name}
+
+%if %{without compat_build}
+# Add a symlink in /usr/bin to clang-format-diff
+ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format-diff
+%endif
 
 %check
+%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
-# Set SOURCE_DATE_EPOCH to disable hardware acceleration on s390x
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1994082
-SOURCE_DATE_EPOCH=1629181597 LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir}
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} %{_smp_mflags} check-all -C %{_vpath_builddir}
+%endif
 %endif
 
 
+%if %{without compat_build}
 %files
 %license LICENSE.TXT
-%{install_bindir}/clang
-%{install_bindir}/clang++
-%{install_bindir}/clang-%{maj_ver}
-%{install_bindir}/clang++-%{maj_ver}
-%{install_bindir}/clang-cl
-%{install_bindir}/clang-cpp
-%if %{without compat_build}
+%{_bindir}/clang
+%{_bindir}/clang++
+%{_bindir}/clang-%{maj_ver}
+%{_bindir}/clang++-%{maj_ver}
+%{_bindir}/clang-cl
+%{_bindir}/clang-cpp
 %{_mandir}/man1/clang.1.gz
 %{_mandir}/man1/clang++.1.gz
 %{_mandir}/man1/clang-%{maj_ver}.1.gz
 %{_mandir}/man1/clang++-%{maj_ver}.1.gz
-%else
-%{_bindir}/clang-%{maj_ver}
-%{_bindir}/clang++-%{maj_ver}
-%{_bindir}/clang-cl-%{maj_ver}
-%{_bindir}/clang-cpp-%{maj_ver}
 %endif
 
 %files libs
 %{install_prefix}/lib/clang/%{maj_ver}/include/*
 %{install_libdir}/*.so.*
-%{_sysconfdir}/%{name}/%{_target_platform}.cfg
 
 %files devel
+%if %{without compat_build}
+%{_libdir}/*.so
+%{_includedir}/clang/
+%{_includedir}/clang-c/
+%{_libdir}/cmake/*
+%{_bindir}/clang-tblgen
+%dir %{_datadir}/clang/
+%else
 %{install_libdir}/*.so
-%{install_includedir}/clang/
-%{install_includedir}/clang-c/
-%{install_libdir}/cmake/*
-%{install_bindir}/clang-tblgen
-%if %{with compat_build}
-%{_bindir}/clang-tblgen-%{maj_ver}
+%{pkg_includedir}/clang/
+%{pkg_includedir}/clang-c/
+%{install_libdir}/cmake/
 %endif
-%dir %{install_datadir}/clang/
 
 %files resource-filesystem
 %dir %{install_prefix}/lib/clang/
@@ -608,139 +549,84 @@ SOURCE_DATE_EPOCH=1629181597 LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__
 %dir %{install_prefix}/lib/clang/%{maj_ver}/include/
 %dir %{install_prefix}/lib/clang/%{maj_ver}/lib/
 %dir %{install_prefix}/lib/clang/%{maj_ver}/share/
+%if %{without compat_build}
 %{_rpmmacrodir}/macros.%{name}
 
 
 %files analyzer
-%{install_bindir}/scan-view
-%{install_bindir}/scan-build
-%{install_bindir}/analyze-build
-%{install_bindir}/intercept-build
-%{install_bindir}/scan-build-py
-%if %{with compat_build}
-%{_bindir}/scan-view-%{maj_ver}
-%{_bindir}/scan-build-%{maj_ver}
-%{_bindir}/analyze-build-%{maj_ver}
-%{_bindir}/intercept-build-%{maj_ver}
-%{_bindir}/scan-build-py-%{maj_ver}
-%endif
-%{install_libexecdir}/ccc-analyzer
-%{install_libexecdir}/c++-analyzer
-%{install_libexecdir}/analyze-c++
-%{install_libexecdir}/analyze-cc
-%{install_libexecdir}/intercept-c++
-%{install_libexecdir}/intercept-cc
-%{install_datadir}/scan-view/
-%{install_datadir}/scan-build/
-%if %{without compat_build}
+%{_bindir}/scan-view
+%{_bindir}/scan-build
+%{_bindir}/analyze-build
+%{_bindir}/intercept-build
+%{_bindir}/scan-build-py
+%{_libexecdir}/ccc-analyzer
+%{_libexecdir}/c++-analyzer
+%{_libexecdir}/analyze-c++
+%{_libexecdir}/analyze-cc
+%{_libexecdir}/intercept-c++
+%{_libexecdir}/intercept-cc
+%{_datadir}/scan-view/
+%{_datadir}/scan-build/
 %{_mandir}/man1/scan-build.1.*
 %{python3_sitelib}/libear
 %{python3_sitelib}/libscanbuild
-%endif
 
 
 %files tools-extra
-%{install_bindir}/amdgpu-arch
-%{install_bindir}/clang-apply-replacements
-%{install_bindir}/clang-change-namespace
-%{install_bindir}/clang-check
-%{install_bindir}/clang-doc
-%{install_bindir}/clang-extdef-mapping
-%{install_bindir}/clang-format
-%{install_bindir}/clang-include-cleaner
-%{install_bindir}/clang-include-fixer
-%{install_bindir}/clang-move
-%{install_bindir}/clang-offload-bundler
-%{install_bindir}/clang-offload-packager
-%{install_bindir}/clang-linker-wrapper
-%{install_bindir}/clang-pseudo
-%{install_bindir}/clang-query
-%{install_bindir}/clang-refactor
-%{install_bindir}/clang-rename
-%{install_bindir}/clang-reorder-fields
-%{install_bindir}/clang-repl
-%{install_bindir}/clang-scan-deps
-%{install_bindir}/clang-tidy
-%{install_bindir}/clangd
-%{install_bindir}/diagtool
-%{install_bindir}/hmaptool
-%{install_bindir}/nvptx-arch
-%{install_bindir}/pp-trace
-%{install_bindir}/c-index-test
-%{install_bindir}/find-all-symbols
-%{install_bindir}/modularize
-%{install_bindir}/clang-format-diff
-%{install_bindir}/run-clang-tidy
-%if %{with compat_build}
-%{_bindir}/amdgpu-arch-%{maj_ver}
-%{_bindir}/clang-apply-replacements-%{maj_ver}
-%{_bindir}/clang-change-namespace-%{maj_ver}
-%{_bindir}/clang-check-%{maj_ver}
-%{_bindir}/clang-doc-%{maj_ver}
-%{_bindir}/clang-extdef-mapping-%{maj_ver}
-%{_bindir}/clang-format-%{maj_ver}
-%{_bindir}/clang-include-cleaner-%{maj_ver}
-%{_bindir}/clang-include-fixer-%{maj_ver}
-%{_bindir}/clang-move-%{maj_ver}
-%{_bindir}/clang-offload-bundler-%{maj_ver}
-%{_bindir}/clang-offload-packager-%{maj_ver}
-%{_bindir}/clang-linker-wrapper-%{maj_ver}
-%{_bindir}/clang-pseudo-%{maj_ver}
-%{_bindir}/clang-query-%{maj_ver}
-%{_bindir}/clang-refactor-%{maj_ver}
-%{_bindir}/clang-rename-%{maj_ver}
-%{_bindir}/clang-reorder-fields-%{maj_ver}
-%{_bindir}/clang-repl-%{maj_ver}
-%{_bindir}/clang-scan-deps-%{maj_ver}
-%{_bindir}/clang-tidy-%{maj_ver}
-%{_bindir}/clangd-%{maj_ver}
-%{_bindir}/diagtool-%{maj_ver}
-%{_bindir}/hmaptool-%{maj_ver}
-%{_bindir}/nvptx-arch-%{maj_ver}
-%{_bindir}/pp-trace-%{maj_ver}
-%{_bindir}/c-index-test-%{maj_ver}
-%{_bindir}/find-all-symbols-%{maj_ver}
-%{_bindir}/modularize-%{maj_ver}
-%{_bindir}/clang-format-diff-%{maj_ver}
-%{_bindir}/run-clang-tidy-%{maj_ver}
-%else
+%{_bindir}/amdgpu-arch
+%{_bindir}/clang-apply-replacements
+%{_bindir}/clang-change-namespace
+%{_bindir}/clang-check
+%{_bindir}/clang-doc
+%{_bindir}/clang-extdef-mapping
+%{_bindir}/clang-format
+%{_bindir}/clang-include-cleaner
+%{_bindir}/clang-include-fixer
+%{_bindir}/clang-move
+%{_bindir}/clang-offload-bundler
+%{_bindir}/clang-offload-packager
+%{_bindir}/clang-linker-wrapper
+%{_bindir}/clang-pseudo
+%{_bindir}/clang-query
+%{_bindir}/clang-refactor
+%{_bindir}/clang-rename
+%{_bindir}/clang-reorder-fields
+%{_bindir}/clang-repl
+%{_bindir}/clang-scan-deps
+%{_bindir}/clang-tidy
+%{_bindir}/clangd
+%{_bindir}/diagtool
+%{_bindir}/hmaptool
+%{_bindir}/nvptx-arch
+%{_bindir}/pp-trace
+%{_bindir}/c-index-test
+%{_bindir}/find-all-symbols
+%{_bindir}/modularize
+%{_bindir}/clang-format-diff
 %{_mandir}/man1/diagtool.1.gz
 %{_emacs_sitestartdir}/clang-format.el
 %{_emacs_sitestartdir}/clang-rename.el
 %{_emacs_sitestartdir}/clang-include-fixer.el
-%endif
-%{install_datadir}/clang/clang-format.py*
-%{install_datadir}/clang/clang-format-diff.py*
-%{install_datadir}/clang/clang-include-fixer.py*
-%{install_datadir}/clang/clang-tidy-diff.py*
-%{install_datadir}/clang/run-find-all-symbols.py*
-%{install_datadir}/clang/clang-rename.py*
+%{_datadir}/clang/clang-format.py*
+%{_datadir}/clang/clang-format-diff.py*
+%{_datadir}/clang/clang-include-fixer.py*
+%{_datadir}/clang/clang-tidy-diff.py*
+%{_bindir}/run-clang-tidy
+%{_datadir}/clang/run-find-all-symbols.py*
+%{_datadir}/clang/clang-rename.py*
 
 %files tools-extra-devel
-%{install_includedir}/clang-tidy/
+%{_includedir}/clang-tidy/
 
 %files -n git-clang-format
-%{install_bindir}/git-clang-format
-%if %{with compat_build}
-%{_bindir}/git-clang-format-%{maj_ver}
-%endif
+%{_bindir}/git-clang-format
 
-%if %{without compat_build}
 %files -n python3-clang
 %{python3_sitelib}/clang/
 
 
 %endif
 %changelog
-* Sat May 25 2024 Tom Stellard <tstellar@redhat.com> - 18.1.2-5
-- Set SOURCE_DATE_EPOCH when testing
-
-* Fri May 24 2024 Tom Stellard <tstellar@redhat.com> - 18.1.2-4
-- Limit number of compile jobs to avoid running out of memory
-
-* Thu Mar 21 2024 Tom Stellrd <tstellar@redhat.com> - 18.1.2-1
-- 18.1.2 Release
-
 * Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
 - Update to LLVM 17.0.6
 

clang.cfg

@@ -1,3 +0,0 @@
-# Drop the following option after debugedit adds support to DWARF-5:
-# https://sourceware.org/bugzilla/show_bug.cgi?id=28728
--gdwarf-4 -g0

clang.rpmlintrc

@@ -1,4 +0,0 @@
-# clang needs libstdc++-devel installed in order to compile c++ programs.
-addFilter("E: devel-dependency libstdc\+\+-devel")
-addFilter("E: explicit-lib-dependency libstdc\+\+-devel")
-addFilter("E: hardcoded-library-path in %{_prefix}/lib/{libear")

fix-ieee128-cross.diff

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

gating.yaml

@@ -1,19 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation}

hans-gpg-key.asc

@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-67H2IH//2sf8dw==
-=ADVe
------END PGP PUBLIC KEY BLOCK-----

rpminspect.yaml

@@ -1,12 +0,0 @@
----
-annocheck:
-  # Currently lto is disabled globally for clang.
-  # Note that all (default hardened) flags need to be repeated here, if
-  # you override some config flags it will completely overwrite the
-  # defaults (--ignore-unknown --verbose).
-  - hardened: --ignore-unknown --verbose --skip-lto
-
-unicode:
-  ignore:
-    # This patch intentionally contains forbidden code points
-    - 0002-Misleading-bidirectional-detection.patch

sources

@@ -1,4 +0,0 @@
-SHA512 (clang-18.1.2.src.tar.xz) = e969eb8ad163f0bbcd3998253fc6698d3e6c75ccf5233bc5d637736d522dfd67a5cc6977ee89b21d3d3866a07849460eeb3701d89986c139b7110dc6e27ff9fd
-SHA512 (clang-18.1.2.src.tar.xz.sig) = 0f36efa13d034321b74f73bbb1de893e725936c77d04629b23e29af24bef1c76b73328e9818afd0e32bef632c74fb0b2c54dfff265f8bfce7b5c6dffbc7f3c18
-SHA512 (clang-tools-extra-18.1.2.src.tar.xz) = dbfb476c75e720ce06bea700f15227a6a21e446335843d0cd539f73692a19864c3ec1036b1378bf0446ccf7850c382d19bbb2742d7159ef2a6caa57f63611d8c
-SHA512 (clang-tools-extra-18.1.2.src.tar.xz.sig) = 4fc4f4add88b0a70c83b4eba2478616a7223c5bf399cf027ddef14f82fd41fdd26c8784b26522ca1cc0198b22451bd76d747222d80e7a7a750ec171a3c32b088

tests/build-gating-libomp.fmf

@@ -1,30 +0,0 @@
-summary: libomp clang tests for build/PR gating
-adjust:
-  - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR."
-    when: >-
-      trigger is defined
-      and trigger != commit
-      and trigger != build
-    enabled: false
-
-  - because: "libomp not supported in s390x"
-    when: arch == s390x
-    enabled: false
-
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/rpms/clang.git
-    ref: rawhide
-    test: libomp
-execute:
-    how: tmt
-prepare:
-    # We want to make sure libomp is not already present on the system to ensure
-    # that clang pulls in the correct libomp dependencies when it is installed.
-    - name: Drop libomp
-      how: shell
-      script: |
-        yum erase -y libomp libomp-devel clang clang-libs
-provision:
-  hardware:
-    memory: ">= 4 GiB"

tests/build-gating.fmf

@@ -1,55 +0,0 @@
-#
-# Build/PR gating tests for *LLVM 13*
-#
-# Imports and runs tests provided by Fedora LLVM git for the matching LLVM version.
-#
-# NOTE: *always* keep this file in sync with upstream, i.e. Fedora. Since we cannot "discover" a plan,
-# we must duplicate at least some part of upstream plan setup, like `adjust` or `provision`. Not necessarily
-# all steps, btu if we do need some of them here, let's focus on making changes in upstream first, to preserve
-# one source of truth. Once TMT learns to include whole plans, we could drop the copied content from here.
-#
-
-summary: Clang tests for build/PR gating
-adjust:
-  - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR."
-    when: >-
-      trigger is defined
-      and trigger != commit
-      and trigger != build
-    enabled: false
-
-  # Unfortunately, TMT does not support more declarative approach, we need to run commands on our own.
-  - because: "On RHEL, CRB must be enabled to provide rarer packages"
-    prepare+:
-      - name: Enable CRB
-        how: shell
-        script: dnf config-manager --set-enabled rhel-CRB
-    when: >-
-      distro == rhel-9
-      or distro == rhel-8
-
-  # Unfortunately, TMT does not support more declarative approach, we need to run commands on our own.
-  - because: "On CentOS, CRB must be enabled to provide rarer packages"
-    prepare+:
-      - name: Enable CRB
-        how: shell
-        script: dnf config-manager --set-enabled crb
-    when: >-
-      distro == centos
-
-discover:
-    - name: clang-tests
-      how: fmf
-      url: https://src.fedoraproject.org/rpms/clang.git
-      ref: rawhide
-      filter: "tag:-not-in-default"
-    - name: upstream-llvm-integration-testsuite
-      how: fmf
-      url: https://src.fedoraproject.org/rpms/llvm.git
-      ref: rawhide
-      test: integration-test-suite
-execute:
-    how: tmt
-provision:
-  hardware:
-    memory: ">= 4 GiB"