* [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop
@ 2020-10-20 15:53 Adrian Perez de Castro
2020-10-20 15:53 ` [Buildroot] [PATCH 1/2] package/webkitgtk: fix build with ENABLE_C_LOOP=ON Adrian Perez de Castro
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Adrian Perez de Castro @ 2020-10-20 15:53 UTC (permalink / raw)
To: buildroot
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(-)
--
2.28.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 1/2] package/webkitgtk: fix build with ENABLE_C_LOOP=ON
2020-10-20 15:53 [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop Adrian Perez de Castro
@ 2020-10-20 15:53 ` Adrian Perez de Castro
2020-10-29 19:01 ` Peter Korsgaard
2020-10-20 15:53 ` [Buildroot] [PATCH 2/2] package/webkitgtk: disable JIT for ARMv5 and ARMv6 Adrian Perez de Castro
2020-10-25 8:57 ` [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Adrian Perez de Castro @ 2020-10-20 15:53 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
package/webkitgtk/webkitgtk.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index 5293d2d0ff..7fab924cc8 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -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))
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/webkitgtk: disable JIT for ARMv5 and ARMv6
2020-10-20 15:53 [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop Adrian Perez de Castro
2020-10-20 15:53 ` [Buildroot] [PATCH 1/2] package/webkitgtk: fix build with ENABLE_C_LOOP=ON Adrian Perez de Castro
@ 2020-10-20 15:53 ` Adrian Perez de Castro
2020-10-29 19:01 ` Peter Korsgaard
2020-10-25 8:57 ` [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Adrian Perez de Castro @ 2020-10-20 15:53 UTC (permalink / raw)
To: buildroot
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 <aperez@igalia.com>
---
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 7fab924cc8..3d0780cb10 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
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop
2020-10-20 15:53 [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop Adrian Perez de Castro
2020-10-20 15:53 ` [Buildroot] [PATCH 1/2] package/webkitgtk: fix build with ENABLE_C_LOOP=ON Adrian Perez de Castro
2020-10-20 15:53 ` [Buildroot] [PATCH 2/2] package/webkitgtk: disable JIT for ARMv5 and ARMv6 Adrian Perez de Castro
@ 2020-10-25 8:57 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2020-10-25 8:57 UTC (permalink / raw)
To: buildroot
On Tue, 20 Oct 2020 18:53:09 +0300
Adrian Perez de Castro <aperez@igalia.com> wrote:
> 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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-29 19:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-20 15:53 [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop Adrian Perez de Castro
2020-10-20 15:53 ` [Buildroot] [PATCH 1/2] package/webkitgtk: fix build with ENABLE_C_LOOP=ON Adrian Perez de Castro
2020-10-29 19:01 ` Peter Korsgaard
2020-10-20 15:53 ` [Buildroot] [PATCH 2/2] package/webkitgtk: disable JIT for ARMv5 and ARMv6 Adrian Perez de Castro
2020-10-29 19:01 ` Peter Korsgaard
2020-10-25 8:57 ` [Buildroot] [PATCH 0/2] package/webkitgtk: build fixes for CPUs which need CLoop Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.