Skip to contentSkip to conversation

package/webkitgtk: build fixes for CPUs which need CLoop

PATCH New Adrian Perez de Castro 3 participants 6 messages Oct 20, 2020 – Oct 29, 2020

lore
Share & tools
lore
#0 lore raw

cover package/webkitgtk: build fixes for CPUs which need CLoop

Hello again,

Recently it has come to my attention that the JavaScriptCore JIT support for ARMv5 and ARMv6 has biytrotted and has not received fixes lately, due to a bug reported [1] against Cog.

This patch set fixes the build with ENABLE_C_LOOP set, and adds both ARMv5 and ARMv6 to the list of target CPUs that need to use it.

This is the same as the patch set I sent a moment ago for WPE WebKit, but for WebKitGTK instead :)

Cheers,
?Adri?n

---
[1] https://github.com/Igalia/cog/issues/210

Adrian Perez de Castro (2):
package/webkitgtk: fix build with ENABLE_C_LOOP=ON package/webkitgtk: disable JIT for ARMv5 and ARMv6

 package/webkitgtk/webkitgtk.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/2 package/webkitgtk: fix build with ENABLE_C_LOOP=ON

The ENABLE_C_LOOP option conflicts with ENABLE_SAMPLING_PROFILER, so the WebKit CMake build system will emit an error when both are enabled at the same time. To avoid hitting that situation, explicitly disable ENABLE_SAMPLING_PROFILER as needed.

---
 package/webkitgtk/webkitgtk.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/webkitgtk/webkitgtk.mk +4 -1
index 5293d2d0ff..7fab924cc8 100644
@@ -108,9 +108,12 @@ endif
 # have a check for these processors. 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)
-WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON
+WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF
 endif
 
 $(eval $(cmake-package))
Signature · 1 line
2.28.0
#2 lore raw

PATCH 1/2 package/webkitgtk: fix build with ENABLE_C_LOOP=ON

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Adrian" == Adrian Perez de Castro <[email protected]> writes:

The ENABLE_C_LOOP option conflicts with ENABLE_SAMPLING_PROFILER, so the WebKit CMake build system will emit an error when both are enabled at the same time. To avoid hitting that situation, explicitly disable ENABLE_SAMPLING_PROFILER as needed.

Committed to 2020.02.x and 2020.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 package/webkitgtk: disable JIT for ARMv5 and ARMv6

In reply to Adrian Perez de Castro

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.

---
 package/webkitgtk/webkitgtk.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
package/webkitgtk/webkitgtk.mk +6 -4
index 7fab924cc8..3d0780cb10 100644
@@ -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
 
Signature · 1 line
2.28.0
#4 lore raw

PATCH 2/2 package/webkitgtk: disable JIT for ARMv5 and ARMv6

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Adrian" == Adrian Perez de Castro <[email protected]> writes:

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.

Committed to 2020.02.x and 2020.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

cover package/webkitgtk: build fixes for CPUs which need CLoop

In reply to Adrian Perez de Castro
Quoted 3 lines · On Tue, 20 Oct 2020 18:53:09 +0300 Adrian Perez de Castro <[email protected]>…

Adrian Perez de Castro (2):
package/webkitgtk: fix build with ENABLE_C_LOOP=ON package/webkitgtk: disable JIT for ARMv5 and ARMv6

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com