Le sam. 31 janv. 2026 à 08:56, Yoann Congal <[email protected]> a écrit :
> From: João Marcos Costa <[email protected]> > > For RISC-V, and if the PACKAGECONFIG 'gallium-llvm' is enabled, mesa's > do_compile fails due to a change in setObjectLinkingLayerCreator's > signature. This change was first included in LLVM v21. > > This issue is further described below: > https://gitlab.freedesktop.org/mesa/mesa/-/issues/13852 > > Backport the fix - from upstream - to Whinlatter. > > Signed-off-by: João Marcos Costa <[email protected]> > Signed-off-by: Yoann Congal <[email protected]> > --- > .../files/0001-gallivm-support-LLVM-21.patch | 56 +++++++++++++++++++ > meta/recipes-graphics/mesa/mesa.inc | 1 + > 2 files changed, 57 insertions(+) > create mode 100644 > meta/recipes-graphics/mesa/files/0001-gallivm-support-LLVM-21.patch > > diff --git > a/meta/recipes-graphics/mesa/files/0001-gallivm-support-LLVM-21.patch > b/meta/recipes-graphics/mesa/files/0001-gallivm-support-LLVM-21.patch > new file mode 100644 > index 00000000000..cf3bdd36cf9 > --- /dev/null > +++ b/meta/recipes-graphics/mesa/files/0001-gallivm-support-LLVM-21.patch > @@ -0,0 +1,56 @@ > +From cd129dbf8af2d16b1243f2ce287ff69c6a5dc557 Mon Sep 17 00:00:00 2001 > +From: no92 <[email protected]> > +Date: Wed, 27 Aug 2025 16:02:31 +0200 > +Subject: gallivm: support LLVM 21 > + > +LLVM PR#146819 changed the signature of `setObjectLinkingLayerCreator`, > +dropping the Triple argument. The PR was first included in the LLVM 21 > +series, and the new signature is gated behind a version check for that. > + > +`LLVMOrcThreadSafeContextGetContext` was removed in LLVM commit b18e5b6, > +and the ORC examples in the LLVM tree seem to just create a context > +instead, which we replicate here. > + > +With this commit, mesa successfully builds the llvmpipe gallium driver > +on riscv64 with LLVM 21.1.0. > + > +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13785 > +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13852 > + > +Reviewed-by: David Heidelberg <[email protected]> > +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37027 > > > + > +Upstream-Status: Backport [ > https://cgit.freedesktop.org/mesa/mesa/commit/?id=cd129dbf8af2d16b1243f2ce287ff69c6a5dc557 > ] > João, patchtest is right, this patch is missing your signed-off-by. (Patchtest must have been down when you first sent this) Can you send a v2 with it? Thanks! > +--- > + src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp | 7 ++++++- > + 1 file changed, 6 insertions(+), 1 deletion(-) > + > +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp > b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp > +index 6651ea439da..e5d8e461dd6 100644 > +--- a/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp > ++++ b/src/gallium/auxiliary/gallivm/lp_bld_init_orc.cpp > +@@ -339,7 +339,12 @@ LPJit::LPJit() :jit_dylib_count(0) { > + .setJITTargetMachineBuilder(std::move(JTMB)) > + #ifdef USE_JITLINK > + .setObjectLinkingLayerCreator( > ++#if LLVM_VERSION_MAJOR >= 21 > ++ /* LLVM 21 removed the Triple argument */ > ++ [&](ExecutionSession &ES) { > ++#else > + [&](ExecutionSession &ES, const llvm::Triple &TT) { > ++#endif > + return std::make_unique<ObjectLinkingLayer>( > + ES, > ExitOnErr(llvm::jitlink::InProcessMemoryManager::Create())); > + }) > +@@ -551,7 +556,7 @@ init_gallivm_state(struct gallivm_state *gallivm, > const char *name, > + gallivm->cache = cache; > + > + gallivm->_ts_context = context->ref; > +- gallivm->context = LLVMOrcThreadSafeContextGetContext(context->ref); > ++ gallivm->context = LLVMContextCreate(); > + > + gallivm->module_name = LPJit::get_unique_name(name); > + gallivm->module = > LLVMModuleCreateWithNameInContext(gallivm->module_name, > +-- > +cgit v1.2.3 > + > diff --git a/meta/recipes-graphics/mesa/mesa.inc > b/meta/recipes-graphics/mesa/mesa.inc > index cf2c2a57a07..d880673f273 100644 > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -17,6 +17,7 @@ PE = "2" > 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-gallivm-support-LLVM-21.patch \ > " > > SRC_URI[sha256sum] = > "097842f3e49d996868b38688db87b006f7d4541e93ce86d2f341d8b3e7be7c93" > -- Yoann Congal Smile ECS
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#230233): https://lists.openembedded.org/g/openembedded-core/message/230233 Mute This Topic: https://lists.openembedded.org/mt/117558515/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
