[OE-core] [PATCH] webkitgtk: Switch the ARMv7 build to Thumb2 and enable back the JSC JIT.

[Gary Thomas]

On 2016-07-18 23:19, Carlos Alberto Lopez Perez wrote:
> * The JSC JIT is broken on ARMv7 without Thumb2.
>
> [YOCTO #9474]
>
> Signed-off-by: Carlos Alberto Lopez Perez <clopez at igalia.com>

Works on my i.MX6Q target!

Acked-by: Gary Thomas <gary at mlbassoc.com>

> ---
>   meta/recipes-sato/webkit/webkitgtk_2.12.3.bb | 17 ++++++++++++-----
>   1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
> index c5e5432..536fa23 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.12.3.bb
> @@ -71,10 +71,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 "
> @@ -89,7 +85,18 @@ 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_armv7m = "thumb"
> +ARM_INSTRUCTION_SET_armv7ve = "thumb"
>
>   # Invalid data memory access: 0x00000000
>   # ...
>


-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------