@@ -130,18 +130,16 @@ else
WEBKITGTK_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF
endif
-# JIT is not supported for MIPS r6, but the WebKit build system does not
-# have a check for these processors. The same goes for ARMv5 and ARMv6.
+# JIT is not supported for MIPS, ARMv5, and ARMv6, but the WebKit build
+# system does not have a check for these processors.
+#
# Disable JIT forcibly here and use the CLoop interpreter instead.
+# Also, we have to disable the sampling profiler and WebAssembly, which
+# do NOT work with ENABLE_C_LOOP.
#
-# Also, we have to disable the sampling profiler and webassembly,
-# which does NOT work with ENABLE_C_LOOP.
+# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=278559
#
-# Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258
-# https://bugs.webkit.org/show_bug.cgi?id=172765
-# https://bugs.webkit.org/show_bug.cgi?id=265218
-#
-ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
+ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_mips)$(BR2_mipsel),y)
WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON \
-DENABLE_SAMPLING_PROFILER=OFF \
-DENABLE_WEBASSEMBLY=OFF
Change the mips32r6 into a blanket BR2_mips[el] check to disable the JSC JIT. Upstream removed JIT support for all MIPS processors in January 2024 [0], and the change trickled down to stable releases starting on version 2.44.0 [1]. While at it, change the upstream bug links to point to a more appropriate bug report. [0] https://commits.webkit.org/272866@main [1] https://lists.webkit.org/pipermail/webkit-wpe/2023-September/000612.html Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> --- package/webkitgtk/webkitgtk.mk | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)