From 46704f89e82efaf012f2f82cba086fe6b0b8cf7e Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 20 Oct 2020 18:53:11 +0300 Subject: [PATCH] package/webkitgtk: disable JIT for ARMv5 and ARMv6 WebKit's JavaScriptCore does not support using JIT nor the LLint interpreter on ARMv5 and ARMv6, so add those two cases when checking for target CPUs which need to use the CLoop interpreter. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 594eb3df506957a9f52eb8bfef6482149d0c28e5) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b760a1f2bf..18b4269322 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -105,14 +105,16 @@ WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF endif # JIT is not supported for MIPS r6, but the WebKit build system does not -# have a check for these processors. Disable JIT forcibly here and use -# the CLoop interpreter instead. +# have a check for these processors. The same goes for ARMv5 and ARMv6. +# Disable JIT forcibly here and use the CLoop interpreter instead. # # Also, we have to disable the sampling profiler, which does NOT work # with ENABLE_C_LOOP. # -# Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=191258 -ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) +# Upstream bugs: https://bugs.webkit.org/show_bug.cgi?id=191258 +# https://bugs.webkit.org/show_bug.cgi?id=172765 +# +ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif