From efd7d6b6fc7c41fe5fa4cb1af440c9b456f227d2 Mon Sep 17 00:00:00 2001 From: Carlos Alberto Lopez Perez Date: Mon, 18 Jul 2016 23:19:56 +0200 Subject: webkitgtk: Switch the ARMv7 build to Thumb2 and enable back the JSC JIT. * The JSC JIT is broken on ARMv7 without Thumb2. [YOCTO #9474] (From OE-Core rev: bb7bc6061b70648635d969e66c6ed333ca5f427e) Signed-off-by: Carlos Alberto Lopez Perez Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-sato/webkit/webkitgtk_2.12.3.bb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb index 28517c44c8..85876d5c5d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb @@ -72,10 +72,6 @@ EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " -# ARM JIT can build on armv7a, but doesnt' work on runtime, cause -# displaying problems or ephiphany hang. -EXTRA_OECMAKE_append_armv7a = " -DENABLE_JIT=OFF " - # binutils 2.25.1 has a bug on aarch64: # https://sourceware.org/bugzilla/show_bug.cgi?id=18430 EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " @@ -90,7 +86,17 @@ SECURITY_CFLAGS_append_aarch64 = " -fPIE" FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" # http://errors.yoctoproject.org/Errors/Details/20370/ -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" + +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET_armv7a = "thumb" +ARM_INSTRUCTION_SET_armv7r = "thumb" +ARM_INSTRUCTION_SET_armv7ve = "thumb" # Invalid data memory access: 0x00000000 # ... -- cgit v1.2.3-54-g00ecf