summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Alberto Lopez Perez <clopez@igalia.com>2016-07-18 23:19:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-26 08:56:27 +0100
commitefd7d6b6fc7c41fe5fa4cb1af440c9b456f227d2 (patch)
treede12ebfc4642bde6d8a9af9ddcce1ddfdb0b44f7
parentb6aa976756e24994a2c60086e5b8c9455c16bbb1 (diff)
downloadpoky-efd7d6b6fc7c41fe5fa4cb1af440c9b456f227d2.tar.gz
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 <clopez@igalia.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.12.3.bb16
1 files changed, 11 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 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 "
72EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " 72EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF "
73EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " 73EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF "
74 74
75# ARM JIT can build on armv7a, but doesnt' work on runtime, cause
76# displaying problems or ephiphany hang.
77EXTRA_OECMAKE_append_armv7a = " -DENABLE_JIT=OFF "
78
79# binutils 2.25.1 has a bug on aarch64: 75# binutils 2.25.1 has a bug on aarch64:
80# https://sourceware.org/bugzilla/show_bug.cgi?id=18430 76# https://sourceware.org/bugzilla/show_bug.cgi?id=18430
81EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF " 77EXTRA_OECMAKE_append_aarch64 = " -DUSE_LD_GOLD=OFF "
@@ -90,7 +86,17 @@ SECURITY_CFLAGS_append_aarch64 = " -fPIE"
90FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" 86FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so"
91 87
92# http://errors.yoctoproject.org/Errors/Details/20370/ 88# http://errors.yoctoproject.org/Errors/Details/20370/
93ARM_INSTRUCTION_SET = "arm" 89ARM_INSTRUCTION_SET_armv4 = "arm"
90ARM_INSTRUCTION_SET_armv5 = "arm"
91ARM_INSTRUCTION_SET_armv6 = "arm"
92
93# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474
94# https://bugs.webkit.org/show_bug.cgi?id=159880
95# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime.
96# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb).
97ARM_INSTRUCTION_SET_armv7a = "thumb"
98ARM_INSTRUCTION_SET_armv7r = "thumb"
99ARM_INSTRUCTION_SET_armv7ve = "thumb"
94 100
95# Invalid data memory access: 0x00000000 101# Invalid data memory access: 0x00000000
96# ... 102# ...