summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch b/meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch
deleted file mode 100644
index 2633869625..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 531c6696d42953cd642dea7bf70153285c7949ae Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org>
3Date: Tue, 6 May 2025 14:36:57 +0200
4Subject: [PATCH] fix(FTBFS): clc: switch to new non-owned `TargetOptions` for
5 LLVM 21
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Upstream hid the `TargetOptions` in commit 985410f87f2d19910a8d327527fd30062b042b63
11
12Use the new `getTargetOpts()` to obtain the `TargetOptions` for
13`setTarget()`.
14
15Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34835]
16
17Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
18Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13079
19Reference: https://github.com/llvm/llvm-project/commit/985410f87f2d19910a8d327527fd30062b042b63
20Reviewed-by: Karol Herbst <kherbst@redhat.com>
21Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34835>
22---
23 src/compiler/clc/clc_helpers.cpp | 4 ++++
24 1 file changed, 4 insertions(+)
25
26--- a/src/compiler/clc/clc_helpers.cpp
27+++ b/src/compiler/clc/clc_helpers.cpp
28@@ -874,7 +874,11 @@ clc_compile_to_llvm_module(LLVMContext &
29 diag_opts));
30
31 c->setTarget(clang::TargetInfo::CreateTargetInfo(
32+#if LLVM_VERSION_MAJOR >= 21
33+ c->getDiagnostics(), c->getInvocation().getTargetOpts()));
34+#else
35 c->getDiagnostics(), c->getInvocation().TargetOpts));
36+#endif
37
38 c->getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly;
39