- merged 21.1.8 from PLD

diff --git a/cmake-utils-path-override.patch b/cmake-utils-path-override.patch
index 5045dcb586316815d8be46813f3b488128f8d94e..e1e8398f21b1451f298049a14a5d83016ae2885a 100644 (file)
--- a/cmake-utils-path-override.patch
+++ b/cmake-utils-path-override.patch
@@ -2,7 +2,7 @@
 +++ llvm-15.0.2.src/CMakeLists.txt     2022-10-15 23:16:11.530931066 +0200
 @@ -2,7 +2,7 @@
  
 +++ llvm-15.0.2.src/CMakeLists.txt     2022-10-15 23:16:11.530931066 +0200
 @@ -2,7 +2,7 @@
  

- cmake_minimum_required(VERSION 3.20.0)
+ include(CMakeDependentOption)

  
 -set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
 +set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake CACHE STRING "Path to CMake modules shared between projects")
  
 -set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
 +set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake CACHE STRING "Path to CMake modules shared between projects")

diff --git a/cstdint.patch b/cstdint.patch
deleted file mode 100644 (file)
index 1ddd916..0000000
--- a/cstdint.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tools/mlir/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h   2025-01-14 10:41:02.000000000 +0100
-+++ b/tools/mlir/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h   2025-01-17 08:31:49.581864809 +0100
-@@ -9,6 +9,7 @@
- #ifndef MLIR_DIALECT_AFFINE_IR_VALUEBOUNDSOPINTERFACEIMPL_H
- #define MLIR_DIALECT_AFFINE_IR_VALUEBOUNDSOPINTERFACEIMPL_H
- 
-+#include <cstdint>
- #include "mlir/Support/LLVM.h"
- 
- namespace mlir {
---- a/tools/mlir/include/mlir/Support/LLVM.h   2025-01-14 10:41:02.000000000 +0100
-+++ b/tools/mlir/include/mlir/Support/LLVM.h   2025-01-17 10:20:19.356337873 +0100
-@@ -18,6 +18,9 @@
- #ifndef MLIR_SUPPORT_LLVM_H
- #define MLIR_SUPPORT_LLVM_H
- 
-+
-+
-+#include <cstdint>
- // We include this header because it cannot be practically forward
- // declared, and are effectively language features.
- #include "llvm/Support/Casting.h"

diff --git a/lldb-headers-dir.patch b/lldb-headers-dir.patch
new file mode 100644 (file)
index 0000000..5f01d86
--- /dev/null
+++ b/lldb-headers-dir.patch
@@ -0,0 +1,23 @@
+--- lldb/source/API/CMakeLists.txt.orig        2025-12-12 11:35:47.000000000 +0100
++++ lldb/source/API/CMakeLists.txt     2025-12-22 23:14:14.836678784 +0100
+@@ -299,6 +299,11 @@
+ file(GLOB root_private_headers ${LLDB_SOURCE_DIR}/include/lldb/lldb-private*.h)
+ list(REMOVE_ITEM root_public_headers ${root_private_headers})
+ 
++add_custom_command(
++  OUTPUT ${lldb_header_staging_dir}
++  COMMAND ${CMAKE_COMMAND} -E make_directory ${lldb_header_staging_dir}
++  COMMENT "LLDB headers: create staging directory for LLDB headers")
++
+ find_program(unifdef_EXECUTABLE unifdef)
+ 
+ foreach(header
+@@ -318,7 +323,7 @@
+   endif()
+ 
+   add_custom_command(
+-    DEPENDS ${header} OUTPUT ${staged_header}
++    DEPENDS ${header} ${lldb_header_staging_dir} OUTPUT ${staged_header}
+     COMMAND ${copy_command}
+     COMMENT "LLDB headers: stage LLDB headers in include directory")
+ 

diff --git a/llvm-tld.patch b/llvm-tld.patch
index 6548b032e927674403d0826cf5523e074ee55747..5a1f0e36d702a1c4d690abc8423ff584268164d5 100644 (file)
--- a/llvm-tld.patch
+++ b/llvm-tld.patch
@@ -1,6 +1,6 @@
-diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/include/clang/Driver/Distro.h llvm-19.1.5.src/tools/clang/include/clang/Driver/Distro.h
---- llvm-19.1.5.src.org/tools/clang/include/clang/Driver/Distro.h      2024-12-03 08:46:10.000000000 +0100
-+++ llvm-19.1.5.src/tools/clang/include/clang/Driver/Distro.h  2024-12-23 14:15:31.732367771 +0100
+diff -urNp -x '*.orig' llvm-21.1.8.src.org/tools/clang/include/clang/Driver/Distro.h llvm-21.1.8.src/tools/clang/include/clang/Driver/Distro.h
+--- llvm-21.1.8.src.org/tools/clang/include/clang/Driver/Distro.h      2025-12-12 11:35:47.000000000 +0100
++++ llvm-21.1.8.src/tools/clang/include/clang/Driver/Distro.h  2026-01-25 13:20:40.407654242 +0100

 @@ -30,6 +30,7 @@ public:
      // the first and last known member in the family, e.g. IsRedHat().
      AlpineLinux,
 @@ -30,6 +30,7 @@ public:
      // the first and last known member in the family, e.g. IsRedHat().
      AlpineLinux,


@@ -9,7 +9,7 @@ diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/include/clang/Driver/Dist
      DebianLenny,
      DebianSqueeze,
      DebianWheezy,
      DebianLenny,
      DebianSqueeze,
      DebianWheezy,

-@@ -138,6 +139,10 @@ public:
+@@ -142,6 +143,10 @@ public:

  
    bool IsGentoo() const { return DistroVal == Gentoo; }
  
  
    bool IsGentoo() const { return DistroVal == Gentoo; }
  


@@ -20,10 +20,10 @@ diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/include/clang/Driver/Dist
    /// @}
  };
  
    /// @}
  };
  

-diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/Distro.cpp llvm-19.1.5.src/tools/clang/lib/Driver/Distro.cpp
---- llvm-19.1.5.src.org/tools/clang/lib/Driver/Distro.cpp      2024-12-03 08:46:10.000000000 +0100
-+++ llvm-19.1.5.src/tools/clang/lib/Driver/Distro.cpp  2024-12-23 14:15:31.732367771 +0100
-@@ -205,6 +205,9 @@ static Distro::DistroType DetectDistro(l
+diff -urNp -x '*.orig' llvm-21.1.8.src.org/tools/clang/lib/Driver/Distro.cpp llvm-21.1.8.src/tools/clang/lib/Driver/Distro.cpp
+--- llvm-21.1.8.src.org/tools/clang/lib/Driver/Distro.cpp      2025-12-12 11:35:47.000000000 +0100
++++ llvm-21.1.8.src/tools/clang/lib/Driver/Distro.cpp  2026-01-25 13:20:40.407654242 +0100
+@@ -212,6 +212,9 @@ static Distro::DistroType DetectDistro(l

    if (VFS.exists("/etc/gentoo-release"))
      return Distro::Gentoo;
  
    if (VFS.exists("/etc/gentoo-release"))
      return Distro::Gentoo;
  


@@ -33,18 +33,18 @@ diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/Distro.cpp llv
    return Distro::UnknownDistro;
  }
  
    return Distro::UnknownDistro;
  }
  

-diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp llvm-19.1.5.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp
---- llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp      2024-12-03 08:46:10.000000000 +0100
-+++ llvm-19.1.5.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp  2024-12-23 14:15:31.732367771 +0100
-@@ -2463,6 +2463,7 @@ void Generic_GCC::GCCInstallationDetecto
+diff -urNp -x '*.orig' llvm-21.1.8.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp llvm-21.1.8.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp
+--- llvm-21.1.8.src.org/tools/clang/lib/Driver/ToolChains/Gnu.cpp      2025-12-12 11:35:47.000000000 +0100
++++ llvm-21.1.8.src/tools/clang/lib/Driver/ToolChains/Gnu.cpp  2026-01-25 13:20:40.407654242 +0100
+@@ -2339,6 +2339,7 @@ void Generic_GCC::GCCInstallationDetecto

    // lists should shrink over time. Please don't add more elements to *Triples.
    static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
    static const char *const AArch64Triples[] = {
 +      "aarch64-tld-linux",
    // lists should shrink over time. Please don't add more elements to *Triples.
    static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
    static const char *const AArch64Triples[] = {
 +      "aarch64-tld-linux",

-       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
-       "aarch64-suse-linux"};
+       "aarch64-none-linux-gnu", "aarch64-redhat-linux", "aarch64-suse-linux"};

    static const char *const AArch64beLibDirs[] = {"/lib"};
    static const char *const AArch64beLibDirs[] = {"/lib"};

-@@ -2488,6 +2489,7 @@ void Generic_GCC::GCCInstallationDetecto
+   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu"};
+@@ -2363,6 +2364,7 @@ void Generic_GCC::GCCInstallationDetecto

  
    static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
    static const char *const X86_64Triples[] = {
  
    static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
    static const char *const X86_64Triples[] = {


@@ -52,7 +52,7 @@ diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Gnu
        "x86_64-linux-gnu",       "x86_64-unknown-linux-gnu",
        "x86_64-pc-linux-gnu",    "x86_64-redhat-linux6E",
        "x86_64-redhat-linux",    "x86_64-suse-linux",
        "x86_64-linux-gnu",       "x86_64-unknown-linux-gnu",
        "x86_64-pc-linux-gnu",    "x86_64-redhat-linux6E",
        "x86_64-redhat-linux",    "x86_64-suse-linux",

-@@ -2498,6 +2500,7 @@ void Generic_GCC::GCCInstallationDetecto
+@@ -2373,6 +2375,7 @@ void Generic_GCC::GCCInstallationDetecto

    static const char *const X32LibDirs[] = {"/libx32", "/lib"};
    static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {
    static const char *const X32LibDirs[] = {"/libx32", "/lib"};
    static const char *const X86LibDirs[] = {"/lib32", "/lib"};
    static const char *const X86Triples[] = {


@@ -60,10 +60,10 @@ diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Gnu
        "i586-linux-gnu",      "i686-linux-gnu",        "i686-pc-linux-gnu",
        "i386-redhat-linux6E", "i686-redhat-linux",     "i386-redhat-linux",
        "i586-suse-linux",     "i686-montavista-linux",
        "i586-linux-gnu",      "i686-linux-gnu",        "i686-pc-linux-gnu",
        "i386-redhat-linux6E", "i686-redhat-linux",     "i386-redhat-linux",
        "i586-suse-linux",     "i686-montavista-linux",

-diff -urNp -x '*.orig' llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp llvm-19.1.5.src/tools/clang/lib/Driver/ToolChains/Linux.cpp
---- llvm-19.1.5.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp    2024-12-03 08:46:10.000000000 +0100
-+++ llvm-19.1.5.src/tools/clang/lib/Driver/ToolChains/Linux.cpp        2024-12-23 14:15:31.732367771 +0100
-@@ -234,7 +234,7 @@ Linux::Linux(const Driver &D, const llvm
+diff -urNp -x '*.orig' llvm-21.1.8.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp llvm-21.1.8.src/tools/clang/lib/Driver/ToolChains/Linux.cpp
+--- llvm-21.1.8.src.org/tools/clang/lib/Driver/ToolChains/Linux.cpp    2025-12-12 11:35:47.000000000 +0100
++++ llvm-21.1.8.src/tools/clang/lib/Driver/ToolChains/Linux.cpp        2026-01-25 13:20:40.407654242 +0100
+@@ -227,7 +227,7 @@ Linux::Linux(const Driver &D, const llvm

      ExtraOpts.push_back("now");
    }
  
      ExtraOpts.push_back("now");
    }
  

diff --git a/llvm.spec b/llvm.spec
index 3a13e21b90d3a1b42f21ff6eb06b62c1e8fb3805..7aadaab634cfc34975c734e79eb8e3264113a499 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -50,6 +50,7 @@
 %bcond_without target_powerpc          # PowerPC target support
 %bcond_without target_riscv            # RISCV target support
 %bcond_without target_sparc            # Sparc target support
 %bcond_without target_powerpc          # PowerPC target support
 %bcond_without target_riscv            # RISCV target support
 %bcond_without target_sparc            # Sparc target support

+%bcond_without target_spirv            # SPIR-V target support

 %bcond_without target_systemz          # SystemZ target support
 %bcond_without target_ve               # VE target support
 %bcond_without target_webassembly      # WebAssembly target support
 %bcond_without target_systemz          # SystemZ target support
 %bcond_without target_ve               # VE target support
 %bcond_without target_webassembly      # WebAssembly target support


@@ -73,7 +74,7 @@
 %define                with_libatomic  1
 %endif
 
 %define                with_libatomic  1
 %endif
 

-%define                targets_to_build        %{?with_target_aarch64:AArch64;}%{?with_target_amdgpu:AMDGPU;}%{?with_target_arm:ARM;}%{?with_target_avr:AVR;}%{?with_target_bpf:BPF;}%{?with_target_hexagon:Hexagon;}%{?with_target_lanai:Lanai;}%{?with_target_loongarch:LoongArch;}%{?with_target_mips:Mips;}%{?with_target_msp430:MSP430;}%{?with_target_nvptx:NVPTX;}%{?with_target_powerpc:PowerPC;}%{?with_target_riscv:RISCV;}%{?with_target_sparc:Sparc;}%{?with_target_systemz:SystemZ;}%{?with_target_ve:VE;}%{?with_target_webassembly:WebAssembly;}%{?with_target_x86:X86;}%{?with_target_xcore:XCore;}
+%define                targets_to_build        %{?with_target_aarch64:AArch64;}%{?with_target_amdgpu:AMDGPU;}%{?with_target_arm:ARM;}%{?with_target_avr:AVR;}%{?with_target_bpf:BPF;}%{?with_target_hexagon:Hexagon;}%{?with_target_lanai:Lanai;}%{?with_target_loongarch:LoongArch;}%{?with_target_mips:Mips;}%{?with_target_msp430:MSP430;}%{?with_target_nvptx:NVPTX;}%{?with_target_powerpc:PowerPC;}%{?with_target_riscv:RISCV;}%{?with_target_sparc:Sparc;}%{?with_target_spirv:SPIRV;}%{?with_target_systemz:SystemZ;}%{?with_target_ve:VE;}%{?with_target_webassembly:WebAssembly;}%{?with_target_x86:X86;}%{?with_target_xcore:XCore;}

 
 %if %{without mlir}
 %undefine      with_flang
 
 %if %{without mlir}
 %undefine      with_flang


@@ -82,31 +83,33 @@
 Summary:       The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
 Summary(pl.UTF-8):     Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
 Name:          llvm
 Summary:       The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
 Summary(pl.UTF-8):     Niskopoziomowa maszyna wirtualna (infrastruktura kompilatora optymalizującego)
 Name:          llvm

-Version:       19.1.7
-Release:       2
+Version:       21.1.8
+Release:       1

 License:       Apache 2.0 with LLVM exceptions
 Group:         Development/Languages
 #Source0Download: https://github.com/llvm/llvm-project/releases/
 Source0:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz
 License:       Apache 2.0 with LLVM exceptions
 Group:         Development/Languages
 #Source0Download: https://github.com/llvm/llvm-project/releases/
 Source0:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz

-# Source0-md5: 45229744809103ad151e3757a0f21d3d
+# Source0-md5: a45a3d91b0b178759b5ee86be81e1ca1

 Source1:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/clang-%{version}.src.tar.xz
 Source1:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/clang-%{version}.src.tar.xz

-# Source1-md5: 8a29181acd27b9c03b0039b75f5fcaa0
+# Source1-md5: 0e76ea8303e5a44d482773ad339c97d1

 Source2:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/compiler-rt-%{version}.src.tar.xz
 Source2:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/compiler-rt-%{version}.src.tar.xz

-# Source2-md5: 0286b00ef3057362eb0636d3298999b1
+# Source2-md5: 4659411fe5f4d78fc987ad7be6318b27

 Source3:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/lldb-%{version}.src.tar.xz
 Source3:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/lldb-%{version}.src.tar.xz

-# Source3-md5: 211a74d57e1c448c8edaef854ee8dd53
+# Source3-md5: 680789b0ce943ee2e748114af6ca36da

 Source4:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/polly-%{version}.src.tar.xz
 Source4:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/polly-%{version}.src.tar.xz

-# Source4-md5: bd932e941bd8f295c77628c523a49a4d
+# Source4-md5: 1539ceb349f2b77f0f8907cdac4b09d8

 Source5:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/clang-tools-extra-%{version}.src.tar.xz
 Source5:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/clang-tools-extra-%{version}.src.tar.xz

-# Source5-md5: 620832c02d18dd787a6aaa1e8c94e028
+# Source5-md5: dbb86fa59ef328d6b23687a49b3620eb

 Source6:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/lld-%{version}.src.tar.xz
 Source6:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/lld-%{version}.src.tar.xz

-# Source6-md5: fb21e57090e30d49dac086be8a096333
+# Source6-md5: 34bb961f36affaf7803ddee018a3915f

 Source7:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/flang-%{version}.src.tar.xz
 Source7:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/flang-%{version}.src.tar.xz

-# Source7-md5: 36fa59ff1d528f43a39bc624c91fc07e
+# Source7-md5: 3764a712fa4fbc93f5b705a63b0b7921

 Source8:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/mlir-%{version}.src.tar.xz
 Source8:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/mlir-%{version}.src.tar.xz

-# Source8-md5: a8efce91e8d6fb357c0159cf84f8859d
+# Source8-md5: 4061035d40edda58499b270f6d9d4ea3

 Source9:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/cmake-%{version}.src.tar.xz
 Source9:       https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/cmake-%{version}.src.tar.xz

-# Source9-md5: 52b5249a06305e19c3bdae2e972c99c3
+# Source9-md5: fb75e927effbedba72de1f421154fd0c
+Source10:      https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/third-party-%{version}.src.tar.xz
+# Source10-md5:        4cad220587e039a2ff9465766c018621

 Patch1:                %{name}-tld.patch
 Patch2:                %{name}-ocaml-link-dylib.patch
 Patch3:                x32-gcc-toolchain.patch
 Patch1:                %{name}-tld.patch
 Patch2:                %{name}-ocaml-link-dylib.patch
 Patch3:                x32-gcc-toolchain.patch


@@ -118,7 +121,7 @@ Patch9:             %{name}-libexecdir.patch
 Patch10:       compiler-rt-paths.patch
 Patch11:       cmake-utils-path-override.patch
 Patch12:       x32-compiler-rt.patch
 Patch10:       compiler-rt-paths.patch
 Patch11:       cmake-utils-path-override.patch
 Patch12:       x32-compiler-rt.patch

-Patch13:       cstdint.patch
+Patch13:       lldb-headers-dir.patch

 URL:           https://llvm.org/
 BuildRequires: bash
 BuildRequires: binutils-devel
 URL:           https://llvm.org/
 BuildRequires: bash
 BuildRequires: binutils-devel


@@ -209,7 +212,7 @@ Requires:   %{name}-libs = %{version}-%{release}
 ExcludeArch:   ppc64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 ExcludeArch:   ppc64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define                abi     19.1
+%define                abi     21.1

 %define                _sysconfdir     /etc/%{name}
 
 %define                specflags_ppc   -fno-var-tracking-assignments
 %define                _sysconfdir     /etc/%{name}
 
 %define                specflags_ppc   -fno-var-tracking-assignments


@@ -217,7 +220,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # objcopy: BFD (GNU Binutils) 2.32 assertion fail format.c:459
 # objcopy: error: .../libLLVM-8.so(.debug_gnu_pubtypes) is too large (0x1ceee347 bytes)
 # objcopy: .../libLLVM-8.so[.debug_gnu_pubtypes]: memory exhausted
 # objcopy: BFD (GNU Binutils) 2.32 assertion fail format.c:459
 # objcopy: error: .../libLLVM-8.so(.debug_gnu_pubtypes) is too large (0x1ceee347 bytes)
 # objcopy: .../libLLVM-8.so[.debug_gnu_pubtypes]: memory exhausted

-%ifarch x32
+%ifarch %{ix86} x32

 %define                _enable_debug_packages  0
 %endif
 # ix86 and x32 - the same issue as https://llvm.org/bugs/show_bug.cgi?id=27237
 %define                _enable_debug_packages  0
 %endif
 # ix86 and x32 - the same issue as https://llvm.org/bugs/show_bug.cgi?id=27237


@@ -682,7 +685,7 @@ Clang format and rename integration for Vim.
 Integracja narzędzi Clang do formatowania i zmiany nazw z Vimem.
 
 %prep
 Integracja narzędzi Clang do formatowania i zmiany nazw z Vimem.
 
 %prep

-%setup -q -n %{name}-%{version}.src -a1 %{?with_rt:-a2} %{?with_lldb:-a3} %{?with_polly:-a4} -a5 -a6 %{?with_flang:-a7} %{?with_mlir:-a8} -a9
+%setup -q -n %{name}-%{version}.src -a1 %{?with_rt:-a2} %{?with_lldb:-a3} %{?with_polly:-a4} -a5 -a6 %{?with_flang:-a7} %{?with_mlir:-a8} -a9 -a10

 %{__mv} clang-%{version}.src tools/clang
 %{?with_rt:%{__mv} compiler-rt-%{version}.src projects/compiler-rt}
 %{?with_lldb:%{__mv} lldb-%{version}.src tools/lldb}
 %{__mv} clang-%{version}.src tools/clang
 %{?with_rt:%{__mv} compiler-rt-%{version}.src projects/compiler-rt}
 %{?with_lldb:%{__mv} lldb-%{version}.src tools/lldb}


@@ -696,23 +699,24 @@ Integracja narzędzi Clang do formatowania i zmiany nazw z Vimem.
 %{__mv} mlir-%{version}.src tools/mlir
 %endif
 %{__mv} cmake-%{version}.src cmake-utils
 %{__mv} mlir-%{version}.src tools/mlir
 %endif
 %{__mv} cmake-%{version}.src cmake-utils

+%{__mv} third-party-%{version}.src projects/third-party

 
 

-%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P5 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 5 -p1

 %if %{with flang}
 %if %{with flang}

-%patch -P6 -p1
+%patch -P 6 -p1

 %endif
 %endif

-%patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1

 %if %{with rt}
 %if %{with rt}

-%patch -P10 -p1
-%patch -P12 -p1
+%patch -P 10 -p1
+%patch -P 12 -p1

 %endif
 %endif

-%patch -P11 -p1
-%patch -P13 -p1
+%patch -P 11 -p1
+%{?with_lldb:%patch -P 13 -p1 -d tools/lldb}

 
 grep -rl /usr/bin/env projects tools utils | xargs sed -i -e '1{
        s,^#!.*bin/env python3\?,#!%{__python3},
 
 grep -rl /usr/bin/env projects tools utils | xargs sed -i -e '1{
        s,^#!.*bin/env python3\?,#!%{__python3},


@@ -748,6 +752,7 @@ fi
        -DENABLE_LINKER_BUILD_ID:BOOL=ON \
        -DLLVM_ADDITIONAL_BUILD_TYPES=TLD \
        -DLLVM_COMMON_CMAKE_UTILS="%{_builddir}/%{buildsubdir}/cmake-utils" \
        -DENABLE_LINKER_BUILD_ID:BOOL=ON \
        -DLLVM_ADDITIONAL_BUILD_TYPES=TLD \
        -DLLVM_COMMON_CMAKE_UTILS="%{_builddir}/%{buildsubdir}/cmake-utils" \

+       -DLLVM_THIRD_PARTY_DIR="$(pwd)/../projects/third-party" \

        -DLLVM_BINDINGS_LIST:LIST="%{?with_ocaml:ocaml}" \
        -DLLVM_BINUTILS_INCDIR:STRING=%{_includedir} \
        -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \
        -DLLVM_BINDINGS_LIST:LIST="%{?with_ocaml:ocaml}" \
        -DLLVM_BINUTILS_INCDIR:STRING=%{_includedir} \
        -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \


@@ -861,7 +866,7 @@ cp -a build/tools/clang/docs/html clang-apidoc
 # And prepare Clang documentation
 rm -rf clang-docs
 install -d clang-docs
 # And prepare Clang documentation
 rm -rf clang-docs
 install -d clang-docs

-for f in LICENSE.TXT NOTES.txt README.txt; do
+for f in LICENSE.TXT NOTES.txt README.md; do

        ln tools/clang/$f clang-docs
 done
 
        ln tools/clang/$f clang-docs
 done
 


@@ -919,7 +924,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/llvm-c-test
 %attr(755,root,root) %{_bindir}/llvm-cat
 %attr(755,root,root) %{_bindir}/llvm-cfi-verify
 %attr(755,root,root) %{_bindir}/llvm-c-test
 %attr(755,root,root) %{_bindir}/llvm-cat
 %attr(755,root,root) %{_bindir}/llvm-cfi-verify

+%attr(755,root,root) %{_bindir}/llvm-cgdata

 %attr(755,root,root) %{_bindir}/llvm-cov
 %attr(755,root,root) %{_bindir}/llvm-cov

+%attr(755,root,root) %{_bindir}/llvm-ctxprof-util

 %attr(755,root,root) %{_bindir}/llvm-cvtres
 %attr(755,root,root) %{_bindir}/llvm-cxxdump
 %attr(755,root,root) %{_bindir}/llvm-cxxfilt
 %attr(755,root,root) %{_bindir}/llvm-cvtres
 %attr(755,root,root) %{_bindir}/llvm-cxxdump
 %attr(755,root,root) %{_bindir}/llvm-cxxfilt


@@ -948,6 +955,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/llvm-mc
 %attr(755,root,root) %{_bindir}/llvm-mca
 %attr(755,root,root) %{_bindir}/llvm-ml
 %attr(755,root,root) %{_bindir}/llvm-mc
 %attr(755,root,root) %{_bindir}/llvm-mca
 %attr(755,root,root) %{_bindir}/llvm-ml

+%{_bindir}/llvm-ml64

 %attr(755,root,root) %{_bindir}/llvm-modextract
 %attr(755,root,root) %{_bindir}/llvm-mt
 %attr(755,root,root) %{_bindir}/llvm-nm
 %attr(755,root,root) %{_bindir}/llvm-modextract
 %attr(755,root,root) %{_bindir}/llvm-mt
 %attr(755,root,root) %{_bindir}/llvm-nm


@@ -994,6 +1002,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/llvm-ar.1*
 %{_mandir}/man1/llvm-as.1*
 %{_mandir}/man1/llvm-bcanalyzer.1*
 %{_mandir}/man1/llvm-ar.1*
 %{_mandir}/man1/llvm-as.1*
 %{_mandir}/man1/llvm-bcanalyzer.1*

+%{_mandir}/man1/llvm-cgdata.1*

 %{_mandir}/man1/llvm-cov.1*
 %{_mandir}/man1/llvm-cxxfilt.1*
 %{_mandir}/man1/llvm-cxxmap.1*
 %{_mandir}/man1/llvm-cov.1*
 %{_mandir}/man1/llvm-cxxfilt.1*
 %{_mandir}/man1/llvm-cxxmap.1*


@@ -1040,11 +1049,11 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/LLVMgold.so
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/LLVMgold.so

-%attr(755,root,root) %{_libdir}/libLLVM-19.so
+%attr(755,root,root) %{_libdir}/libLLVM-21.so

 %attr(755,root,root) %{_libdir}/libLLVM.so.%{abi}
 %attr(755,root,root) %{_libdir}/libLLVM.so.%{abi}

-%attr(755,root,root) %{_libdir}/libLTO.so.19.1
-%attr(755,root,root) %{_libdir}/libRemarks.so.19.1
-%attr(755,root,root) %{_libdir}/libclang-cpp.so.19.1
+%attr(755,root,root) %{_libdir}/libLTO.so.21.1
+%attr(755,root,root) %{_libdir}/libRemarks.so.21.1
+%attr(755,root,root) %{_libdir}/libclang-cpp.so.21.1

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)


@@ -1071,28 +1080,29 @@ rm -rf $RPM_BUILD_ROOT
 %files mlir
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mlir-cat
 %files mlir
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mlir-cat

-%attr(755,root,root) %{_bindir}/mlir-cpu-runner

 %attr(755,root,root) %{_bindir}/mlir-linalg-ods-yaml-gen
 %attr(755,root,root) %{_bindir}/mlir-lsp-server
 %attr(755,root,root) %{_bindir}/mlir-minimal-opt
 %attr(755,root,root) %{_bindir}/mlir-minimal-opt-canonicalize
 %attr(755,root,root) %{_bindir}/mlir-opt
 %attr(755,root,root) %{_bindir}/mlir-pdll
 %attr(755,root,root) %{_bindir}/mlir-linalg-ods-yaml-gen
 %attr(755,root,root) %{_bindir}/mlir-lsp-server
 %attr(755,root,root) %{_bindir}/mlir-minimal-opt
 %attr(755,root,root) %{_bindir}/mlir-minimal-opt-canonicalize
 %attr(755,root,root) %{_bindir}/mlir-opt
 %attr(755,root,root) %{_bindir}/mlir-pdll

-%attr(755,root,root) %{_bindir}/mlir-pdll-lsp-server*
+%attr(755,root,root) %{_bindir}/mlir-pdll-lsp-server

 %attr(755,root,root) %{_bindir}/mlir-query
 %attr(755,root,root) %{_bindir}/mlir-reduce
 %attr(755,root,root) %{_bindir}/mlir-query
 %attr(755,root,root) %{_bindir}/mlir-reduce

+%attr(755,root,root) %{_bindir}/mlir-rewrite
+%attr(755,root,root) %{_bindir}/mlir-runner

 %attr(755,root,root) %{_bindir}/mlir-tblgen
 %attr(755,root,root) %{_bindir}/mlir-transform-opt
 %attr(755,root,root) %{_bindir}/mlir-translate
 %attr(755,root,root) %{_bindir}/tblgen-to-irdl
 %attr(755,root,root) %{_bindir}/mlir-tblgen
 %attr(755,root,root) %{_bindir}/mlir-transform-opt
 %attr(755,root,root) %{_bindir}/mlir-translate
 %attr(755,root,root) %{_bindir}/tblgen-to-irdl

-%attr(755,root,root) %{_libdir}/libMLIR.so.19.1
-%attr(755,root,root) %{_libdir}/libMLIRExecutionEngineShared.so.19.1
-%attr(755,root,root) %{_libdir}/libmlir_arm_runner_utils.so.19.1
-%attr(755,root,root) %{_libdir}/libmlir_arm_sme_abi_stubs.so.19.1
-%attr(755,root,root) %{_libdir}/libmlir_async_runtime.so.19.1
-%attr(755,root,root) %{_libdir}/libmlir_c_runner_utils.so.19.1
-%attr(755,root,root) %{_libdir}/libmlir_float16_utils.so.19.1
-%attr(755,root,root) %{_libdir}/libmlir_runner_utils.so.19.1
+%attr(755,root,root) %{_libdir}/libMLIR.so.21.1
+%attr(755,root,root) %{_libdir}/libMLIRExecutionEngineShared.so.21.1
+%attr(755,root,root) %{_libdir}/libmlir_arm_runner_utils.so.21.1
+%attr(755,root,root) %{_libdir}/libmlir_arm_sme_abi_stubs.so.21.1
+%attr(755,root,root) %{_libdir}/libmlir_async_runtime.so.21.1
+%attr(755,root,root) %{_libdir}/libmlir_c_runner_utils.so.21.1
+%attr(755,root,root) %{_libdir}/libmlir_float16_utils.so.21.1
+%attr(755,root,root) %{_libdir}/libmlir_runner_utils.so.21.1

 %if %{with doc}
 %{_mandir}/man1/mlir-tblgen.1*
 %endif
 %if %{with doc}
 %{_mandir}/man1/mlir-tblgen.1*
 %endif


@@ -1129,11 +1139,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n clang
 %defattr(644,root,root,755)
 
 %files -n clang
 %defattr(644,root,root,755)

-%doc clang-docs/{LICENSE.TXT,NOTES.txt,README.txt} %{?with_tests:clang-testlog.txt}
+%doc clang-docs/{LICENSE.TXT,NOTES.txt,README.md} %{?with_tests:clang-testlog.txt}

 %attr(755,root,root) %{_bindir}/amdgpu-arch
 %attr(755,root,root) %{_bindir}/clang
 %attr(755,root,root) %{_bindir}/clang++
 %attr(755,root,root) %{_bindir}/amdgpu-arch
 %attr(755,root,root) %{_bindir}/clang
 %attr(755,root,root) %{_bindir}/clang++

-%attr(755,root,root) %{_bindir}/clang-19
+%attr(755,root,root) %{_bindir}/clang-21

 %attr(755,root,root) %{_bindir}/clang-check
 %attr(755,root,root) %{_bindir}/clang-cl
 %attr(755,root,root) %{_bindir}/clang-cpp
 %attr(755,root,root) %{_bindir}/clang-check
 %attr(755,root,root) %{_bindir}/clang-cl
 %attr(755,root,root) %{_bindir}/clang-cpp


@@ -1144,111 +1154,115 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/clang-nvlink-wrapper
 %attr(755,root,root) %{_bindir}/clang-offload-bundler
 %attr(755,root,root) %{_bindir}/clang-offload-packager
 %attr(755,root,root) %{_bindir}/clang-nvlink-wrapper
 %attr(755,root,root) %{_bindir}/clang-offload-bundler
 %attr(755,root,root) %{_bindir}/clang-offload-packager

-%attr(755,root,root) %{_bindir}/clang-pseudo

 %attr(755,root,root) %{_bindir}/clang-repl
 %attr(755,root,root) %{_bindir}/clang-repl

+%attr(755,root,root) %{_bindir}/clang-sycl-linker

 %attr(755,root,root) %{_bindir}/clang-tblgen
 %attr(755,root,root) %{_bindir}/git-clang-format
 %attr(755,root,root) %{_bindir}/nvptx-arch
 %attr(755,root,root) %{_bindir}/clang-tblgen
 %attr(755,root,root) %{_bindir}/git-clang-format
 %attr(755,root,root) %{_bindir}/nvptx-arch

+%attr(755,root,root) %{_bindir}/offload-arch

 %dir %{_libdir}/clang
 %dir %{_libdir}/clang

-%dir %{_libdir}/clang/19
-%{_libdir}/clang/19/include
+%dir %{_libdir}/clang/21
+%{_libdir}/clang/21/include

 %if %{with rt}
 %ifarch %{x8664} x32 aarch64
 %if %{with rt}
 %ifarch %{x8664} x32 aarch64

-%dir %{_libdir}/clang/19/bin
-%attr(755,root,root) %{_libdir}/clang/19/bin/hwasan_symbolize
+%dir %{_libdir}/clang/21/bin
+%attr(755,root,root) %{_libdir}/clang/21/bin/hwasan_symbolize

 %endif
 %ifarch %{ix86} %{x8664} aarch64 %{armv7}
 %endif
 %ifarch %{ix86} %{x8664} aarch64 %{armv7}

-%dir %{_libdir}/clang/19/lib
-%dir %{_libdir}/clang/19/lib/*-linux*
-%dir %{_libdir}/clang/19/share
+%dir %{_libdir}/clang/21/lib
+%dir %{_libdir}/clang/21/lib/*-linux*
+%dir %{_libdir}/clang/21/share

 %endif
 %ifarch x32
 %if %{with multilib}
 %endif
 %ifarch x32
 %if %{with multilib}

-%dir %{_libdir}/clang/19/lib
-%dir %{_libdir}/clang/19/lib/*-linux*
-%dir %{_libdir}/clang/19/share
+%dir %{_libdir}/clang/21/lib
+%dir %{_libdir}/clang/21/lib/*-linux*
+%dir %{_libdir}/clang/21/share

 %endif
 %endif
 %ifarch %{ix86}
 %endif
 %endif
 %ifarch %{ix86}

-%{_libdir}/clang/19/lib/i*86-*linux/clang_rt.*.o
-%{_libdir}/clang/19/lib/i*86-*linux/libclang_rt.*.a
-%attr(755,root,root) %{_libdir}/clang/19/lib/i*86-*linux/libclang_rt.*.so
+%{_libdir}/clang/21/lib/i*86-*linux/clang_rt.*.o
+%{_libdir}/clang/21/lib/i*86-*linux/libclang_rt.*.a
+%attr(755,root,root) %{_libdir}/clang/21/lib/i*86-*linux/libclang_rt.*.so

 %endif
 %ifarch %{x8664}
 %endif
 %ifarch %{x8664}

-%{_libdir}/clang/19/lib/x86_64-*linux/clang_rt.*.o
-%{_libdir}/clang/19/lib/x86_64-*linux/libclang_rt.*.a
-%attr(755,root,root) %{_libdir}/clang/19/lib/x86_64-*linux/libclang_rt.*.so
-%{_libdir}/clang/19/lib/x86_64-*linux/libclang_rt.*.a.syms
-%{_libdir}/clang/19/lib/x86_64-*linux/liborc_rt.a
+%{_libdir}/clang/21/lib/x86_64-*linux/clang_rt.*.o
+%{_libdir}/clang/21/lib/x86_64-*linux/libclang_rt.*.a
+%attr(755,root,root) %{_libdir}/clang/21/lib/x86_64-*linux/libclang_rt.*.so
+%{_libdir}/clang/21/lib/x86_64-*linux/libclang_rt.*.a.syms
+%{_libdir}/clang/21/lib/x86_64-*linux/liborc_rt.a

 %endif
 %ifarch aarch64
 %endif
 %ifarch aarch64

-%{_libdir}/clang/19/lib/aarch64-*linux/clang_rt.*.o
-%{_libdir}/clang/19/lib/aarch64-*linux/libclang_rt.*.a
-%attr(755,root,root) %{_libdir}/clang/19/lib/aarch64-*linux/libclang_rt.*.so
-%{_libdir}/clang/19/lib/aarch64-*linux/libclang_rt.*.a.syms
-%{_libdir}/clang/19/lib/aarch64-*linux/liborc_rt.a
+%{_libdir}/clang/21/lib/aarch64-*linux/clang_rt.*.o
+%{_libdir}/clang/21/lib/aarch64-*linux/libclang_rt.*.a
+%attr(755,root,root) %{_libdir}/clang/21/lib/aarch64-*linux/libclang_rt.*.so
+%{_libdir}/clang/21/lib/aarch64-*linux/libclang_rt.*.a.syms
+%{_libdir}/clang/21/lib/aarch64-*linux/liborc_rt.a

 %endif
 %ifarch %{armv7}
 %ifarch %{arm32_with_hf}
 %endif
 %ifarch %{armv7}
 %ifarch %{arm32_with_hf}

-%{_libdir}/clang/19/lib/arm-*linux%{_gnu}hf/clang_rt.*.o
-%{_libdir}/clang/19/lib/arm-*linux%{_gnu}hf/libclang_rt.*.a
-%attr(755,root,root) %{_libdir}/clang/19/lib/arm-*linux%{_gnu}hf/libclang_rt.*.so
-%{_libdir}/clang/19/lib/arm-*linux%{_gnu}hf/libclang_rt.*.a.syms
-%{_libdir}/clang/19/lib/arm-*linux%{_gnu}hf/liborc_rt.a
+%{_libdir}/clang/21/lib/arm-*linux%{_gnu}hf/clang_rt.*.o
+%{_libdir}/clang/21/lib/arm-*linux%{_gnu}hf/libclang_rt.*.a
+%attr(755,root,root) %{_libdir}/clang/21/lib/arm-*linux%{_gnu}hf/libclang_rt.*.so
+%{_libdir}/clang/21/lib/arm-*linux%{_gnu}hf/libclang_rt.*.a.syms
+%{_libdir}/clang/21/lib/arm-*linux%{_gnu}hf/liborc_rt.a

 %else
 %else

-%{_libdir}/clang/19/lib/arm-*linux%{_gnu}/clang_rt.*.o
-%{_libdir}/clang/19/lib/arm-*linux%{_gnu}/libclang_rt.*.a
-%attr(755,root,root) %{_libdir}/clang/19/lib/arm-*linux%{_gnu}/libclang_rt.*.so
-%{_libdir}/clang/19/lib/arm-*linux%{_gnu}/libclang_rt.*.a.syms
-%{_libdir}/clang/19/lib/arm-*linux%{_gnu}/liborc_rt.a
+%{_libdir}/clang/21/lib/arm-*linux%{_gnu}/clang_rt.*.o
+%{_libdir}/clang/21/lib/arm-*linux%{_gnu}/libclang_rt.*.a
+%attr(755,root,root) %{_libdir}/clang/21/lib/arm-*linux%{_gnu}/libclang_rt.*.so
+%{_libdir}/clang/21/lib/arm-*linux%{_gnu}/libclang_rt.*.a.syms
+%{_libdir}/clang/21/lib/arm-*linux%{_gnu}/liborc_rt.a

 %endif
 %endif
 %ifarch %{ix86} %{x8664} %{arm} aarch64 mips mips64 ppc64
 %endif
 %endif
 %ifarch %{ix86} %{x8664} %{arm} aarch64 mips mips64 ppc64

-%{_libdir}/clang/19/share/asan_ignorelist.txt
+%{_libdir}/clang/21/share/asan_ignorelist.txt

 %endif
 %ifarch %{ix86} %{x8664} mips64 aarch64 %{armv7}
 %endif
 %ifarch %{ix86} %{x8664} mips64 aarch64 %{armv7}

-%{_libdir}/clang/19/share/cfi_ignorelist.txt
+%{_libdir}/clang/21/share/cfi_ignorelist.txt

 %endif
 %ifarch %{x8664} aarch64 mips64
 %endif
 %ifarch %{x8664} aarch64 mips64

-%{_libdir}/clang/19/share/dfsan_abilist.txt
-%{_libdir}/clang/19/share/msan_ignorelist.txt
+%{_libdir}/clang/21/share/dfsan_abilist.txt
+%{_libdir}/clang/21/share/msan_ignorelist.txt

 %endif
 %ifarch %{x8664} aarch64
 %endif
 %ifarch %{x8664} aarch64

-%{_libdir}/clang/19/share/hwasan_ignorelist.txt
+%{_libdir}/clang/21/share/hwasan_ignorelist.txt

 %endif
 %ifarch x32
 %if %{with multilib}
 %endif
 %ifarch x32
 %if %{with multilib}

-%{_libdir}/clang/19/share/asan_ignorelist.txt
-%{_libdir}/clang/19/share/cfi_ignorelist.txt
-%{_libdir}/clang/19/share/dfsan_abilist.txt
-%{_libdir}/clang/19/share/msan_ignorelist.txt
-%{_libdir}/clang/19/share/hwasan_ignorelist.txt
+%{_libdir}/clang/21/share/asan_ignorelist.txt
+%{_libdir}/clang/21/share/cfi_ignorelist.txt
+%{_libdir}/clang/21/share/dfsan_abilist.txt
+%{_libdir}/clang/21/share/msan_ignorelist.txt
+%{_libdir}/clang/21/share/hwasan_ignorelist.txt

 %endif
 %endif
 %endif
 %dir %{_datadir}/clang
 %{_datadir}/clang/clang-format-diff.py
 %endif
 %endif
 %endif
 %dir %{_datadir}/clang
 %{_datadir}/clang/clang-format-diff.py

+%dir %{_datadir}/clang-doc
+%{_datadir}/clang-doc/clang-doc-default-stylesheet.css
+%{_datadir}/clang-doc/index.js

 
 %if %{with rt} && %{with multilib}
 %ifarch %{x8664} x32
 %files -n clang-multilib
 %defattr(644,root,root,755)
 
 %if %{with rt} && %{with multilib}
 %ifarch %{x8664} x32
 %files -n clang-multilib
 %defattr(644,root,root,755)

-%{_libdir}/clang/19/lib/i386-*linux/clang_rt.*.o
-%{_libdir}/clang/19/lib/i386-*linux/libclang_rt.*.a
-%attr(755,root,root) %{_libdir}/clang/19/lib/i386-*linux/libclang_rt.*.so
+%{_libdir}/clang/21/lib/i386-*linux/clang_rt.*.o
+%{_libdir}/clang/21/lib/i386-*linux/libclang_rt.*.a
+%attr(755,root,root) %{_libdir}/clang/21/lib/i386-*linux/libclang_rt.*.so

 %endif
 %ifarch x32
 %endif
 %ifarch x32

-%{_libdir}/clang/19/lib/x86_64-*linux/clang_rt.*.o
-%{_libdir}/clang/19/lib/x86_64-*linux/libclang_rt.*.a
-%attr(755,root,root) %{_libdir}/clang/19/lib/x86_64-*linux/libclang_rt.*.so
-%{_libdir}/clang/19/lib/x86_64-*linux/libclang_rt.*.a.syms
-%{_libdir}/clang/19/lib/x86_64-*linux/liborc_rt.a
+%{_libdir}/clang/21/lib/x86_64-*linux/clang_rt.*.o
+%{_libdir}/clang/21/lib/x86_64-*linux/libclang_rt.*.a
+%attr(755,root,root) %{_libdir}/clang/21/lib/x86_64-*linux/libclang_rt.*.so
+%{_libdir}/clang/21/lib/x86_64-*linux/libclang_rt.*.a.syms
+%{_libdir}/clang/21/lib/x86_64-*linux/liborc_rt.a

 %endif
 %endif
 
 %files -n clang-libs
 %defattr(644,root,root,755)
 %endif
 %endif
 
 %files -n clang-libs
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libdir}/libclang.so.19.1
+%attr(755,root,root) %{_libdir}/libclang.so.21.1

 %attr(755,root,root) %{_libdir}/libclang.so.*.*.*
 
 %files -n clang-devel
 %attr(755,root,root) %{_libdir}/libclang.so.*.*.*
 
 %files -n clang-devel


@@ -1294,7 +1308,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n clang-tools-extra
 %defattr(644,root,root,755)
 
 %files -n clang-tools-extra
 %defattr(644,root,root,755)

-%doc tools/clang/tools/extra/{CODE_OWNERS.TXT,README.txt}
+%doc tools/clang/tools/extra/README.txt

 %attr(755,root,root) %{_bindir}/clang-apply-replacements
 %attr(755,root,root) %{_bindir}/clang-change-namespace
 %attr(755,root,root) %{_bindir}/clang-extdef-mapping
 %attr(755,root,root) %{_bindir}/clang-apply-replacements
 %attr(755,root,root) %{_bindir}/clang-change-namespace
 %attr(755,root,root) %{_bindir}/clang-extdef-mapping


@@ -1303,7 +1317,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/clang-move
 %attr(755,root,root) %{_bindir}/clang-query
 %attr(755,root,root) %{_bindir}/clang-refactor
 %attr(755,root,root) %{_bindir}/clang-move
 %attr(755,root,root) %{_bindir}/clang-query
 %attr(755,root,root) %{_bindir}/clang-refactor

-%attr(755,root,root) %{_bindir}/clang-rename

 %attr(755,root,root) %{_bindir}/clang-reorder-fields
 %attr(755,root,root) %{_bindir}/clang-scan-deps
 %attr(755,root,root) %{_bindir}/clang-tidy
 %attr(755,root,root) %{_bindir}/clang-reorder-fields
 %attr(755,root,root) %{_bindir}/clang-scan-deps
 %attr(755,root,root) %{_bindir}/clang-tidy


@@ -1384,8 +1397,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/lldb-instr
 %attr(755,root,root) %{_bindir}/lldb-server
 %attr(755,root,root) %{_libdir}/liblldb.so.%{version}
 %attr(755,root,root) %{_bindir}/lldb-instr
 %attr(755,root,root) %{_bindir}/lldb-server
 %attr(755,root,root) %{_libdir}/liblldb.so.%{version}

-%attr(755,root,root) %ghost %{_libdir}/liblldb.so.19.1
-%attr(755,root,root) %ghost %{_libdir}/liblldbIntelFeatures.so.19.1
+%attr(755,root,root) %ghost %{_libdir}/liblldb.so.21.1
+%attr(755,root,root) %ghost %{_libdir}/liblldbIntelFeatures.so.21.1

 %dir %{py3_sitedir}/lldb
 %attr(755,root,root) %{py3_sitedir}/lldb/lldb-argdumper
 %{py3_sitedir}/lldb/formatters
 %dir %{py3_sitedir}/lldb
 %attr(755,root,root) %{py3_sitedir}/lldb/lldb-argdumper
 %{py3_sitedir}/lldb/formatters


@@ -1441,4 +1454,3 @@ rm -rf $RPM_BUILD_ROOT
 %files -n vim-plugin-clang
 %defattr(644,root,root,755)
 %{_datadir}/clang/clang-format.py
 %files -n vim-plugin-clang
 %defattr(644,root,root,755)
 %{_datadir}/clang/clang-format.py

-%{_datadir}/clang/clang-rename.py