mesa: Fix a build issue with clang-21

This is a backport, helps compiling with upcoming clang-21

(From OE-Core rev: 5b25a4fa6ab3a149e1dcf18826b78617f8c1acf7)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2025-07-27 20:20:43 -07:00
committed by Richard Purdie
parent 4c42f1ee74
commit e418232bf4
2 changed files with 40 additions and 0 deletions

View File

@@ -0,0 +1,39 @@
From 531c6696d42953cd642dea7bf70153285c7949ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org>
Date: Tue, 6 May 2025 14:36:57 +0200
Subject: [PATCH] fix(FTBFS): clc: switch to new non-owned `TargetOptions` for
LLVM 21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream hid the `TargetOptions` in commit 985410f87f2d19910a8d327527fd30062b042b63
Use the new `getTargetOpts()` to obtain the `TargetOptions` for
`setTarget()`.
Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34835]
Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13079
Reference: https://github.com/llvm/llvm-project/commit/985410f87f2d19910a8d327527fd30062b042b63
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34835>
---
src/compiler/clc/clc_helpers.cpp | 4 ++++
1 file changed, 4 insertions(+)
--- a/src/compiler/clc/clc_helpers.cpp
+++ b/src/compiler/clc/clc_helpers.cpp
@@ -874,7 +874,11 @@ clc_compile_to_llvm_module(LLVMContext &
diag_opts));
c->setTarget(clang::TargetInfo::CreateTargetInfo(
+#if LLVM_VERSION_MAJOR >= 21
+ c->getDiagnostics(), c->getInvocation().getTargetOpts()));
+#else
c->getDiagnostics(), c->getInvocation().TargetOpts));
+#endif
c->getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly;

View File

@@ -18,6 +18,7 @@ SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \
file://0001-dont-build-clover-frontend.patch \
file://0001-fix-FTBFS-clc-switch-to-new-non-owned-TargetOptions-.patch \
"
SRC_URI[sha256sum] = "9f2b69eb39d2d8717d30a9868fdda3e0c0d3708ba32778bbac8ddb044538ce84"