[rpms/rocm-compilersupport] epel10: Merge branch 'rawhide' into epel10

[Tom Rix <Tom.Rix@amd.com>]

A new commit has been pushed.

Repo   : rpms/rocm-compilersupport
Branch : epel10
Commit : 7adf276658389416d103811cc34bbd22f4e6a80f
Author : Tom Rix <Tom.Rix@amd.com>
Date   : 2026-06-09T16:06:00-07:00
Stats  : +532/-268 in 12 file(s)
URL    : https://src.fedoraproject.org/rpms/rocm-compilersupport/c/7adf276658389416d103811cc34bbd22f4e6a80f?branch=epel10

Log:
Merge branch 'rawhide' into epel10

---
diff --git a/.gitignore b/.gitignore
index aeb6ce5..017b9b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@
 /rocm-compilersupport-7.0.2.tar.gz
 /rocm-compilersupport-7.1.0.tar.gz
 /rocm-compilersupport-7.1.1.tar.gz
+/rocm-compilersupport-7.2.0.tar.gz
+/rocm-compilersupport-7.11.0.tar.gz
+/rocm-compilersupport-7.2.1.tar.gz

diff --git a/0001-SemaConcept.cpp-fix-MSVC-not-all-control-paths-retur.patch b/0001-SemaConcept.cpp-fix-MSVC-not-all-control-paths-retur.patch
new file mode 100644
index 0000000..cba999f
--- /dev/null
+++ b/0001-SemaConcept.cpp-fix-MSVC-not-all-control-paths-retur.patch
@@ -0,0 +1,49 @@
+From 1535da76981c5ee7e9d9897dd0b0a0f53ad20198 Mon Sep 17 00:00:00 2001
+From: Simon Pilgrim <llvm-dev@redking.me.uk>
+Date: Mon, 6 Oct 2025 11:26:51 +0100
+Subject: [PATCH] SemaConcept.cpp - fix MSVC "not all control paths return a
+ value" warnings. NFC. (#162060)
+
+---
+ clang/lib/Sema/SemaConcept.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/clang/lib/Sema/SemaConcept.cpp b/clang/lib/Sema/SemaConcept.cpp
+index 11d2d5c3938c..999e302c0253 100644
+--- a/clang/lib/Sema/SemaConcept.cpp
++++ b/clang/lib/Sema/SemaConcept.cpp
+@@ -1049,6 +1049,7 @@ ExprResult ConstraintSatisfactionChecker::Evaluate(
+   case NormalizedConstraint::ConstraintKind::Compound:
+     return Evaluate(static_cast<const CompoundConstraint &>(Constraint), MLTAL);
+   }
++  llvm_unreachable("Unknown ConstraintKind enum");
+ }
+ 
+ static bool CheckConstraintSatisfaction(
+@@ -2141,6 +2142,7 @@ bool SubstituteParameterMappings::substitute(NormalizedConstraint &N) {
+     return substitute(Compound.getRHS());
+   }
+   }
++  llvm_unreachable("Unknown ConstraintKind enum");
+ }
+ 
+ } // namespace
+@@ -2561,7 +2563,6 @@ FormulaType SubsumptionChecker::Normalize(const NormalizedConstraint &NC) {
+   };
+ 
+   switch (NC.getKind()) {
+-
+   case NormalizedConstraint::ConstraintKind::Atomic:
+     return {{find(&static_cast<const AtomicConstraint &>(NC))}};
+ 
+@@ -2601,6 +2602,7 @@ FormulaType SubsumptionChecker::Normalize(const NormalizedConstraint &NC) {
+     return Res;
+   }
+   }
++  llvm_unreachable("Unknown ConstraintKind enum");
+ }
+ 
+ void SubsumptionChecker::AddUniqueClauseToFormula(Formula &F, Clause C) {
+-- 
+2.52.0
+

diff --git a/0001-clang-23-link-libamdhip64.patch b/0001-clang-23-link-libamdhip64.patch
new file mode 100644
index 0000000..0a02de7
--- /dev/null
+++ b/0001-clang-23-link-libamdhip64.patch
@@ -0,0 +1,36 @@
+From fb17ceb984bdf1af589a73dfbc3d60b6d1ac06b8 Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Tue, 19 May 2026 06:58:33 -0700
+Subject: [PATCH] clang 23 link libamdhip64
+
+---
+ clang/lib/Driver/ToolChains/Linux.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
+index 3d0096d1ff31..2af7accdacfa 100644
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -1096,7 +1096,7 @@ void Linux::addOffloadRTLibs(unsigned ActiveKinds, const ArgList &Args,
+ 
+   llvm::SmallVector<std::pair<StringRef, StringRef>> Libraries;
+   if (ActiveKinds & Action::OFK_HIP)
+-    Libraries.emplace_back(RocmInstallation->getLibPath(), "libamdhip64.so");
++    CmdArgs.push_back("-lamdhip64");
+   else if (ActiveKinds & Action::OFK_SYCL)
+     Libraries.emplace_back(SYCLInstallation->getSYCLRTLibPath(), "libsycl.so");
+ 
+@@ -1113,10 +1113,6 @@ void Linux::addOffloadRTLibs(unsigned ActiveKinds, const ArgList &Args,
+     CmdArgs.push_back(Args.MakeArgString(p));
+   }
+ 
+-  // FIXME: The ROCm builds implicitly depends on this being present.
+-  if (ActiveKinds & Action::OFK_HIP)
+-    CmdArgs.push_back(
+-        Args.MakeArgString(StringRef("-L") + RocmInstallation->getLibPath()));
+ }
+ 
+ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
+-- 
+2.53.0
+

diff --git a/0001-comgr-link-with-static-llvm.patch b/0001-comgr-link-with-static-llvm.patch
index 39ea9b5..85ee67e 100644
--- a/0001-comgr-link-with-static-llvm.patch
+++ b/0001-comgr-link-with-static-llvm.patch
@@ -1,4 +1,4 @@
-From 341d5f58dfb731bbec24b3969096db12ed1e271e Mon Sep 17 00:00:00 2001
+From 54ba86345412add14d7e911037a42478cd206ea6 Mon Sep 17 00:00:00 2001
 From: Tom Rix <Tom.Rix@amd.com>
 Date: Wed, 16 Apr 2025 09:24:34 -0700
 Subject: [PATCH] comgr link with static llvm
@@ -8,10 +8,10 @@ Subject: [PATCH] comgr link with static llvm
  1 file changed, 25 insertions(+), 28 deletions(-)
 
 diff --git a/amd/comgr/CMakeLists.txt b/amd/comgr/CMakeLists.txt
-index ed01d21cea30..877762811ff6 100644
+index 21a544402c48..41f65fb8a5f7 100644
 --- a/amd/comgr/CMakeLists.txt
 +++ b/amd/comgr/CMakeLists.txt
-@@ -418,31 +418,27 @@ else()
+@@ -430,31 +430,27 @@ else()
    set(SPIRV_STATIC_LIB "SPIRVAMDLib")
  endif()
  
@@ -64,7 +64,7 @@ index ed01d21cea30..877762811ff6 100644
  
  target_link_options(amd_comgr
    PUBLIC
-@@ -452,9 +448,10 @@ target_link_options(amd_comgr
+@@ -464,9 +460,10 @@ target_link_options(amd_comgr
  
  target_link_libraries(amd_comgr
    PRIVATE
@@ -79,5 +79,5 @@ index ed01d21cea30..877762811ff6 100644
  if (NOT UNIX)
    target_link_libraries(amd_comgr
 -- 
-2.48.1
+2.52.0
 

diff --git a/0001-lld-workaround-.gnu.version-change.patch b/0001-lld-workaround-.gnu.version-change.patch
index f9f9eed..1c7917e 100644
--- a/0001-lld-workaround-.gnu.version-change.patch
+++ b/0001-lld-workaround-.gnu.version-change.patch
@@ -1,4 +1,4 @@
-From 75f7308a111dc704d1eeea013d2a9c993c0a89ac Mon Sep 17 00:00:00 2001
+From f76e91d21a8cd368fe24ca39598413b51c51790f Mon Sep 17 00:00:00 2001
 From: Tom Rix <Tom.Rix@amd.com>
 Date: Fri, 14 Nov 2025 12:44:23 -0800
 Subject: [PATCH] lld workaround .gnu.version change
@@ -8,10 +8,10 @@ Subject: [PATCH] lld workaround .gnu.version change
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
-index 42d0e4c202ec..b306fde7e14c 100644
+index a5921feb1829..7de9ff4020be 100644
 --- a/lld/ELF/InputFiles.cpp
 +++ b/lld/ELF/InputFiles.cpp
-@@ -1581,6 +1581,7 @@ template <class ELFT> void SharedFile::parse() {
+@@ -1698,6 +1698,7 @@ template <class ELFT> void SharedFile::parse() {
        continue;
      }
  
@@ -19,7 +19,7 @@ index 42d0e4c202ec..b306fde7e14c 100644
      if (ver == VER_NDX_LOCAL ||
          (ver != VER_NDX_GLOBAL && idx >= verdefs.size())) {
        // In GNU ld < 2.31 (before 3be08ea4728b56d35e136af4e6fd3086ade17764), the
-@@ -1592,7 +1593,7 @@ template <class ELFT> void SharedFile::parse() {
+@@ -1709,7 +1710,7 @@ template <class ELFT> void SharedFile::parse() {
                       << " for symbol " << name
                       << " is out of bounds\n>>> defined in " << this;
        continue;
@@ -28,7 +28,7 @@ index 42d0e4c202ec..b306fde7e14c 100644
  
      uint32_t alignment = getAlignment<ELFT>(sections, sym);
      if (ver == idx) {
-@@ -1606,7 +1607,8 @@ template <class ELFT> void SharedFile::parse() {
+@@ -1723,7 +1724,8 @@ template <class ELFT> void SharedFile::parse() {
  
      // Also add the symbol with the versioned name to handle undefined symbols
      // with explicit versions.
@@ -39,5 +39,5 @@ index 42d0e4c202ec..b306fde7e14c 100644
  
      StringRef verName =
 -- 
-2.51.1
+2.52.0
 

diff --git a/0001-preview-comgr-link-with-static-llvm.patch b/0001-preview-comgr-link-with-static-llvm.patch
new file mode 100644
index 0000000..3e053f0
--- /dev/null
+++ b/0001-preview-comgr-link-with-static-llvm.patch
@@ -0,0 +1,83 @@
+From b1ca21338d42726bc49acc2801949734fbb1848b Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Sat, 16 May 2026 08:55:18 -0700
+Subject: [PATCH] preview comgr link with static llvm
+
+---
+ amd/comgr/CMakeLists.txt | 53 +++++++++++++++++++---------------------
+ 1 file changed, 25 insertions(+), 28 deletions(-)
+
+diff --git a/amd/comgr/CMakeLists.txt b/amd/comgr/CMakeLists.txt
+index c4b76db2b020..baae3fbfe13b 100644
+--- a/amd/comgr/CMakeLists.txt
++++ b/amd/comgr/CMakeLists.txt
+@@ -487,31 +487,27 @@ else()
+   set(SPIRV_STATIC_LIB "SPIRVAMDLib")
+ endif()
+ 
+-if (LLVM_LINK_LLVM_DYLIB)
+-  set(LLVM_LIBS LLVM ${SPIRV_DYNAMIC_LIB})
+-else()
+-  llvm_map_components_to_libnames(LLVM_LIBS
+-    ${LLVM_TARGETS_TO_BUILD}
+-    BinaryFormat
+-    BitReader
+-    BitWriter
+-    CodeGen
+-    Core
+-    DebugInfoDWARF
+-    Demangle
+-    IRReader
+-    Linker
+-    MC
+-    MCDisassembler
+-    MCParser
+-    Object
+-    Option
+-    Support
+-    Symbolize
+-    TargetParser
+-    ${SPIRV_STATIC_LIB}
+-    )
+-endif()
++llvm_map_components_to_libnames(LLVM_LIBS
++  ${LLVM_TARGETS_TO_BUILD}
++  BinaryFormat
++  BitReader
++  BitWriter
++  CodeGen
++  Core
++  DebugInfoDWARF
++  Demangle
++  IRReader
++  Linker
++  MC
++  MCDisassembler
++  MCParser
++  Object
++  Option
++  Support
++  Symbolize
++  TargetParser
++  ${SPIRV_STATIC_LIB}
++)
+ 
+ target_link_options(amd_comgr
+   PUBLIC
+@@ -521,9 +517,10 @@ target_link_options(amd_comgr
+ 
+ target_link_libraries(amd_comgr
+   PRIVATE
+-    ${LLD_LIBS}
+-    ${LLVM_LIBS}
+-    ${CLANG_LIBS})
++  ${LLD_LIBS}
++  ${CLANG_LIBS}
++  ${LLVM_LIBS}
++)
+ 
+ if(TARGET embedded-resource-dir)
+   target_link_libraries(amd_comgr PRIVATE embedded-resource-dir)
+-- 
+2.53.0
+

diff --git a/0001-rocm-compilersupport-force-hip-runtime-detection.patch b/0001-rocm-compilersupport-force-hip-runtime-detection.patch
index ab3f4c1..0c48f71 100644
--- a/0001-rocm-compilersupport-force-hip-runtime-detection.patch
+++ b/0001-rocm-compilersupport-force-hip-runtime-detection.patch
@@ -1,4 +1,4 @@
-From 92e9587663055c40c111fd4c7b37a4fa42884556 Mon Sep 17 00:00:00 2001
+From f49602b60c633c6c77787db664520b9827fd503b Mon Sep 17 00:00:00 2001
 From: Tom Rix <Tom.Rix@amd.com>
 Date: Thu, 18 Sep 2025 10:55:43 -0700
 Subject: [PATCH] rocm-compilersupport force hip runtime detection
@@ -8,10 +8,10 @@ Subject: [PATCH] rocm-compilersupport force hip runtime detection
  1 file changed, 4 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp
-index 798ea8aad6de..8ef086c61066 100644
+index 4f30b532bec5..4ba91edfdfd9 100644
 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
 +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -455,6 +455,9 @@ void RocmInstallationDetector::detectHIPRuntime() {
+@@ -453,6 +453,9 @@ void RocmInstallationDetector::detectHIPRuntime() {
      if (!HIPPathEnv->empty())
        HIPSearchDirs.emplace_back(std::move(*HIPPathEnv));
    }
@@ -21,7 +21,7 @@ index 798ea8aad6de..8ef086c61066 100644
    if (HIPSearchDirs.empty())
      HIPSearchDirs.append(getInstallationPathCandidates());
    auto &FS = D.getVFS();
-@@ -517,6 +520,7 @@ void RocmInstallationDetector::detectHIPRuntime() {
+@@ -511,6 +514,7 @@ void RocmInstallationDetector::detectHIPRuntime() {
      }
    }
    HasHIPRuntime = false;
@@ -30,5 +30,5 @@ index 798ea8aad6de..8ef086c61066 100644
  
  void RocmInstallationDetector::print(raw_ostream &OS) const {
 -- 
-2.51.0
+2.52.0
 

diff --git a/0001-rocm-compilersupport-simplify-use-runtime-wrapper-ch.patch b/0001-rocm-compilersupport-simplify-use-runtime-wrapper-ch.patch
index 5a8269f..693ae72 100644
--- a/0001-rocm-compilersupport-simplify-use-runtime-wrapper-ch.patch
+++ b/0001-rocm-compilersupport-simplify-use-runtime-wrapper-ch.patch
@@ -1,4 +1,4 @@
-From 19bbeb111f6bea771b8ee4ae28191089e4ecc52c Mon Sep 17 00:00:00 2001
+From 82eaa017263911119f0f0f4d77160a5b3c2e7dfb Mon Sep 17 00:00:00 2001
 From: trix <trix@localhost.localdomain>
 Date: Fri, 19 Sep 2025 17:34:31 -0700
 Subject: [PATCH] rocm-compilersupport simplify use runtime wrapper check
@@ -8,10 +8,10 @@ Subject: [PATCH] rocm-compilersupport simplify use runtime wrapper check
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp
-index 8ef086c61066..da7e185523bb 100644
+index 4ba91edfdfd9..0929960ada2f 100644
 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp
 +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp
-@@ -531,8 +531,7 @@ void RocmInstallationDetector::print(raw_ostream &OS) const {
+@@ -525,8 +525,7 @@ void RocmInstallationDetector::print(raw_ostream &OS) const {
  
  void RocmInstallationDetector::AddHIPIncludeArgs(const ArgList &DriverArgs,
                                                   ArgStringList &CC1Args) const {
@@ -22,5 +22,5 @@ index 8ef086c61066..da7e185523bb 100644
  
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
 -- 
-2.51.0
+2.52.0
 

diff --git a/0001-rocm-llvm-work-around-new-assert-in-array.patch b/0001-rocm-llvm-work-around-new-assert-in-array.patch
index a4886d4..0299e4a 100644
--- a/0001-rocm-llvm-work-around-new-assert-in-array.patch
+++ b/0001-rocm-llvm-work-around-new-assert-in-array.patch
@@ -1,4 +1,4 @@
-From 77b60432f85502270252ad997bc7f1086eca422c Mon Sep 17 00:00:00 2001
+From 6e3ee79b52e9578d7e152d99ddfc79fdf2a80948 Mon Sep 17 00:00:00 2001
 From: Tom Rix <Tom.Rix@amd.com>
 Date: Tue, 11 Mar 2025 07:32:44 -0700
 Subject: [PATCH] rocm-llvm: work around new assert in array
@@ -11,10 +11,10 @@ Signed-off-by: Tom Rix <Tom.Rix@amd.com>
  create mode 100644 clang/lib/Headers/cuda_wrappers/array
 
 diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
-index 66c3e5c8f617..937adc8a3f5a 100644
+index 3cde8a024e9d..c96290da4d2c 100644
 --- a/clang/lib/Headers/CMakeLists.txt
 +++ b/clang/lib/Headers/CMakeLists.txt
-@@ -288,6 +288,7 @@ set(files
+@@ -340,6 +340,7 @@ set(files
  
  set(cuda_wrapper_files
    cuda_wrappers/algorithm
@@ -68,5 +68,5 @@ index 000000000000..41c1263d8b3b
 +
 +#endif // include guard
 -- 
-2.48.1
+2.52.0
 

diff --git a/rocm-compilersupport.prep.in b/rocm-compilersupport.prep.in
index 34193bc..cd45424 100644
--- a/rocm-compilersupport.prep.in
+++ b/rocm-compilersupport.prep.in
@@ -1,5 +1,3 @@
-# Remove third-party
-rm -rf third-party
 # Force clang to be shared
 sed -i -e 's@if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN)@if (ARG_SHARED AND (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN))@' clang/cmake/modules/AddClang.cmake
 # Force lld to be shared

diff --git a/rocm-compilersupport.spec b/rocm-compilersupport.spec
index 4a61911..83ec87d 100644
--- a/rocm-compilersupport.spec
+++ b/rocm-compilersupport.spec
@@ -21,34 +21,27 @@
 #
 
 # For building earlier snapshots of the compiler
-%bcond_with gitcommit
-%if %{with gitcommit}
-%global commit0 1b0eada6b0ee93e2e694c8c146d23fca90bc11c5
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global date0 20251024
-
-# The package follows LLVM's major version, but API version is still important:
-%global comgr_maj_api_ver 3
-# Upstream tags are based on rocm releases:
-%global rocm_release 7.1
+%bcond_with preview
+%if %{with preview}
+%global rocm_release 7.13
 %global rocm_patch 0
-# What LLVM is upstream using (use LLVM_VERSION_MAJOR from llvm/CMakeLists.txt):
-%global llvm_maj_ver 20
-%global llvm_version_suffix .rocm
-
+%global pkg_src therock-%{rocm_release}
 %else
-# Normal release
+%global rocm_release 7.2
+%global rocm_patch 1
+%global pkg_src rocm-%{rocm_release}.%{rocm_patch}
+%endif
 
 # The package follows LLVM's major version, but API version is still important:
 %global comgr_maj_api_ver 3
-# Upstream tags are based on rocm releases:
-%global rocm_release 7.1
-%global rocm_patch 1
 # What LLVM is upstream using (use LLVM_VERSION_MAJOR from llvm/CMakeLists.txt):
-%global llvm_maj_ver 20
+%if %{with preview}
+%global llvm_maj_ver 23
+%else
+%global llvm_maj_ver 22
+%endif
 %global llvm_version_suffix .rocm
 
-%endif
 # local, fedora
 %global _comgr_full_api_ver %{comgr_maj_api_ver}.0
 # mock, suse
@@ -76,7 +69,7 @@
 %global pkg_libdir lib
 %global pkg_libdir_suffix %{nil}
 %global pkg_prefix %{_prefix}/lib64/rocm/rocm-%{rocm_release}
-%global pkg_suffix -%{rocm_release}
+%global pkg_suffix %{rocm_release}
 %else
 %global amd_device_libs_prefix %{_libdir}/rocm/llvm/lib/clang/%{llvm_maj_ver}/lib
 %global bundle_prefix %{_libdir}/rocm/llvm
@@ -94,6 +87,7 @@
 %global rocm_libcxx_name rocm-libc++%{pkg_suffix}
 %global rocm_lld_name rocm-lld%{pkg_suffix}
 %global rocm_llvm_name rocm-llvm%{pkg_suffix}
+%global rocm_omp_name rocm-omp%{pkg_suffix}
 %if 0%{?suse_version}
 # 15.6
 # rocm-comgr.x86_64: E: shlib-policy-name-error (Badness: 10000) libamd_comgr2
@@ -129,11 +123,17 @@
 %global build_gold OFF
 %endif
 
+%bcond_with libcxx
+%if %{with libcxx}
+%global build_libcxx ON
+%else
+%global build_libcxx OFF
+%endif
 
 Name:           %{pkg_name}
 Version:        %{llvm_maj_ver}
-%if %{with gitcommit}
-Release:        0.rocm%{rocm_version}^git%{date0}.%{shortcommit0}%{?dist}
+%if %{with preview}
+Release:        1000.rocm%{rocm_version}%{?dist}
 %else
 Release:        12.rocm%{rocm_version}%{?dist}
 %endif
@@ -144,28 +144,47 @@ Group:          Development/Languages/Other
 %endif
 
 Url:            https://github.com/ROCm/llvm-project
-# llvm is Apache-2.0 WITH LLVM-exception OR NCSA
-# hipcc is MIT, comgr and device-libs are NCSA:
 License:        (Apache-2.0 WITH LLVM-exception OR NCSA) AND NCSA AND MIT
-%if %{with gitcommit}
-Source0:        %{url}/archive/%{commit0}/llvm-project-%{shortcommit0}.tar.gz
-%else
-Source0:        %{url}/archive/refs/tags/rocm-%{rocm_version}.tar.gz#/rocm-compilersupport-%{rocm_version}.tar.gz
-%endif
+# llvm is Apache-2.0 WITH LLVM-exception OR NCSA
+# /amd breakdown
+#
+# /amd/comgr/*
+# Apache-2.0, amd/comgr/LICENSE.txt
+#
+# /amd/hipcc/*
+# MIT, amd/hipcc/LICENSE.txt
+#
+# /amd/device-libs/*
+# NSCA, amd/device-libs/LICENSE.TXT
+
+
+Source0:        %{url}/archive/refs/tags/%{pkg_src}.tar.gz#/rocm-compilersupport-%{rocm_version}.tar.gz
 Source1:        rocm-compilersupport.prep.in
 
-# Subject: [PATCH] [gold] Fix compilation (#130334)
-Patch1:         %{url}/commit/b0baa1d8bd68a2ce2f7c5f2b62333e410e9122a1.patch
+%if %{without preview}
 # Link comgr with static versions of llvm's libraries
-Patch2:         0001-comgr-link-with-static-llvm.patch
+Patch1:         0001-comgr-link-with-static-llvm.patch
+%else
+Patch1:         0001-preview-comgr-link-with-static-llvm.patch
+%endif
 # On Fedora the assert came in gcc 15, on RHEL 10.2 gcc 14
 # Reduce the gcc version check below
-Patch3:         0001-rocm-llvm-work-around-new-assert-in-array.patch
+Patch2:         0001-rocm-llvm-work-around-new-assert-in-array.patch
 # https://github.com/ROCm/llvm-project/issues/301
-Patch4:         0001-rocm-compilersupport-force-hip-runtime-detection.patch
-Patch5:         0001-rocm-compilersupport-simplify-use-runtime-wrapper-ch.patch
+Patch3:         0001-rocm-compilersupport-force-hip-runtime-detection.patch
+Patch4:         0001-rocm-compilersupport-simplify-use-runtime-wrapper-ch.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2415065
-Patch6:         0001-lld-workaround-.gnu.version-change.patch
+Patch5:         0001-lld-workaround-.gnu.version-change.patch
+%if %{without preview}
+# backport
+# https://github.com/ROCm/llvm-project/commit/23f010f1ab09263d79027c70d5f4cddfe0055ca9
+Patch6:         0001-SemaConcept.cpp-fix-MSVC-not-all-control-paths-retur.patch
+%endif
+%if %{with preview}
+# When clang bungles the rocm install path, it gets the linking of libamdhip64 wrong
+# Convert from an absolute path <path-to>/libamdhip64.so to using -lamdhip64
+Patch7:         0001-clang-23-link-libamdhip64.patch
+%endif
 
 BuildRequires:  cmake
 %if 0%{?fedora} || 0%{?suse_version}
@@ -174,11 +193,16 @@ BuildRequires:  fdupes
 BuildRequires:  libffi-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  rocm-cmake%{pkg_suffix}
+BuildRequires:  rocm-filesystem%{pkg_suffix}
 BuildRequires:  zlib-devel
 %if %{with gold}
 BuildRequires:  binutils-devel
 %endif
 BuildRequires:  gcc-c++
+%if %{with preview}
+# For omp
+BuildRequires:  python-devel
+%endif
 Provides:       bundled(llvm-project) = %{llvm_maj_ver}
 
 %if 0%{?rhel} || 0%{?suse_version}
@@ -209,14 +233,23 @@ ExclusiveArch:  x86_64
 Summary:        ROCm Compiler RPM macros
 BuildArch:      noarch
 
+Requires:       rpm
+# Compat version of macros conflict with the normal version
+%if %{with compat}
+Conflicts: rocm-compilersupport-macros
+%else
+Conflicts: rocm-compilersupport7.2-macros
+%endif
+
 %description macros
 This package contains ROCm compiler related RPM macros.
 
 %package -n %{device_libs_name}
 Summary:        AMD ROCm LLVM bit code libraries
-Requires:       %{rocm_clang_name}-devel
-Requires:       %{rocm_llvm_name}-static
-Requires:       rocm-lld%{pkg_suffix}
+Requires:       %{rocm_clang_name}-devel = %{version}-%{release}
+Requires:       %{rocm_llvm_name}-static = %{version}-%{release}
+Requires:       %{rocm_llvm_name}-filesystem = %{version}-%{release}
+Requires:       rocm-lld%{pkg_suffix} = %{version}-%{release}
 
 %description -n %{device_libs_name}
 This package contains a set of AMD specific device-side language runtime
@@ -230,6 +263,7 @@ libraries in the form of bit code. Specifically:
  
 %package -n %{comgr_name}
 Summary:        AMD ROCm LLVM Code Object Manager
+Requires:       rocm-filesystem%{pkg_suffix}
 Provides:       comgr%{pkg_suffix}(major) = %{comgr_maj_api_ver}
 Provides:       rocm-comgr%{pkg_suffix} = %{comgr_full_api_ver}-%{release}
 
@@ -237,13 +271,14 @@ Provides:       rocm-comgr%{pkg_suffix} = %{comgr_full_api_ver}-%{release}
 The AMD Code Object Manager (Comgr) is a shared library which provides
 operations for creating and inspecting code objects.
 
-%post -n %{comgr_name}  -p /sbin/ldconfig
-%postun -n %{comgr_name} -p /sbin/ldconfig
+%if 0%{?suse_version}
+%ldconfig_scriptlets -n %{comgr_name}
+%endif
 
 %package -n %{comgr_name}-devel
 Summary:        AMD ROCm LLVM Code Object Manager
 Requires:       %{comgr_name}%{?_isa} = %{version}-%{release}
-Requires:       %{device_libs_name}
+Requires:       %{device_libs_name} = %{version}-%{release}
 %if 0%{?suse_version}
 Provides:       rocm-comgr%{pkg_suffix}-devel = %{version}-%{release}
 %endif
@@ -254,37 +289,39 @@ The AMD Code Object Manager (Comgr) development package.
 %package -n %{hipcc_name}
 Summary:        HIP compiler driver
 Requires:       %{device_libs_name} = %{version}-%{release}
-Suggests:       rocminfo%{pkg_suffix}
+Requires:       rocminfo%{pkg_suffix} >= %{rocm_release}
+Requires:       rocm-filesystem%{pkg_suffix}
 %if 0%{?suse_version}
 Provides:       hip = %{version}-%{release}
 Obsoletes:      hip <= %{version}-%{release}
 %endif
 
 %description -n %{hipcc_name}
-hipcc is a compiler driver utility that will call clang or nvcc, depending on
-target, and pass the appropriate include and library options for the target
-compiler and HIP infrastructure.
-
 hipcc will pass-through options to the target compiler. The tools calling hipcc
 must ensure the compiler options are appropriate for the target compiler.
 
 # ROCM LLVM
 %package -n %{rocm_llvm_name}-filesystem
 Summary: Filesystem package that owns the rocm llvm directory
+Requires: rocm-filesystem%{pkg_suffix}
 
 %description -n %{rocm_llvm_name}-filesystem
 This package owns the rocm llvm directory : %{bundle_prefix}
 
 %package -n %{rocm_llvm_name}-libs
 Summary: The ROCm LLVM lib
-Requires:      %{rocm_llvm_name}-filesystem%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
+%if %{with libcxx}
 Requires:      %{rocm_libcxx_name}%{?_isa} = %{version}-%{release}
+%endif
 
 %description -n %{rocm_llvm_name}-libs
 %{summary}
 
 %package -n %{rocm_llvm_name}
 Summary:       The ROCm LLVM
+Requires:      rocm-filesystem%{pkg_suffix}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
 Requires:      %{rocm_llvm_name}-libs%{?_isa} = %{version}-%{release}
 # https://bugzilla.redhat.com/show_bug.cgi?id=2362780
 #  /usr/lib64/rocm/llvm/bin/amdgpu-arch 
@@ -296,18 +333,24 @@ Recommends:      rocm-runtime%{pkg_suffix}-devel
 
 %package -n %{rocm_llvm_name}-devel
 Summary:       Libraries and header files for ROCm LLVM
+Requires:      %{rocm_llvm_name}-devel%{?_isa} = %{version}-%{release}
 Requires:      %{rocm_llvm_name}%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
+Requires:      rocm-filesystem%{pkg_suffix}
 Requires:      zlib-devel
 
 %description -n %{rocm_llvm_name}-devel
 %{summary}
 
-%post -n %{rocm_llvm_name}-devel -p /sbin/ldconfig
-%postun -n %{rocm_llvm_name}-devel -p /sbin/ldconfig
+%if 0%{?suse_version}
+%ldconfig_scriptlets -n %{rocm_llvm_name}-devel
+%endif
 
 %package -n %{rocm_llvm_name}-static
 Summary:       Static libraries for ROCm LLVM
 Requires:      %{rocm_llvm_name}-devel%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
+Provides:      %{rocm_llvm_name}-static = %{version}-%{release}
 
 %description -n %{rocm_llvm_name}-static
 %{summary}
@@ -315,16 +358,21 @@ Requires:      %{rocm_llvm_name}-devel%{?_isa} = %{version}-%{release}
 # ROCM CLANG
 %package -n %{rocm_clang_name}-libs
 Summary:       The ROCm compiler libs
+Requires:      rocm-filesystem%{pkg_suffix}
 Requires:      %{rocm_llvm_name}-libs%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
 
 %description -n %{rocm_clang_name}-libs
 %{summary}
 
-%post -n %{rocm_clang_name}-libs -p /sbin/ldconfig
-%postun -n %{rocm_clang_name}-libs -p /sbin/ldconfig
+%if 0%{?suse_version}
+%ldconfig_scriptlets -n %{rocm_clang_name}-libs
+%endif
 
 %package -n %{rocm_clang_name}-runtime-devel
 Summary:       The ROCm compiler runtime
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
+Provides:      %{rocm_clang_name}-runtime-static = %{version}-%{release}
 
 %description -n %{rocm_clang_name}-runtime-devel
 %{summary}
@@ -334,8 +382,11 @@ Summary:       The ROCm compiler
 Requires:      git
 Requires:      python3
 Requires:      %{rocm_clang_name}-libs%{?_isa} = %{version}-%{release}
-Requires:      %{rocm_clang_name}-runtime-devel%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_clang_name}-runtime-static = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
+%if %{with libcxx}
 Requires:      %{rocm_libcxx_name}-devel%{?_isa} = %{version}-%{release}
+%endif
 
 %description -n %{rocm_clang_name}
 %{summary}
@@ -343,14 +394,16 @@ Requires:      %{rocm_libcxx_name}-devel%{?_isa} = %{version}-%{release}
 %package -n %{rocm_clang_name}-devel
 Summary:       Libraries and header files for ROCm CLANG
 Requires:      %{rocm_clang_name}%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
 
 %description -n %{rocm_clang_name}-devel
 %{summary}
 
 # CLANG TOOLS EXTRA
 %package -n %{rocm_clang_tools_extra_name}
-Summary:	Extra tools for clang
-Requires:	rocm-clang%{pkg_suffix}-libs%{?_isa} = %{version}-%{release}
+Summary:       Extra tools for clang
+Requires:      rocm-clang%{pkg_suffix}-libs%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
 
 %description -n %{rocm_clang_tools_extra_name}
 A set of extra tools built using Clang's tooling API.
@@ -358,6 +411,7 @@ A set of extra tools built using Clang's tooling API.
 %package -n %{rocm_clang_tools_extra_name}-devel
 Summary: Development header files for clang tools
 Requires: %{rocm_clang_tools_extra_name} = %{version}-%{release}
+Requires: %{rocm_llvm_name}-filesystem = %{version}-%{release}
 
 %description -n %{rocm_clang_tools_extra_name}-devel
 Development header files for clang tools.
@@ -366,14 +420,16 @@ Development header files for clang tools.
 %package -n %{rocm_lld_name}
 Summary:        The ROCm Linker
 Requires:      %{rocm_llvm_name}-libs%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
 
 %description -n %{rocm_lld_name}
 %{summary}
 
+%if %{with libcxx}
 # ROCM LIBC++
 %package -n %{rocm_libcxx_name}
 Summary:       The ROCm libc++
-Requires:      %{rocm_llvm_name}-filesystem%{?_isa} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
 
 %description -n %{rocm_libcxx_name}
 %{summary}
@@ -392,10 +448,15 @@ Requires:      %{rocm_libcxx_name}-devel%{?_isa} = %{version}-%{release}
 %description -n %{rocm_libcxx_name}-static
 %{summary}
 
+%else
+Obsoletes:      %{rocm_libcxx_name} <= %{version}-%{release}
+%endif
+
 %if %{with sa}
 %package -n %{rocm_clang_analyzer_name}
 Summary:       The ROCm code analysis framework
 Requires:      %{rocm_clang_name} = %{version}-%{release}
+Requires:      %{rocm_llvm_name}-filesystem = %{version}-%{release}
 # For scan-build
 Requires:      perl(File::Copy)
 Requires:      perl(File::Find)
@@ -407,11 +468,39 @@ Requires:      perl(Sys::Hostname)
 %{summary}
 %endif
 
+%if %{with preview}
+%package -n %{rocm_omp_name}-devel
+Summary:       The ROCm OMP devel
+
+%description -n %{rocm_omp_name}-devel
+%{summary}
+
+Requires:       %{device_libs_name} = %{version}-%{release}
+Requires:       rocm-filesystem%{pkg_suffix}
+
+Obsoletes:      rocm-omp-devel <= 7.3
+
+%endif
+
 %prep
-%if %{with gitcommit}
-%autosetup -p1 -n %{upstreamname}-%{commit0}
-%else
-%autosetup -p1 -n %{upstreamname}-rocm-%{rocm_version}
+%autosetup -p1 -n %{upstreamname}-%{pkg_src}
+
+# Remove third-party
+#
+# Need SipHash.h
+# .../llvm/lib/Support/SipHash.cpp:15:10: fatal error: siphash/SipHash.h: No such file or directory
+#   15 | #include "siphash/SipHash.h"
+# move siphash out of the way
+mv third-party/siphash .
+%if %{with preview}
+mv third-party/unittest .
+%endif
+# remove everything else
+rm -rf third-party/*
+# move siphash back
+mv siphash third-party/
+%if %{with preview}
+mv unittest third-party/
 %endif
 
 # rm llvm-project bits we do not need
@@ -422,9 +511,13 @@ sed -i "s/TARGET clangFrontendTool/true/" amd/comgr/CMakeLists.txt
 
 # change version check of array assert work around
 %if 0%{?rhel}
-sed -i -e 's@#if _GLIBCXX_RELEASE >= 15@#if _GLIBCXX_RELEASE >= 14@' clang/lib/Headers/cuda_wrappers/array
+sed -i -e 's@#if _GLIBCXX_RELEASE >= 15@#if _GLIBCXX_RELEASE >= 11@' clang/lib/Headers/cuda_wrappers/array
 %endif
 
+# Reduce diskspace pressure
+# There are a number of object files in clang/tests we will not be running
+find .  \( -name '*.o' -o -name '*.a' \) -delete
+
 install -pm 755 %{SOURCE1} prep.sh
 sed -i -e 's@%%{pkg_prefix}@%{pkg_prefix}@' prep.sh
 sed -i -e 's@%%{pkg_libdir}@%{pkg_libdir}@' prep.sh
@@ -462,8 +555,21 @@ if [ "$LINK_JOBS" -lt "$JOBS" ]; then
 fi
 
 %global llvm_projects "clang;clang-tools-extra;lld"
+%if %{with libcxx}
 %global llvm_runtimes "compiler-rt;libcxx;libcxxabi"
-%global build_libcxx ON
+%else
+%if %{with preview}
+# rocm-omp is going away
+# CMake Error at CMakeLists.txt:24 (message):
+#  The legacy standalone build mode has been removed.  Please change
+#      cmake <llvm-project>/openmp
+#  to
+#      cmake <llvm-project>/runtimes -DLLVM_ENABLE_RUNTIMES=openmp
+%global llvm_runtimes "compiler-rt;openmp"
+%else
+%global llvm_runtimes "compiler-rt"
+%endif
+%endif
 
 p=$PWD
 
@@ -475,7 +581,9 @@ p=$PWD
  -DBUILD_TESTING=OFF \\\
  -DCLANG_ENABLE_STATIC_ANALYZER=%{build_sa} \\\
  -DCLANG_ENABLE_ARCMT=OFF \\\
+ -DCLANG_ENABLE_CLANGD=OFF \\\
  -DCLANG_TOOL_CLANG_FUZZER_BUILD=OFF \\\
+ -DCLANG_TOOL_C_INDEX_TEST_BUILD=OFF \\\
  -DCMAKE_BUILD_TYPE=%{build_type} \\\
  -DCMAKE_INSTALL_DO_STRIP=ON \\\
  -DCMAKE_INSTALL_PREFIX=%{bundle_prefix} \\\
@@ -491,6 +599,16 @@ p=$PWD
  -DENABLE_LINKER_BUILD_ID=ON \\\
  -DLIBCXX_INCLUDE_BENCHMARKS=OFF \\\
  -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \\\
+ -DLIBOMPTARGET_NVPTX_ENABLE_BCLIB=OFF \\\
+ -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="" \\\
+ -DLIBOMPTARGET_NVPTX_BC_LINKER="" \\\
+ -DLIBOMP_OMPD_GDB_SUPPORT=OFF \\\
+ -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=ON \\\
+ -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF \\\
+ -DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=ON \\\
+ -DLIBOMPTARGET_NVPTX_ENABLE_BCLIB=OFF \\\
+ -DLIBOMP_INSTALL_ALIASES=OFF \\\
+ -DLIBOMP_ARCHER_SUPPORT=OFF \\\
  -DLLVM_BINUTILS_INCDIR=%{_includedir} \\\
  -DLLVM_BUILD_RUNTIME=ON \\\
  -DLLVM_DEFAULT_TARGET_TRIPLE=%{llvm_triple} \\\
@@ -510,6 +628,7 @@ p=$PWD
  -DLLVM_TOOL_LLVM_AS_FUZZER_BUILD=OFF \\\
  -DLLVM_TOOL_LLVM_DIS_FUZZER_BUILD=OFF \\\
  -DLLVM_TOOL_LLVM_DLANG_DEMANGLE_FUZZER_BUILD=OFF \\\
+ -DLLVM_TOOL_LLVM_EXEGESIS_BUILD=OFF \\\
  -DLLVM_TOOL_LLVM_ISEL_FUZZER_BUILD=OFF \\\
  -DLLVM_TOOL_LLVM_ITANIUM_DEMANGLE_FUZZER_BUILD=OFF \\\
  -DLLVM_TOOL_LLVM_MC_ASSEMBLE_FUZZER_BUILD=OFF \\\
@@ -534,8 +653,8 @@ pushd .
 %define __sourcedir llvm
 %define __builddir build-llvm
 %else
-%define _vpath_srcdir llvm
-%define _vpath_builddir build-llvm
+%global _vpath_srcdir llvm
+%global _vpath_builddir build-llvm
 %endif
 
 # Mixing use of gcc and clang in the build conflicts with rpm's setting of flags.
@@ -563,10 +682,15 @@ export CXX=/usr/bin/g++
 
 %if 0%{?suse_version}
 %cmake_build -j ${JOBS}
+cd ..
 %else
 %make_build -C build-llvm -j ${JOBS}
 %endif
 
+# Reduce diskspace pressure
+# Remove files that won't be needed anymore
+find build-llvm  \( -name '*.o' -o -name '*.a' \) -delete
+
 popd
 
 build_stage1=$p/build-llvm
@@ -589,8 +713,8 @@ pushd .
 %define __sourcedir llvm
 %define __builddir build-llvm-2
 %else
-%define _vpath_srcdir llvm
-%define _vpath_builddir build-llvm-2
+%global _vpath_srcdir llvm
+%global _vpath_builddir build-llvm-2
 %endif
 
 export LD_LIBRARY_PATH=$PWD/build-llvm-2/lib
@@ -611,6 +735,7 @@ export LD_LIBRARY_PATH=$PWD/build-llvm-2/lib
        -DLLVM_ENABLE_RUNTIMES=%{llvm_runtimes}
 
 %cmake_build -j ${JOBS}
+
 popd
 
 build_stage2=$p/build-llvm-2
@@ -632,8 +757,8 @@ pushd .
 %define __sourcedir amd/device-libs
 %define __builddir build-devicelibs
 %else
-%define _vpath_srcdir amd/device-libs
-%define _vpath_builddir build-devicelibs
+%global _vpath_srcdir amd/device-libs
+%global _vpath_builddir build-devicelibs
 %endif
 
 %cmake \
@@ -647,7 +772,7 @@ popd
 
 build_devicelibs=$p/build-devicelibs
 %global llvmrocm_devicelibs_config \\\
-	-DAMDDeviceLibs_DIR=$build_devicelibs/%{pkg_libdir}/cmake/AMDDeviceLibs
+       -DAMDDeviceLibs_DIR=$build_devicelibs/%{pkg_libdir}/cmake/AMDDeviceLibs
 
 #
 # HIPCC
@@ -657,8 +782,8 @@ pushd .
 %define __sourcedir amd/hipcc
 %define __builddir build-hipcc
 %else
-%define _vpath_srcdir amd/hipcc
-%define _vpath_builddir build-hipcc
+%global _vpath_srcdir amd/hipcc
+%global _vpath_builddir build-hipcc
 %endif
 
 %cmake \
@@ -681,8 +806,8 @@ pushd .
 %define __sourcedir amd/comgr
 %define __builddir build-comgr
 %else
-%define _vpath_srcdir amd/comgr
-%define _vpath_builddir build-comgr
+%global _vpath_srcdir amd/comgr
+%global _vpath_builddir build-comgr
 %endif
 
 %cmake -G "Unix Makefiles" \
@@ -701,14 +826,21 @@ sed -i -e 's@-lrt -lm@-lLLVMCoverage -lLLVMFrontendDriver -lLLVMFrontendHLSL -lL
 %else
 sed -i -e 's@libLLVM.so.%{llvm_maj_ver}.0%{llvm_version_suffix}@libLLVMCore.a@' build-comgr/CMakeFiles/amd_comgr.dir/link.txt
 # Order of link is wrong include some missing libs
+%if %{with preview}
+# Remove libclang-cpp.so from link
+sed -i -e 's/[^ ]*libclang-cpp[^ ]*//g' build-comgr/CMakeFiles/amd_comgr.dir/link.txt
+# Add libraries to cover the removal
+sed -i -e 's@-lrt -lm@-lclangSerialization -lclangAST -lclangDriver -lclangOptions -lclangFrontend -lclangFrontendTool -lclangExtractAPI -lclangInstallAPI -lclangIndex -lclangCodeGen -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCore -lclangStaticAnalyzerCheckers -lclangASTMatchers -lclangCrossTU -lclangUnifiedSymbolResolution -lclangTooling -lclangToolingCore -lclangRewriteFrontend -lclangRewrite -lclangParse -lclangSema -lclangAPINotes -lclangAnalysis -lclangFormat -lclangToolingInclusions -lclangAnalysisLifetimeSafety -lclangLex -lclangEdit -lclangBasic -lclangSupport -lLLVMCoverage -lLLVMFrontendDriver -lLLVMFrontendHLSL -lLLVMDTLTO -lLLVMLTO -lLLVMPlugins -lLLVMOption -lLLVMSymbolize -lLLVMWindowsDriver -lrt -lm@' build-comgr/CMakeFiles/amd_comgr.dir/link.txt
+%else
 sed -i -e 's@-lrt -lm@-lLLVMCoverage -lLLVMFrontendDriver -lLLVMFrontendHLSL -lLLVMLTO -lLLVMOption -lLLVMSymbolize -lLLVMWindowsDriver -lrt -lm@' build-comgr/CMakeFiles/amd_comgr.dir/link.txt
 %endif
+%endif
 
 %cmake_build -j ${JOBS}
 
 # Check that static linking happened
 # ldd build-comgr/libamd_comgr.so
-# fail
+# false
 
 popd
 
@@ -717,8 +849,8 @@ popd
 %define __sourcedir amd/device-libs
 %define __builddir build-devicelibs
 %else
-%define _vpath_srcdir amd/device-libs
-%define _vpath_builddir build-devicelibs
+%global _vpath_srcdir amd/device-libs
+%global _vpath_builddir build-devicelibs
 %endif
 pushd .
 # Workaround for bug in cmake tests not finding amdgcn:
@@ -739,7 +871,7 @@ pushd .
 %if 0%{?suse_version}
 %define __builddir build-llvm-2
 %else
-%define _vpath_builddir build-llvm-2
+%global _vpath_builddir build-llvm-2
 %endif
 
 %cmake_install
@@ -753,7 +885,7 @@ pushd .
 %if 0%{?suse_version}
 %define __builddir build-devicelibs
 %else
-%define _vpath_builddir build-devicelibs
+%global _vpath_builddir build-devicelibs
 %endif
 
 %cmake_install
@@ -773,7 +905,7 @@ pushd .
 %if 0%{?suse_version}
 %define __builddir build-comgr
 %else
-%define _vpath_builddir build-comgr
+%global _vpath_builddir build-comgr
 %endif
 
 %cmake_install
@@ -786,26 +918,12 @@ pushd .
 %if 0%{?suse_version}
 %define __builddir build-hipcc
 %else
-%define _vpath_builddir build-hipcc
+%global _vpath_builddir build-hipcc
 %endif
 
 %cmake_install
 popd
 
-%if %{without compat}
-# Make directories users of rocm-rpm-modules will install to
-%global modules_gpu_list gfx8 gfx9 gfx10 gfx11 gfx12 gfx906 gfx908 gfx90a gfx942 gfx950 gfx1031 gfx1036 gfx1100 gfx1101 gfx1102 gfx1103 gfx1150 gfx1151 gfx1152 gfx1153 gfx1200 gfx1201
-for gpu in %{modules_gpu_list}
-do
-    mkdir -p %{buildroot}%{_libdir}/rocm/$gpu/lib/cmake
-    mkdir -p %{buildroot}%{_libdir}/rocm/$gpu/bin
-    mkdir -p %{buildroot}%{_libdir}/rocm/$gpu/include
-done
-mkdir -p %{buildroot}%{_libdir}/rocm/lib/cmake
-mkdir -p %{buildroot}%{_libdir}/rocm/bin
-mkdir -p %{buildroot}%{_libdir}/rocm/include
-%endif
-
 rm -rf %{buildroot}%{pkg_prefix}/hip
 rm -rf %{buildroot}%{pkg_prefix}/share/doc/packages/*
 
@@ -833,10 +951,26 @@ rm -f %{buildroot}%{pkg_prefix}/bin/hipvars.pm
 # Extra docs
 rm -rf %{buildroot}%{pkg_prefix}/share/doc/ROCm-Device-Libs/LICENSE.TXT
 rm -rf %{buildroot}%{pkg_prefix}/share/doc/amd_comgr/LICENSE.txt
-rm -rf %{buildroot}%{pkg_prefix}/share/doc/amd_comgr/NOTICES.txt
 rm -rf %{buildroot}%{pkg_prefix}/share/doc/amd_comgr/README.md
 rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/LICENSE.txt
 rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
+rm -rf %{buildroot}%{bundle_prefix}/share/man/man1/scan-build.1
+
+# rocm-clang.x86_64: W: dangling-relative-symlink /usr/lib64/rocm/llvm/bin/nvptx-arch offload-arch
+rm -f %{buildroot}%{bundle_prefix}/bin/nvptx-arch
+
+# rocm-clang-analyzer.x86_64: E: non-executable-script /usr/lib64/rocm/llvm/share/scan-view/Reporter.py 644 /usr/bin/env python
+sed -i -e 's@/usr/bin/env python@/usr/bin/python3@' %{buildroot}%{bundle_prefix}/share/scan-view/*.py
+chmod a+x %{buildroot}%{bundle_prefix}/share/scan-view/*.py
+
+# rocm-clang-devel.x86_64: E: zero-length /usr/lib64/rocm/llvm/include/clang/Basic/DiagnosticASTCompatIDs.inc
+# Removing these causea a problem later
+# In file included from /usr/lib64/rocm/llvm/include/clang/Basic/DiagnosticIDs.h:103:
+# /usr/lib64/rocm/llvm/include/clang/Basic/DiagnosticCommonInterface.inc:22:10: fatal error: 'clang/Basic/DiagnosticCommonEnums.inc' file not found
+   22 | #include "clang/Basic/DiagnosticCommonEnums.inc"
+
+# rocm-clang-analyzer.x86_64: W: devel-file-in-non-devel-package /usr/lib64/rocm/llvm/lib/libear/ear.c
+rm %{buildroot}%{bundle_prefix}/lib/libear/ear.c
 
 #Clean up dupes:
 %if 0%{?fedora} || 0%{?suse_version}
@@ -854,7 +988,7 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 
 
 %files -n %{comgr_name}
-%license amd/comgr/LICENSE.txt amd/comgr/NOTICES.txt
+%license amd/comgr/LICENSE.txt
 %doc amd/comgr/README.md
 %{pkg_prefix}/%{pkg_libdir}/libamd_comgr.so.*
 
@@ -871,124 +1005,6 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 
 # ROCM LLVM
 %files -n %{rocm_llvm_name}-filesystem
-%dir %{_libdir}/rocm
-%if %{without compat}
-# For rocm-rpm-modules
-%dir %{_libdir}/rocm/bin
-%dir %{_libdir}/rocm/include
-%dir %{_libdir}/rocm/lib
-%dir %{_libdir}/rocm/gfx8
-%dir %{_libdir}/rocm/gfx8/bin
-%dir %{_libdir}/rocm/gfx8/include
-%dir %{_libdir}/rocm/gfx8/lib
-%dir %{_libdir}/rocm/gfx8/lib/cmake
-%dir %{_libdir}/rocm/gfx9
-%dir %{_libdir}/rocm/gfx9/bin
-%dir %{_libdir}/rocm/gfx9/include
-%dir %{_libdir}/rocm/gfx9/lib
-%dir %{_libdir}/rocm/gfx9/lib/cmake
-%dir %{_libdir}/rocm/gfx10
-%dir %{_libdir}/rocm/gfx10/bin
-%dir %{_libdir}/rocm/gfx10/include
-%dir %{_libdir}/rocm/gfx10/lib
-%dir %{_libdir}/rocm/gfx10/lib/cmake
-%dir %{_libdir}/rocm/gfx11
-%dir %{_libdir}/rocm/gfx11/bin
-%dir %{_libdir}/rocm/gfx11/include
-%dir %{_libdir}/rocm/gfx11/lib
-%dir %{_libdir}/rocm/gfx11/lib/cmake
-%dir %{_libdir}/rocm/gfx12
-%dir %{_libdir}/rocm/gfx12/bin
-%dir %{_libdir}/rocm/gfx12/include
-%dir %{_libdir}/rocm/gfx12/lib
-%dir %{_libdir}/rocm/gfx12/lib/cmake
-%dir %{_libdir}/rocm/gfx906
-%dir %{_libdir}/rocm/gfx906/bin
-%dir %{_libdir}/rocm/gfx906/include
-%dir %{_libdir}/rocm/gfx906/lib
-%dir %{_libdir}/rocm/gfx906/lib/cmake
-%dir %{_libdir}/rocm/gfx908
-%dir %{_libdir}/rocm/gfx908/bin
-%dir %{_libdir}/rocm/gfx908/include
-%dir %{_libdir}/rocm/gfx908/lib
-%dir %{_libdir}/rocm/gfx908/lib/cmake
-%dir %{_libdir}/rocm/gfx90a
-%dir %{_libdir}/rocm/gfx90a/bin
-%dir %{_libdir}/rocm/gfx90a/include
-%dir %{_libdir}/rocm/gfx90a/lib
-%dir %{_libdir}/rocm/gfx90a/lib/cmake
-%dir %{_libdir}/rocm/gfx942
-%dir %{_libdir}/rocm/gfx942/bin
-%dir %{_libdir}/rocm/gfx942/include
-%dir %{_libdir}/rocm/gfx942/lib
-%dir %{_libdir}/rocm/gfx942/lib/cmake
-%dir %{_libdir}/rocm/gfx950
-%dir %{_libdir}/rocm/gfx950/bin
-%dir %{_libdir}/rocm/gfx950/include
-%dir %{_libdir}/rocm/gfx950/lib
-%dir %{_libdir}/rocm/gfx950/lib/cmake
-%dir %{_libdir}/rocm/gfx1031
-%dir %{_libdir}/rocm/gfx1031/bin
-%dir %{_libdir}/rocm/gfx1031/include
-%dir %{_libdir}/rocm/gfx1031/lib
-%dir %{_libdir}/rocm/gfx1031/lib/cmake
-%dir %{_libdir}/rocm/gfx1036
-%dir %{_libdir}/rocm/gfx1036/bin
-%dir %{_libdir}/rocm/gfx1036/include
-%dir %{_libdir}/rocm/gfx1036/lib
-%dir %{_libdir}/rocm/gfx1036/lib/cmake
-%dir %{_libdir}/rocm/gfx1100
-%dir %{_libdir}/rocm/gfx1100/bin
-%dir %{_libdir}/rocm/gfx1100/include
-%dir %{_libdir}/rocm/gfx1100/lib
-%dir %{_libdir}/rocm/gfx1100/lib/cmake
-%dir %{_libdir}/rocm/gfx1101
-%dir %{_libdir}/rocm/gfx1101/bin
-%dir %{_libdir}/rocm/gfx1101/include
-%dir %{_libdir}/rocm/gfx1101/lib
-%dir %{_libdir}/rocm/gfx1101/lib/cmake
-%dir %{_libdir}/rocm/gfx1102
-%dir %{_libdir}/rocm/gfx1102/bin
-%dir %{_libdir}/rocm/gfx1102/include
-%dir %{_libdir}/rocm/gfx1102/lib
-%dir %{_libdir}/rocm/gfx1102/lib/cmake
-%dir %{_libdir}/rocm/gfx1103
-%dir %{_libdir}/rocm/gfx1103/bin
-%dir %{_libdir}/rocm/gfx1103/include
-%dir %{_libdir}/rocm/gfx1103/lib
-%dir %{_libdir}/rocm/gfx1103/lib/cmake
-%dir %{_libdir}/rocm/gfx1150
-%dir %{_libdir}/rocm/gfx1150/bin
-%dir %{_libdir}/rocm/gfx1150/include
-%dir %{_libdir}/rocm/gfx1150/lib
-%dir %{_libdir}/rocm/gfx1150/lib/cmake
-%dir %{_libdir}/rocm/gfx1151
-%dir %{_libdir}/rocm/gfx1151/bin
-%dir %{_libdir}/rocm/gfx1151/include
-%dir %{_libdir}/rocm/gfx1151/lib
-%dir %{_libdir}/rocm/gfx1151/lib/cmake
-%dir %{_libdir}/rocm/gfx1152
-%dir %{_libdir}/rocm/gfx1152/bin
-%dir %{_libdir}/rocm/gfx1152/include
-%dir %{_libdir}/rocm/gfx1152/lib
-%dir %{_libdir}/rocm/gfx1152/lib/cmake
-%dir %{_libdir}/rocm/gfx1153
-%dir %{_libdir}/rocm/gfx1153/bin
-%dir %{_libdir}/rocm/gfx1153/include
-%dir %{_libdir}/rocm/gfx1153/lib
-%dir %{_libdir}/rocm/gfx1153/lib/cmake
-%dir %{_libdir}/rocm/gfx1200
-%dir %{_libdir}/rocm/gfx1200/bin
-%dir %{_libdir}/rocm/gfx1200/include
-%dir %{_libdir}/rocm/gfx1200/lib
-%dir %{_libdir}/rocm/gfx1200/lib/cmake
-%dir %{_libdir}/rocm/gfx1201
-%dir %{_libdir}/rocm/gfx1201/bin
-%dir %{_libdir}/rocm/gfx1201/include
-%dir %{_libdir}/rocm/gfx1201/lib
-%dir %{_libdir}/rocm/gfx1201/lib/cmake
-%endif
-# For llvm
 %dir %{bundle_prefix}
 %dir %{bundle_prefix}/bin
 %dir %{bundle_prefix}/include
@@ -996,6 +1012,7 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 %dir %{bundle_prefix}/include/clang-c
 %dir %{bundle_prefix}/include/llvm
 %dir %{bundle_prefix}/include/llvm-c
+%dir %{bundle_prefix}/include/clang-tidy
 %dir %{bundle_prefix}/lib
 %dir %{bundle_prefix}/lib/clang
 %dir %{bundle_prefix}/lib/clang/%{llvm_maj_ver}
@@ -1009,39 +1026,47 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 %dir %{bundle_prefix}/lib/cmake
 %dir %{bundle_prefix}/lib/cmake/clang
 %dir %{bundle_prefix}/lib/cmake/llvm
+%dir %{bundle_prefix}/libexec
 %dir %{bundle_prefix}/share
 %dir %{bundle_prefix}/share/clang
 %dir %{bundle_prefix}/share/opt-viewer
 
 %files -n %{rocm_llvm_name}-libs
+%license llvm/LICENSE.TXT
 %{bundle_prefix}/lib/libLLVM-*.so
 %{bundle_prefix}/lib/libLLVM.so.*
 %{bundle_prefix}/lib/libLTO.so.*
 %{bundle_prefix}/lib/libRemarks.so.*
 
-%post -n %{rocm_llvm_name}-libs -p /sbin/ldconfig
-%postun -n %{rocm_llvm_name}-libs -p /sbin/ldconfig
+%if 0%{?suse_version}
+%ldconfig_scriptlets -n %{rocm_llvm_name}-libs
+%endif
 
 %files -n %{rocm_llvm_name}
 %license llvm/LICENSE.TXT
+%if %{without preview}
 %{bundle_prefix}/bin/bugpoint
+%else
+%{bundle_prefix}/bin/llubi
+%endif
 %{bundle_prefix}/bin/llc
 %{bundle_prefix}/bin/lli
 %{bundle_prefix}/bin/amdgpu-arch
 %{bundle_prefix}/bin/dsymutil
 %{bundle_prefix}/bin/llvm*
+%{bundle_prefix}/bin/offload-arch
 %{bundle_prefix}/bin/opt
 %{bundle_prefix}/bin/reduce-chunk-list
 %{bundle_prefix}/bin/sancov
 %{bundle_prefix}/bin/sanstats
 %{bundle_prefix}/bin/verify-uselistorder
-%{bundle_prefix}/share/opt-viewer/*
+%{bundle_prefix}/share/opt-viewer/
 
 %files -n %{rocm_llvm_name}-devel
 %license llvm/LICENSE.TXT
-%{bundle_prefix}/include/llvm/*
-%{bundle_prefix}/include/llvm-c/*
-%{bundle_prefix}/lib/cmake/llvm/*
+%{bundle_prefix}/include/llvm/
+%{bundle_prefix}/include/llvm-c/
+%{bundle_prefix}/lib/cmake/llvm/
 %{bundle_prefix}/lib/libLLVM.so
 %{bundle_prefix}/lib/libLTO.so
 %{bundle_prefix}/lib/libRemarks.so
@@ -1055,16 +1080,17 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 
 # ROCM CLANG
 %files -n %{rocm_clang_name}-libs
+%license clang/LICENSE.TXT
 %{bundle_prefix}/lib/libclang*.so.*
 
 %files -n %{rocm_clang_name}-runtime-devel
-%{bundle_prefix}/lib/clang/%{llvm_maj_ver}/include/*
+%license clang/LICENSE.TXT
+%{bundle_prefix}/lib/clang/%{llvm_maj_ver}/include/
 %{bundle_prefix}/lib/clang/%{llvm_maj_ver}/lib/linux/clang_rt.*
 %{bundle_prefix}/lib/clang/%{llvm_maj_ver}/lib/linux/libclang_rt.*
 
 %files -n %{rocm_clang_name}
 %license clang/LICENSE.TXT
-%{bundle_prefix}/bin/c-index-test
 %{bundle_prefix}/bin/clang*
 %{bundle_prefix}/bin/diagtool
 %{bundle_prefix}/bin/find-all-symbols
@@ -1072,19 +1098,23 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 %{bundle_prefix}/bin/git-clang-format
 %{bundle_prefix}/bin/hmaptool
 %{bundle_prefix}/bin/modularize
-%{bundle_prefix}/bin/nvptx-arch
 %{bundle_prefix}/bin/pp-trace
-%{bundle_prefix}/share/clang/*
+%{bundle_prefix}/share/clang/
 %{bundle_prefix}/share/clang-doc
 %{bundle_prefix}/bin/amdclang*
 %{bundle_prefix}/bin/amdflang*
+%{bundle_prefix}/bin/amdlld
 %{bundle_prefix}/bin/amdllvm
+%if %{with preview}
+%{bundle_prefix}/bin/ssaf-format
+%endif
+
 
 %files -n %{rocm_clang_name}-devel
 %license clang/LICENSE.TXT
-%{bundle_prefix}/include/clang/*
-%{bundle_prefix}/include/clang-c/*
-%{bundle_prefix}/lib/cmake/clang/*
+%{bundle_prefix}/include/clang/
+%{bundle_prefix}/include/clang-c/
+%{bundle_prefix}/lib/cmake/clang/
 %{bundle_prefix}/lib/libclang*.so
 
 # ROCM CLANG TOOLS EXTRA
@@ -1093,9 +1123,8 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 %{bundle_prefix}/bin/run-clang-tidy
 
 %files -n %{rocm_clang_tools_extra_name}-devel
-%dir %{bundle_prefix}/include/clang-tidy
 %license clang-tools-extra/LICENSE.TXT
-%{bundle_prefix}/include/clang-tidy/*
+%{bundle_prefix}/include/clang-tidy/
 
 # ROCM LLD
 %files -n %{rocm_lld_name}
@@ -1104,17 +1133,18 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 %{bundle_prefix}/bin/ld64.lld
 %{bundle_prefix}/bin/lld
 %{bundle_prefix}/bin/lld-link
-%{bundle_prefix}/bin/amdlld
 
 # ROCM LIBC++
+%if %{with libcxx}
 %files -n %{rocm_libcxx_name}
 %license libcxx/LICENSE.TXT
 %{bundle_prefix}/lib/libc++.so.*
 %{bundle_prefix}/lib/libc++abi.so.*
 %{bundle_prefix}/lib/libc++.modules.json
 
-%post -n %{rocm_libcxx_name} -p /sbin/ldconfig
-%postun -n %{rocm_libcxx_name} -p /sbin/ldconfig
+%if 0%{?suse_version}
+%ldconfig_scriptlets -n %{rocm_libcxx_name}
+%endif
 
 %files -n %{rocm_libcxx_name}-devel
 %dir %{bundle_prefix}/share/libc++
@@ -1127,6 +1157,7 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 %{bundle_prefix}/lib/libc++.a
 %{bundle_prefix}/lib/libc++abi.a
 %{bundle_prefix}/lib/libc++experimental.a
+%endif
 
 %if %{with sa}
 %files -n %{rocm_clang_analyzer_name}
@@ -1135,20 +1166,79 @@ rm -rf %{buildroot}%{pkg_prefix}/share/doc/hipcc/README.md
 %{bundle_prefix}/bin/scan-build
 %{bundle_prefix}/bin/scan-build-py
 %{bundle_prefix}/bin/scan-view
-%{bundle_prefix}/lib/libear/*
-%{bundle_prefix}/lib/libscanbuild/*
+%{bundle_prefix}/lib/libear/
+%{bundle_prefix}/lib/libscanbuild/
 %{bundle_prefix}/libexec/analyze-c++
 %{bundle_prefix}/libexec/analyze-cc
 %{bundle_prefix}/libexec/c++-analyzer
 %{bundle_prefix}/libexec/ccc-analyzer
 %{bundle_prefix}/libexec/intercept-c++
 %{bundle_prefix}/libexec/intercept-cc
-%{bundle_prefix}/share/man/man1/scan-build.1
-%{bundle_prefix}/share/scan-build/*
-%{bundle_prefix}/share/scan-view/*
+%{bundle_prefix}/share/scan-build/
+%{bundle_prefix}/share/scan-view/
 %endif
 
+%if %{with preview}
+%files -n %{rocm_omp_name}-devel
+%{bundle_prefix}/lib/cmake/openmp/
+%{bundle_prefix}/lib/libomp*.so
+%endif
+
+
 %changelog
+* Mon May 18 2026 Tom Rix <Tom.Rix@amd.com> - 22-12.rocm7.2.1
+- Check version of rocminfo is recent enough
+
+* Thu May 7 2026 Tom Rix <Tom.Rix@amd.com> - 22-11.rocm7.2.1
+- Add conflicts for rocm-compilersupport-macros
+
+* Thu Apr 30 2026 Tom Rix <Tom.Rix@amd.com> 22-10.rocm7.2.1
+- Merge rocm-compilersupport7.2 changes back
+
+* Fri Apr 24 2026 Tom Rix <Tom.Rix@amd.com> 22-9.rocm7.2.1
+- use suse ldconfig_scriptlets
+- move clang-tidy include dir to filesystem package
+- add static provides for clang runtime
+- Break down amd/ licenses
+- Obsolete libcxx
+- Install license files in more packages
+
+* Wed Mar 25 2026 Tom Rix <Tom.Rix@amd.com> 22-8.rocm7.2.1
+- Reduce build diskspace pressure
+
+* Tue Mar 24 2026 Tom Rix <Tom.Rix@amd.com> 22-7.rocm7.2.1
+- Update to 7.2.1
+
+* Mon Mar 16 2026 Tom Rix <Tom.Rix@amd.com> 22-6.rocm7.2.0
+- Change define to global build dirs
+- Fix dangling symlinks
+- Fix whitespace
+- Fix py3 shebangs
+- Fix dir ownships
+
+* Sat Mar 14 2026 Tom Rix <Tom.Rix@amd.com> 22-5.rocm7.2.0
+- Move building libc++ to --with libcxx option
+- llvm filesystem requires rocm filesystem
+- suse use ldconfig
+- add static provides
+
+* Wed Mar 4 2026 Tom Rix <Tom.Rix@amd.com> 22-4.rocm7.2.0
+- Change --with gitcommit to --with preview
+
+* Mon Feb 16 2026 Tom Rix <Tom.Rix@amd.com> 22-3.rocm7.2.0
+- Fix build on TW
+- Fix dir ownership of clang-analyzer
+
+* Thu Feb 12 2026 Tom Rix <Tom.Rix@amd.com> 22-2.rocm7.2.0
+- hipcc requires rocminfo to find its default gpu
+
+* Thu Feb 5 2026 Tom Rix <Tom.Rix@amd.com> 22-1.rocm7.2.0
+- Update to 7.2.0
+- Use rocm-filesystem via rocm-cmake
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 20-13.rocm7.1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Mon Jan 12 2026 Tom Rix <Tom.Rix@amd.com> - 20-12.rocm7.1.1
 - Improve requires for static analysis
 

diff --git a/sources b/sources
index 0023caa..73c23d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rocm-compilersupport-7.1.1.tar.gz) = 207a9564dd3ced1c257489cc537856a4420ec6ba431f75ffd5e1730db2119c0e00b9d601bef036a0cca7a0e69812ec6d3b895e9819a4fb5298d3229c764c4e84
+SHA512 (rocm-compilersupport-7.2.1.tar.gz) = a2c6b612d2e03940427421b92b343a88a3d2ba43ac86275672556861108ae2292f47ee71a7b14fcb552d72425ea41b6d9ce9eeb4f6945b0cae30813be89892d5

diff --git a/rocm-compilersupport.spec b/rocm-compilersupport.spec
index a0dade8..83ec87d 100644
--- a/rocm-compilersupport.spec
+++ b/rocm-compilersupport.spec
@@ -56,7 +56,7 @@
 %global llvm_triple %{_target_platform}
 
 # Compression type and level for source/binary package payloads.
-#  "w7T0.xzdio" xz level 7 using %%{getncpus} threads
+#  "w7T0.xzdio"	xz level 7 using %%{getncpus} threads
 # T0 (auto detect) can fail if cores are high and memory low
 # Use 6 threads, between OpenSUSE (4) and Fedora (8) build system defaults
 %global _source_payload w7T6.xzdio
@@ -1297,13 +1297,18 @@ rm %{buildroot}%{bundle_prefix}/lib/libear/ear.c
 
 * Tue Jul 22 2025 Jeremy Newton <alexjnewt at hotmail dot com> - 19-12.rocm6.4.2
 - Update to 6.4.2
-
-* Mon Jun 30 2025 Tom Rix <Tom.Rix@amd.com> - 19-11.rocm6.4.1
+- Add gfx1153 dirs
 - Remove compat_gcc option
 - Remove suse check for ldconfig use
 - Add gfx1150,51,52 gfx1200,01 dir creation
 - Remove bundled conditional
 
+* Fri Jun 20 2025 Tom Rix <Tom.Rix@amd.com> - 19-12.rocm6.4.1
+- Disable bootstrap for sidetag
+
+* Wed Jun 18 2025 Tom Rix <Tom.Rix@amd.com> - 19-11.rocm6.4.1
+- Rebuild for sidetag
+
 * Mon Jun 9 2025 Tom Rix <Tom.Rix@amd.com> - 19-10.rocm6.4.1
 - Reverse the rocm-runtime bootstrap logic