Changeset 204823 in webkit

Timestamp:

Aug 23, 2016, 5:30:41 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r203446 - JSC JIT Broken on ARMv7 Traditional (without Thumb2)
​https://bugs.webkit.org/show_bug.cgi?id=159880

Reviewed by Carlos Garcia Campos.

• Source/cmake/OptionsCommon.cmake: Use the BFD linker on ARM traditional because of a gold linker bug.

Location:

releases/WebKitGTK/webkit-2.12

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)

releases/WebKitGTK/webkit-2.12/ChangeLog

@@ +1 @@
+2016-07-20  Csaba Osztrogonác  <ossy@webkit.org>
+
+        JSC JIT Broken on ARMv7 Traditional (without Thumb2)
+        https://bugs.webkit.org/show_bug.cgi?id=159880
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsCommon.cmake: Use the BFD linker on ARM traditional because of a gold linker bug.
+
 2016-05-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.12/Source/cmake/OptionsCommon.cmake

@@ -69 +69 @@
 EXPOSE_VARIABLE_TO_BUILD(WTF_CPU_ARM64_CORTEXA53)
 
+set(ARM_TRADITIONAL_DETECTED FALSE)
+if (WTF_CPU_ARM)
+    set(ARM_THUMB2_TEST_SOURCE
+    "
+    #if !defined(thumb2) && !defined(__thumb2__)
+    #error \"Thumb2 instruction set isn't available\"
+    #endif
+    int main() {}
+   ")
+
+    include(CheckCXXSourceCompiles)
+    CHECK_CXX_SOURCE_COMPILES("${ARM_THUMB2_TEST_SOURCE}" ARM_THUMB2_DETECTED)
+    if (NOT ARM_THUMB2_DETECTED)
+        set(ARM_TRADITIONAL_DETECTED TRUE)
+        # See https://bugs.webkit.org/show_bug.cgi?id=159880#c4 for details.
+        message(STATUS "Disabling GNU gold linker, because it doesn't support ARM instruction set properly.")
+    endif ()
+endif ()
+
 # Use ld.gold if it is available and isn't disabled explicitly
 include(CMakeDependentOption)
 CMAKE_DEPENDENT_OPTION(USE_LD_GOLD "Use GNU gold linker" ON
-                       "NOT CXX_ACCEPTS_MFIX_CORTEX_A53_835769" OFF)
+                       "NOT CXX_ACCEPTS_MFIX_CORTEX_A53_835769;NOT ARM_TRADITIONAL_DETECTED" OFF)
 if (USE_LD_GOLD)
     execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)