.clang.metadata

@@ -1,4 +1,4 @@
-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
+581e929ba0d9fafc555081ab18d8c3fdf4478ac2 SOURCES/clang-18.1.8.src.tar.xz
+b943c2de0e134d652018e819e855eff0213a20ac SOURCES/clang-18.1.8.src.tar.xz.sig
+32923b812700526b76451384e4662ca45360d564 SOURCES/clang-tools-extra-18.1.8.src.tar.xz
+1dc8e1c7e5b2ffc76a1010b50eb3fb47642b4e74 SOURCES/clang-tools-extra-18.1.8.src.tar.xz.sig

.gitignore

@@ -1,4 +1,4 @@
-SOURCES/clang-16.0.6.src.tar.xz
-SOURCES/clang-16.0.6.src.tar.xz.sig
-SOURCES/clang-tools-extra-16.0.6.src.tar.xz
-SOURCES/clang-tools-extra-16.0.6.src.tar.xz.sig
+SOURCES/clang-18.1.8.src.tar.xz
+SOURCES/clang-18.1.8.src.tar.xz.sig
+SOURCES/clang-tools-extra-18.1.8.src.tar.xz
+SOURCES/clang-tools-extra-18.1.8.src.tar.xz.sig

SOURCES/0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch

@@ -1,30 +0,0 @@
-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-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch

@@ -1,21 +1,20 @@
-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
+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 | 5 +++++
- 1 file changed, 5 insertions(+)
+ 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 c8006f3d8412..6ed03adb7702 100644
+index 24fbdcffc07b..8fed46b49515 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2863,6 +2863,11 @@ Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const {
-   case llvm::Triple::ppc64le:
+@@ -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:

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

@@ -1,46 +1,49 @@
-From 4ea62faaaac1aad0fe496cabe9674c809c91c49a Mon Sep 17 00:00:00 2001
+From 8ce0e2a14ba0743c06b543c0503203a56c905e8c Mon Sep 17 00:00:00 2001
 From: Konrad Kleine <kkleine@redhat.com>
-Date: Mon, 13 Feb 2023 17:11:00 -0300
-Subject: [PATCH] Produce DWARF4 by default
+Date: Tue, 4 Jun 2024 14:11:23 +0200
+Subject: 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/include/clang/Driver/ToolChain.h | 2 +-
- clang/test/CodeGen/dwarf-version.c     | 4 ++--
- clang/test/Driver/as-options.s         | 4 ++--
- clang/test/Driver/cl-options.c         | 2 +-
- clang/test/Driver/clang-g-opts.c       | 2 +-
- clang/test/Driver/ve-toolchain.c       | 2 +-
- clang/test/Driver/ve-toolchain.cpp     | 2 +-
- 7 files changed, 9 insertions(+), 9 deletions(-)
+ clang/lib/Driver/ToolChain.cpp     | 4 +---
+ clang/test/CodeGen/dwarf-version.c | 8 ++++----
+ 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, 11 insertions(+), 13 deletions(-)
 
-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:
+diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
+index 388030592b48..6542895cf857 100644
+--- a/clang/lib/Driver/ToolChain.cpp
++++ b/clang/lib/Driver/ToolChain.cpp
+@@ -428,9 +428,7 @@ ToolChain::getDefaultUnwindTableLevel(const ArgList &Args) const {
+ }
  
-   // 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;
+ }
  
-   // 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
+ Tool *ToolChain::getClang() const {
 diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c
-index 0a6fa4768026..96f01749d0d8 100644
+index e63316ace69c..3d68b06c58ff 100644
 --- a/clang/test/CodeGen/dwarf-version.c
 +++ b/clang/test/CodeGen/dwarf-version.c
-@@ -2,8 +2,8 @@
+@@ -2,10 +2,10 @@
  // 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=i386-pc-solaris -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER5
+-// RUN: %clang --target=i386-pc-solaris -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
++// RUN: %clang --target=i386-pc-solaris -g -S -emit-llvm -o - %s | FileCheck %s --check-prefix=VER4
++// RUN: %clang --target=i386-pc-solaris -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
@@ -67,12 +70,12 @@ 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 1d588bdfc1b0..1ad57aedc3a4 100644
+index 5b6dfe308a76..4da65272a1b0 100644
 --- a/clang/test/Driver/cl-options.c
 +++ b/clang/test/Driver/cl-options.c
-@@ -575,7 +575,7 @@
- // RUN: %clang_cl /Z7 -gdwarf /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s
- // Z7_gdwarf: "-gcodeview"
+@@ -571,7 +571,7 @@
+ // RUN: %clang_cl -gdwarf /Z7 /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s
+ // Z7_gdwarf-NOT: "-gcodeview"
  // Z7_gdwarf: "-debug-info-kind=constructor"
 -// Z7_gdwarf: "-dwarf-version=
 +// Z7_gdwarf: "-dwarf-version=4
@@ -80,20 +83,20 @@ index 1d588bdfc1b0..1ad57aedc3a4 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 d982b1070cae..bb129e75769c 100644
+index b73602a155b0..b0cf64674253 100644
 --- a/clang/test/Driver/clang-g-opts.c
 +++ b/clang/test/Driver/clang-g-opts.c
-@@ -32,7 +32,7 @@
+@@ -36,7 +36,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-DWARF4: "-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
+index 078341eb1202..6ccbef6a0c36 100644
 --- a/clang/test/Driver/ve-toolchain.c
 +++ b/clang/test/Driver/ve-toolchain.c
 @@ -6,7 +6,7 @@
@@ -106,7 +109,7 @@ index 32e25769b6da..b8a2852daba8 100644
  ///-----------------------------------------------------------------------------
  /// Checking include-path
 diff --git a/clang/test/Driver/ve-toolchain.cpp b/clang/test/Driver/ve-toolchain.cpp
-index 5a33d5eceb61..cedf895b36dc 100644
+index cd48dd792f85..f77781d4c6fa 100644
 --- a/clang/test/Driver/ve-toolchain.cpp
 +++ b/clang/test/Driver/ve-toolchain.cpp
 @@ -7,7 +7,7 @@
@@ -119,5 +122,5 @@ index 5a33d5eceb61..cedf895b36dc 100644
  ///-----------------------------------------------------------------------------
  /// Checking include-path
 -- 
-2.39.1
+2.45.1
 

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

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

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

@@ -1,6 +1,6 @@
-From 581300e447602b9b7a505b0f07e8461d58d041ca Mon Sep 17 00:00:00 2001
+From 22d62b32cd3be5fb0ae10723b35a781e0f862b71 Mon Sep 17 00:00:00 2001
 From: Tom Stellard <tstellar@redhat.com>
-Date: Fri, 1 Jul 2022 21:24:17 -0700
+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
@@ -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 9b99bfd93440..3fca9f25fb48 100644
+index 9f64fd3d2ffa..1b258a00ddf9 100644
 --- a/clang-tools-extra/test/lit.cfg.py
 +++ b/clang-tools-extra/test/lit.cfg.py
-@@ -59,6 +59,9 @@ config.substitutions.append(
- # Plugins (loadable modules)
+@@ -75,6 +75,9 @@ config.substitutions.append(("%clang_tidy_headers", clang_tidy_headers))
  if config.has_plugins and config.llvm_plugin_ext:
-     config.available_features.add('plugins')
-+
+     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.27.0
+2.40.1
 

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

@@ -1,58 +0,0 @@
-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: 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 f203cae1d329..12fa2da3187e 100644
---- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -1969,6 +1969,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.
-@@ -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;
-+
-+  // 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.37.1
-

SOURCES/0003-PATCH-clang-Don-t-install-static-libraries.patch

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

SOURCES/0009-disable-myst-parser.patch

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

SOURCES/0009-disable-recommonmark.patch

@@ -1,38 +0,0 @@
-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'):
--    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'
--- 
-2.37.1
-

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

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

SOURCES/macros.clang

@@ -8,9 +8,4 @@
 # headers and libraries.  This path should be used by packages that need to
 # install files into this directory.  This macro's value changes every time
 # clang's version changes.
-%clang_resource_dir %{_libdir}/clang/%{clang_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}
+%clang_resource_dir %{_prefix}/lib/clang/%{clang_major_version}

SPECS/clang.spec

@@ -1,16 +1,41 @@
+%bcond_with snapshot_build
+
+%if %{with snapshot_build}
+%{llvm_sb}
+%endif
+
 # We are building with clang for faster/lower memory LTO builds.
 # See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros
 %global toolchain clang
 
+# 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
 %global gts_version 13
 
 %bcond_with compat_build
 %bcond_with bundle_compat_lib
 %bcond_without check
 
-%global maj_ver 16
-%global min_ver 0
-%global patch_ver 6
+%ifnarch s390x %ix86
+%global build_ldflags %{build_ldflags} -Wl,--build-id=sha1
+%bcond_without linker_lld
+%else
+%bcond_with linker_lld
+%endif
+
+%global maj_ver 18
+%global min_ver 1
+%global patch_ver 8
+#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}
@@ -21,43 +46,60 @@
 %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 install_libexecdir %{install_prefix}/libexec
+%global install_docdir %{install_datadir}/doc
 
-%global pkg_bindir %{install_bindir}
 %global pkg_includedir %{install_includedir}
-%global pkg_libdir %{install_libdir}
 %else
 %global pkg_name clang
-%global install_prefix /usr
-%global pkg_libdir %{_libdir}
+%global install_prefix %{_prefix}
+%global install_bindir %{_bindir}
+%global install_datadir %{_datadir}
+%global install_libdir %{_libdir}
+%global install_includedir %{_includedir}
+%global install_libexecdir %{_libexecdir}
+%global install_docdir %{_docdir}
 %endif
 
 %if %{with bundle_compat_lib}
-%global compat_maj_ver 15
-%global compat_ver %{compat_maj_ver}.0.7
+%global compat_maj_ver 17
+%global compat_ver %{compat_maj_ver}.0.6
 %endif
 
 
-%ifarch ppc64le aarch64
-# Too many threads on ppc64 and aarch64 systems causes OOM errors.
+%ifarch ppc64le
+# Too many threads on ppc64 systems causes OOM errors.
 %global _smp_mflags -j8
 %endif
 
+%if 0%{?fedora}
+# Try to limit memory use on i686.
+%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}}
-Release:	1%{?dist}
+Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
+Release:	3%{?dist}
 Summary:	A C language family front-end for LLVM
 
 License:	Apache-2.0 WITH LLVM-exception OR 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
-Source1:	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}
-Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz
-Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig
-%endif
+Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig
+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
 Source4:	release-keys.asc
 %if %{with bundle_compat_lib}
 Source5:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/clang-%{compat_ver}.src.tar.xz
@@ -67,55 +109,52 @@ Source8:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat
 Source9:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/cmake-%{compat_ver}.src.tar.xz
 Source10:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/cmake-%{compat_ver}.src.tar.xz.sig
 %endif
-%if !0%{with compat_build}
-Source11:	macros.%{name}
+%endif
+%if %{without compat_build}
+Source105:	macros.%{name}
 %endif
 
 # 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
+# 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
+Patch102:     0001-Driver-Give-devtoolset-path-precedence-over-Installe.patch
+Patch103:  0001-Produce-DWARF4-by-default.patch
 
-Patch1:     0003-PATCH-Make-funwind-tables-the-default-on-all-archs.patch
-Patch2:     0006-Don-t-install-static-libraries.patch
-Patch3:     0002-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch
-Patch4:	    0010-PATCH-clang-Produce-DWARF4-by-default.patch
-# Make clangBasic and clangDriver depend on LLVMTargetParser
-# See https://reviews.llvm.org/D141581
-Patch7:     D141581.diff
-# clang/cmake: Use installed gtest libraries for stand-alone builds
-# See https://reviews.llvm.org/D138472
-Patch8:     D138472.diff
-
-Patch10:    fix-ieee128-cross.diff
-
-Patch11:    0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
-
-# RHEL specific patch
-Patch12:     0009-disable-recommonmark.patch
-Patch13:     0001-Driver-Give-devtoolset-path-precedence-over-Installe.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
 
 # Required for 64-bit atomics on i686.
 BuildRequires: gcc-toolset-%{gts_version}-libatomic-devel
 # Required to handle LTO debuginfo.
 BuildRequires: gcc-toolset-%{gts_version}-gdb
 BuildRequires:	clang
+%if %{with linker_lld}
+BuildRequires:	lld
+%endif
 BuildRequires:	cmake
 BuildRequires:	ninja-build
+
 %if %{with compat_build}
-BuildRequires:	llvm%{maj_ver}-devel = %{version}
-BuildRequires:	llvm%{maj_ver}-static = %{version}
+%global llvm_pkg_name llvm%{maj_ver}
 %else
-BuildRequires:	llvm-devel = %{version}
-BuildRequires:	llvm-test = %{version}
+%global llvm_pkg_name llvm
+BuildRequires:  %{llvm_pkg_name}-test = %{version}
+BuildRequires:  %{llvm_pkg_name}-googletest = %{version}
+%endif
+
+BuildRequires:	%{llvm_pkg_name}-devel = %{version}
 # llvm-static is required, because clang-tablegen needs libLLVMTableGen, which
 # is not included in libLLVM.so.
-BuildRequires:	llvm-static = %{version}
-BuildRequires:	llvm-googletest = %{version}
-%endif
+BuildRequires:	%{llvm_pkg_name}-static = %{version}
+BuildRequires:	%{llvm_pkg_name}-cmake-utils = %{version}
 
 BuildRequires:	libxml2-devel
 BuildRequires:	perl-generators
@@ -128,16 +167,19 @@ BuildRequires:	emacs
 BuildRequires:	python3-lit
 
 BuildRequires:	python3-sphinx
+%if %{undefined rhel}
+BuildRequires:	python3-myst-parser
+%endif
 BuildRequires:	libatomic
 
 # We need python3-devel for %%py3_shebang_fix
 BuildRequires:	python3-devel
 
-%if %{without compat_build}
 # For reproducible pyc file generation
 # See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#_byte_compilation_reproducibility
 %if 0%{?fedora}
 BuildRequires: /usr/bin/marshalparser
+%if %{without compat_build}
 %global py_reproducible_pyc_path %{buildroot}%{python3_sitelib}
 %endif
 %endif
@@ -190,7 +232,7 @@ libomp-devel to enable -fopenmp.
 
 %package libs
 Summary: Runtime library for clang
-Requires: %{name}-resource-filesystem%{?_isa} = %{version}
+Requires: %{name}-resource-filesystem = %{version}
 Requires: gcc-toolset-%{gts_version}-gcc-c++
 Recommends: compiler-rt%{?_isa} = %{version}
 # atomic support is not part of compiler-rt
@@ -200,34 +242,28 @@ Recommends: libatomic%{?_isa}
 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}
-%endif
+Provides: clang-devel(major) = %{maj_ver}
 
 %description devel
 Development header files for clang.
 
 %package resource-filesystem
 Summary: Filesystem package that owns the clang resource directory
-Provides: %{name}-resource-filesystem(major) = %{maj_ver}
+Provides: clang-resource-filesystem(major) = %{maj_ver}
+BuildArch: noarch
 
 %description resource-filesystem
-This package owns the clang resouce directory: $libdir/clang/$version/
+This package owns the clang resouce directory: lib/clang/$version/
 
-%if %{without compat_build}
 %package analyzer
 Summary:	A source code analysis framework
 License:	Apache-2.0 WITH LLVM-exception OR NCSA OR MIT
@@ -248,6 +284,13 @@ Requires:	emacs-filesystem
 %description tools-extra
 A set of extra tools built using Clang's tooling API.
 
+%package tools-extra-devel
+Summary: Development header files for clang tools
+Requires: %{name}-tools-extra = %{version}-%{release}
+
+%description tools-extra-devel
+Development header files for clang tools.
+
 # Put git-clang-format in its own package, because it Requires git
 # and we don't want to force users to install all those dependenices if they
 # just want clang.
@@ -260,7 +303,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}
@@ -273,7 +316,9 @@ Requires:      python3
 
 
 %prep
-%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%if %{without snapshot_build}
+%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}'
+%endif
 
 %if %{with bundle_compat_lib}
 %{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE6}' --data='%{SOURCE5}'
@@ -289,10 +334,12 @@ Requires:      python3
 %autosetup -n %{clang_srcdir} -p2
 %else
 
-%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE2}'
-%setup -T -q -b 2 -n %{clang_tools_srcdir}
-%autopatch -m200 -p2
+%if %{without snapshot_build}
+%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE1}'
+%endif
 
+%setup -T -q -b 1 -n %{clang_tools_srcdir}
+%autopatch -m200 -p2
 
 # failing test case
 rm test/clang-tidy/checkers/altera/struct-pack-align.cpp
@@ -302,7 +349,7 @@ rm test/clang-tidy/checkers/altera/struct-pack-align.cpp
 	clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 
 %setup -q -n %{clang_srcdir}
-%autopatch -M200 -p2
+%autopatch -M%{?!rhel:100}%{?rhel:200} -p2
 
 # failing test case
 rm test/CodeGen/profile-filter.c
@@ -316,26 +363,30 @@ rm test/CodeGen/profile-filter.c
 	tools/scan-view/share/startfile.py \
 	tools/scan-build-py/bin/* \
 	tools/scan-build-py/libexec/*
-%endif
 
 %build
 
-%if 0%{?__isa_bits} == 64
-sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@/64/g' test/lit.cfg.py
-%else
-sed -i 's/\@FEDORA_LLVM_LIB_SUFFIX\@//g' test/lit.cfg.py
+# Disable lto on i686 due to memory constraints.
+%ifarch %ix86
+%define _lto_cflags %{nil}
 %endif
 
-%ifarch %ix86
-# Linking libclang.so goes out of memory even with ThinLTO and a single link job.
+# Disable LTO to speed up builds
+%if %{with snapshot_build}
 %global _lto_cflags %nil
 %endif
 
-%ifarch s390 s390x %{arm} aarch64 %ix86 ppc64le
+%ifarch s390 s390x aarch64 %ix86 ppc64le
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
+%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}
@@ -362,7 +413,8 @@ mv ../cmake-%{compat_ver}.src ../cmake
 	-DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \
 	-DLLVM_INCLUDE_BENCHMARKS=OFF \
 	-DCMAKE_C_FLAGS_RELEASE="-fno-lto" \
-	-DCMAKE_CXX_FLAGS_RELEASE="-fno-lto"
+	-DCMAKE_CXX_FLAGS_RELEASE="-fno-lto" \
+	-DLLVM_INCLUDE_TESTS:BOOL=OFF
 
 %ninja_build -C ../clang-compat-libs libclang.so
 %ninja_build -C ../clang-compat-libs libclang-cpp.so
@@ -370,39 +422,41 @@ mv ../cmake-%{compat_ver}.src ../cmake
 
 %endif
 
-# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF to match the default used by Fedora's GCC.
-# See https://bugzilla.redhat.com/show_bug.cgi?id=2134146
-%cmake  -G Ninja \
-%ifarch %ix86
-	-DHAVE_CXX_ATOMICS64_WITHOUT_LIB=OFF \
-%endif
+# We set CLANG_DEFAULT_PIE_ON_LINUX=OFF and PPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON to match the
+# defaults used by Fedora's GCC.
+%cmake -G Ninja \
 	-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
+%if 0%{?fedora} || 0%{?rhel} > 9
+	-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=ON \
+%endif
 	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DPYTHON_EXECUTABLE=%{__python3} \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch s390 s390x %{arm} %ix86 ppc64le
+%ifarch s390 s390x %ix86 ppc64le
 	-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_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
+	\
+%if %{with snapshot_build}
+	-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
 %endif
 	\
 %if %{with compat_build}
@@ -410,7 +464,7 @@ mv ../cmake-%{compat_ver}.src ../cmake
 %else
 	-DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
 %endif
-	-DLLVM_COMMON_CMAKE_UTILS=%{_libdir}/cmake/llvm \
+	-DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \
 	-DCLANG_ENABLE_ARCMT:BOOL=ON \
 	-DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
 	-DCLANG_INCLUDE_DOCS:BOOL=ON \
@@ -425,7 +479,9 @@ mv ../cmake-%{compat_ver}.src ../cmake
 	\
 	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS=OFF \
-	-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}" \
+	-DCLANG_REPOSITORY_STRING="%{?dist_vendor} %{version}-%{release}" \
+	-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
+	-DCLANG_CONFIG_FILE_SYSTEM_DIR=%{_sysconfdir}/%{name}/ \
 %ifarch %{arm}
 	-DCLANG_DEFAULT_LINKER=lld \
 %endif
@@ -443,26 +499,19 @@ export GDB=`which gdb`
 
 %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 bundle_compat_lib}
 install -m 0755 ../clang-compat-libs/lib/libclang.so.%{compat_maj_ver}* %{buildroot}%{_libdir}
 install -m 0755 ../clang-compat-libs/lib/libclang-cpp.so.%{compat_maj_ver}* %{buildroot}%{_libdir}
 %endif
 
-%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.
-install -p -m0644 -D %{SOURCE11} %{buildroot}%{_rpmmacrodir}/macros.%{name}
+%if %{without compat_build}
+install -p -m0644 -D %{SOURCE105} %{buildroot}%{_rpmmacrodir}/macros.%{name}
 sed -i -e "s|@@CLANG_MAJOR_VERSION@@|%{maj_ver}|" \
        -e "s|@@CLANG_MINOR_VERSION@@|%{min_ver}|" \
        -e "s|@@CLANG_PATCH_VERSION@@|%{patch_ver}|" \
@@ -477,62 +526,89 @@ 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
 
-# Fix permission
-chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
+# Add clang++-{version} symlink
+ln -s ../../%{install_bindir}/clang++  %{buildroot}%{install_bindir}/clang++-%{maj_ver}
 
 %endif
 
-# Create sub-directories in the clang resource directory that will be
-# populated by other packages
-mkdir -p %{buildroot}%{pkg_libdir}/clang/%{maj_ver}/{include,lib,share}/
+%if 0%{?fedora} == 38
+# 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}-clang.cfg
+echo "--gcc-triple=%{_target_cpu}-redhat-linux" >> %{buildroot}%{_sysconfdir}/%{name}/%{_target_platform}-clang++.cfg
+%endif
 
-# Remove clang-tidy headers.  We don't ship the libraries for these.
-rm -Rvf %{buildroot}%{_includedir}/clang-tidy/
+# Fix permissions of scan-view scripts
+chmod a+x %{buildroot}%{install_datadir}/scan-view/{Reporter.py,startfile.py}
 
-%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
+# multilib fix
+%multilib_fix_c_header --file %{install_includedir}/clang/Config/config.h
 
-%check
-# see rhbz#1994082
-sed -i -e "s/'ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH'/'ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH', 'SOURCE_DATE_EPOCH'/" test/lit.cfg.py
+# 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*
 
-%if %{without compat_build}
+# 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}
+
+%check
 %if %{with check}
 # Build test dependencies separately, to prevent invocations of host clang from being affected
 # by LD_LIBRARY_PATH below.
@@ -547,12 +623,7 @@ mv "$compat_lib" .
 %endif
 
 # requires lit.py from LLVM utilities
-# FIXME: Fix failing ARM tests
-SOURCE_DATA_EPOCH=1629181597 LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{__ninja} check-all -C %{__cmake_builddir} || \
-%ifarch %{arm}
-:
-%else
-false
+SOURCE_DATA_EPOCH=1629181597 LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{__cmake_builddir}
 %endif
 
 %if %{with bundle_compat_lib}
@@ -560,18 +631,17 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
 %endif
 
 %endif
-%endif
 
 
-%if %{without compat_build}
 %files
 %license LICENSE.TXT
-%{_bindir}/clang
-%{_bindir}/clang++
-%{_bindir}/clang-%{maj_ver}
-%{_bindir}/clang++-%{maj_ver}
-%{_bindir}/clang-cl
-%{_bindir}/clang-cpp
+%{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}
 %{_mandir}/man1/clang.1.gz
 %{_mandir}/man1/clang++.1.gz
 %{_mandir}/man1/clang-%{maj_ver}.1.gz
@@ -579,113 +649,193 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
 %endif
 
 %files libs
-%if %{without compat_build}
-%{_libdir}/clang/%{maj_ver}/include/*
-%{_libdir}/*.so.*
-%else
-%{pkg_libdir}/*.so.*
-%{pkg_libdir}/clang/%{maj_ver}/include/*
-%endif
+%{install_prefix}/lib/clang/%{maj_ver}/include/*
+%{install_libdir}/*.so.*
 %if %{with bundle_compat_lib}
 %{_libdir}/libclang.so.%{compat_maj_ver}*
 %{_libdir}/libclang-cpp.so.%{compat_maj_ver}*
 %endif
+%{_sysconfdir}/%{name}/%{_target_platform}-clang.cfg
+%{_sysconfdir}/%{name}/%{_target_platform}-clang++.cfg
 
 %files devel
-%if %{without compat_build}
-%{_libdir}/*.so
-%{_includedir}/clang/
-%{_includedir}/clang-c/
-%{_libdir}/cmake/*
-%{_bindir}/clang-tblgen
-%dir %{_datadir}/clang/
-%{_rpmmacrodir}/macros.%{name}
-%else
-%{pkg_libdir}/*.so
-%{pkg_includedir}/clang/
-%{pkg_includedir}/clang-c/
-%{pkg_libdir}/cmake/
+%{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}
 %endif
+%dir %{install_datadir}/clang/
 
 %files resource-filesystem
-%dir %{pkg_libdir}/clang/
-%dir %{pkg_libdir}/clang/%{maj_ver}/
-%dir %{pkg_libdir}/clang/%{maj_ver}/include/
-%dir %{pkg_libdir}/clang/%{maj_ver}/lib/
-%dir %{pkg_libdir}/clang/%{maj_ver}/share/
+%dir %{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/
+%{_rpmmacrodir}/macros.%{name}
+
 
-%if %{without compat_build}
 %files analyzer
-%{_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/
+%{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}
 %{_mandir}/man1/scan-build.1.*
 %{python3_sitelib}/libear
 %{python3_sitelib}/libscanbuild
+%endif
 
 
 %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-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
+%{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
 %{_mandir}/man1/diagtool.1.gz
 %{_emacs_sitestartdir}/clang-format.el
 %{_emacs_sitestartdir}/clang-rename.el
 %{_emacs_sitestartdir}/clang-include-fixer.el
-%{_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*
+%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*
+
+%files tools-extra-devel
+%{install_includedir}/clang-tidy/
 
 %files -n git-clang-format
-%{_bindir}/git-clang-format
+%{install_bindir}/git-clang-format
+%if %{with compat_build}
+%{_bindir}/git-clang-format-%{maj_ver}
+%endif
 
+%if %{without compat_build}
 %files -n python3-clang
 %{python3_sitelib}/clang/
 
 
 %endif
 %changelog
+* Thu Aug 08 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.8-3
+- Remove clang 17 compat lib
+
+* Wed Jul 24 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.8-2
+- Link with ld on 32-bit architectures
+
+* Tue Jul 16 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.8-1
+- Update to 18.1.8
+
+* Thu Jun 06 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.6-3
+- Rebuild
+
+* Tue Jun 04 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.6-2
+- Default to DWARF4
+
+* Tue May 28 2024 Konrad Kleine <kkleine@redhat.com> - 18.1.6-1
+- Update to 18.1.6
+
+* Tue Jan 09 2024 Timm Bäder <tbaeder@redhat.com> - 17.0.6-5
+- Remove compat libs
+
+* Thu Dec 14 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.6-4
+- Add back compat libs until all necessary packages have been rebuilt.
+
+* Fri Dec 08 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.6-3
+- Remove compat libs
+
+* Wed Dec 06 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.6-2
+- Update to 17.0.6
+
+* Wed Oct 04 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.1-2
+- Pick up macros.clang changes from Fedora
+
+* Thu Sep 28 2023 Timm Bäder <tbaeder@redhat.com> - 17.0.1-1
+- Update to 17.0.1
+
 * Wed Jul 05 2023 Nikita Popov <npopov@redhat.com> - 16.0.6-1
 - Update to LLVM 16.0.6
 
@@ -710,6 +860,9 @@ mv ./libclang-cpp.so.%{compat_maj_ver} "$compat_lib"
 * Mon Apr 17 2023 Nikita Popov <npopov@redhat.com> - 16.0.1-1
 - Update to LLVM 16.0.1
 
+* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 15.0.7-3
+- Rebuilt for MSVSphere 9.2 beta
+
 * Fri Jan 27 2023 Konrad Kleine <kkleine@redhat.com> - 15.0.7-3
 - Remove clang-tools-extra-devel package