public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rocm-compilersupport] rawhide: Workaround __noinline__
@ 2026-08-26 23:54 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-08-26 23:54 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/rocm-compilersupport
            Branch : rawhide
            Commit : ed6e72d19eb453b6b8dbf75155d15a6b69a30077
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-08-26T16:53:22-07:00
            Stats  : +77/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rocm-compilersupport/c/ed6e72d19eb453b6b8dbf75155d15a6b69a30077?branch=rawhide

            Log:
            Workaround __noinline__

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/0001-rocm-llvm-workaround-__noinline__.patch b/0001-rocm-llvm-workaround-__noinline__.patch
new file mode 100644
index 0000000..e26c6e2
--- /dev/null
+++ b/0001-rocm-llvm-workaround-__noinline__.patch
@@ -0,0 +1,70 @@
+From 5bb71890754c4dc045ba7203d71fa32fb955bd53 Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Tue, 25 Aug 2026 08:48:25 -0700
+Subject: [PATCH] rocm-llvm workaround __noinline__
+
+---
+ clang/lib/Headers/CMakeLists.txt       |  1 +
+ clang/lib/Headers/cuda_wrappers/format | 38 ++++++++++++++++++++++++++
+ 2 files changed, 39 insertions(+)
+ create mode 100644 clang/lib/Headers/cuda_wrappers/format
+
+diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
+index ec955c4cef0c..55596776727b 100644
+--- a/clang/lib/Headers/CMakeLists.txt
++++ b/clang/lib/Headers/CMakeLists.txt
+@@ -349,6 +349,7 @@ set(cuda_wrapper_files
+   cuda_wrappers/array
+   cuda_wrappers/cmath
+   cuda_wrappers/complex
++  cuda_wrappers/format
+   cuda_wrappers/new
+ )
+ 
+diff --git a/clang/lib/Headers/cuda_wrappers/format b/clang/lib/Headers/cuda_wrappers/format
+new file mode 100644
+index 000000000000..1d26da455848
+--- /dev/null
++++ b/clang/lib/Headers/cuda_wrappers/format
+@@ -0,0 +1,38 @@
++/*===---- format - CUDA wrapper for <format> ------------------------------===
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ *
++ *===-----------------------------------------------------------------------===
++ */
++
++#ifndef __CLANG_CUDA_WRAPPERS_FORMAT
++#define __CLANG_CUDA_WRAPPERS_FORMAT
++
++#if _GLIBCXX_RELEASE >= 16
++#pragma push_macro("__noinline__")
++#undef __noinline__
++#endif
++
++#include_next <format>
++
++#if _GLIBCXX_RELEASE >= 16
++#pragma pop_macro("__noinline__")
++#endif
++
++#endif // include guard
+-- 
+2.55.0
+

diff --git a/rocm-compilersupport.spec b/rocm-compilersupport.spec
index 0293359..9b6a672 100644
--- a/rocm-compilersupport.spec
+++ b/rocm-compilersupport.spec
@@ -123,7 +123,7 @@
 %global build_gold OFF
 %endif
 
-%bcond_without libcxx
+%bcond_with libcxx
 %if %{with libcxx}
 %global build_libcxx ON
 %else
@@ -135,7 +135,7 @@ Version:        %{llvm_maj_ver}
 %if %{with preview}
 Release:        1000.rocm%{rocm_version}%{?dist}
 %else
-Release:        2.rocm%{rocm_version}%{?dist}
+Release:        3.rocm%{rocm_version}%{?dist}
 %endif
 
 Summary:        Various AMD ROCm LLVM related services
@@ -176,6 +176,7 @@ Patch5:         0001-lld-workaround-.gnu.version-change.patch
 # Convert from an absolute path <path-to>/libamdhip64.so to using -lamdhip64
 Patch6:         0001-clang-23-link-libamdhip64.patch
 Patch7:         0001-libcxx-noinline-workaround.patch
+Patch8:         0001-rocm-llvm-workaround-__noinline__.patch
 
 BuildRequires:  cmake
 %if 0%{?fedora} || 0%{?suse_version}
@@ -1152,7 +1153,10 @@ rm %{buildroot}%{bundle_prefix}/lib/libear/ear.c
 %{bundle_prefix}/lib/libomp*.so
 
 %changelog
-* Wed Aug 25 2025 Tom Rix <Tom.Rix@amd.com> - 23-2.rocm7.14.0
+* Tue Aug 25 2026 Tom Rix <Tom.Rix@amd.com> - 23-3.rocm7.14.0
+- Add format wrapper
+
+* Tue Aug 25 2026 Tom Rix <Tom.Rix@amd.com> - 23-2.rocm7.14.0
 - Enable libcxx
 
 * Fri Aug 7 2026 Tom Rix <Tom.Rix@amd.com> - 23-1.rocm7.14.0

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-26 23:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-26 23:54 [rpms/rocm-compilersupport] rawhide: Workaround __noinline__ Tom Rix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox