diff --git a/webkit-2231-bug-188862.patch b/webkit-2231-bug-188862.patch new file mode 100644 index 0000000..09ccf5c --- /dev/null +++ b/webkit-2231-bug-188862.patch @@ -0,0 +1,35 @@ +From d92edd6dacd7ed0611c101efade666d8bcb9e590 Mon Sep 17 00:00:00 2001 +From: "berto@igalia.com" + +Date: Mon, 26 Nov 2018 08:54:15 +0000 +Subject: [PATCH] [GTK] [2.22.0] Fails to build in armel + https://bugs.webkit.org/show_bug.cgi?id=188862 + +Disable the JIT and enable C_LOOP on ARM CPUs without Thumb2 +support. + +Reviewed by Michael Catanzaro. + +* Source/cmake/WebKitFeatures.cmake: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@238489 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/cmake/WebKitFeatures.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake +index 04bcfe40c85..5b4669fd37a 100644 +--- a/Source/cmake/WebKitFeatures.cmake ++++ b/Source/cmake/WebKitFeatures.cmake +@@ -68,7 +68,7 @@ macro(WEBKIT_OPTION_BEGIN) + set(USE_SYSTEM_MALLOC_DEFAULT OFF) + set(ENABLE_C_LOOP_DEFAULT OFF) + set(ENABLE_SAMPLING_PROFILER_DEFAULT ON) +- elseif (WTF_CPU_ARM AND WTF_OS_LINUX) ++ elseif (WTF_CPU_ARM AND WTF_OS_LINUX AND ARM_THUMB2_DETECTED) + set(ENABLE_JIT_DEFAULT ON) + set(ENABLE_FTL_DEFAULT OFF) + set(USE_SYSTEM_MALLOC_DEFAULT OFF) +-- +2.19.1 + diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 8ee3502..943a26e 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -27,6 +27,9 @@ Patch3: python2.patch # https://bugs.webkit.org/show_bug.cgi?id=191923 # Add missing cmake files for 2.23.1 Patch4: webkit-2231-bug-191923-files.patch +# https://bugs.webkit.org/show_bug.cgi?id=188862 +# Disable the JIT and enable C_LOOP on ARM CPUs without Thumb2 support. +Patch5: webkit-2231-bug-188862.patch BuildRequires: bison BuildRequires: bubblewrap @@ -208,15 +211,6 @@ pushd %{_target_platform} %ifarch s390x %{power64} -DUSE_SYSTEM_MALLOC=ON \ %endif -%ifarch armv7hl -%if 0 - # https://bugs.webkit.org/show_bug.cgi?id=191675 - # 2.23.1 dropped support of OFFLINE_ASM_BACKEND "ARMv7_TRADITIONAL" (non-Thumb2). - # Use "C_LOOP" instead and ensure it is forced. -%endif - -DENABLE_JIT=OFF \ - -DENABLE_C_LOOP=ON \ -%endif .. popd