mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

webkitgtk: fix compiling for 32-bit Arm

Browse Source 
When compiling for 32-bit Arm target, the compilation fails with the
following error:

| .../webkitgtk/2.48.5/sources/webkitgtk-2.48.5/Source/JavaScriptCore/offlineasm/ast.rb:1004:in 'Instruction#lowerDefault': Unhandled opcode addq at WebAssembly.asm:739 (due to WebAssembly.asm:739) (LoweringError)

Add backported patch to fix this error.

(From OE-Core rev: 37c18b2e215fd9d171742d664939519209be1c56)

Signed-off-by: Gyorgy Sarvari <skandigraun@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:
Gyorgy Sarvari
2025-08-09 21:14:06 +02:00
committed by Richard Purdie
parent 9c80fe3e6e
commit 8bcfc57351
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-sato/webkit/webkitgtk/fix-armv7-compilation.patch Normal file
View File

@@ -0,0 +1,32 @@
From 7999ecd5ee4ea3123f7e75634d2bc57f57ca7070 Mon Sep 17 00:00:00 2001
From: Justin Michaud <jmichaud@igalia.com>
Date: Wed, 6 Aug 2025 21:14:26 +0300
Subject: [PATCH] REGRESSION(2.48.5): [WPE][GTK] Does not compile on ARMv7
https://bugs.webkit.org/show_bug.cgi?id=296921
Unreviewed build fix.
* Source/JavaScriptCore/llint/WebAssembly.asm: Replace addq with addp
for sp on armv7
Canonical link: https://commits.webkit.org/290945.344@webkitglib/2.48
Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/7999ecd5ee4ea3123f7e75634d2bc57f57ca7070]
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
Source/JavaScriptCore/llint/WebAssembly.asm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/JavaScriptCore/llint/WebAssembly.asm b/Source/JavaScriptCore/llint/WebAssembly.asm
index 1ac3e2accf3c..bd9041404eb1 100644
--- a/Source/JavaScriptCore/llint/WebAssembly.asm
+++ b/Source/JavaScriptCore/llint/WebAssembly.asm
@@ -736,7 +736,7 @@ if JSVALUE64
storep memoryBase, Callee[cfr]
else
loadp [sp], ws0
- addq 2 * SlotSize, sp
+ addp 2 * SlotSize, sp
storep ws0, Callee[cfr]
end

1
meta/recipes-sato/webkit/webkitgtk_2.48.5.bb
View File

@@ -18,6 +18,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
file://sys_futex.patch \
file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
file://fix-ftbfs-riscv64.patch \
file://fix-armv7-compilation.patch \
"
SRC_URI[sha256sum] = "bb64ed9d1cfd58e8b5e89ccad71dd31adfed56336bad7695031ad0b668e1987c"