Changeset 228633 in webkit

Timestamp:

Feb 19, 2018 1:59:48 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228370 - [MIPS] JSC needs to be built with -latomic
​https://bugs.webkit.org/show_bug.cgi?id=182610

Reviewed by Žan Doberšek.

Since r228149, on MIPS we need to link with -latomic, because
atomic_fetch_add_8 is not available as a compiler intrinsic.

• CMakeLists.txt:

Location:

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/CMakeLists.txt

@@ -118 +118 @@
     ${LLVM_LIBRARIES}
 )
+
+# Since r228149, on MIPS we need to link with -latomic, because
+# __atomic_fetch_add_8 is not available as a compiler intrinsic. It is
+# available on other platforms (including 32-bit Arm), so the link with
+# libatomic is only neede on MIPS.
+if (WTF_CPU_MIPS)
+    list(APPEND JavaScriptCore_LIBRARIES
+        -latomic
+    )
+endif ()
 
 set(JavaScriptCore_SCRIPTS_SOURCES_DIR "${JAVASCRIPTCORE_DIR}/Scripts")

releases/WebKitGTK/webkit-2.20/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-02-11  Guillaume Emont  <guijemont@igalia.com>
+
+        [MIPS] JSC needs to be built with -latomic
+        https://bugs.webkit.org/show_bug.cgi?id=182610
+
+        Reviewed by Žan Doberšek.
+
+        Since r228149, on MIPS we need to link with -latomic, because
+        __atomic_fetch_add_8 is not available as a compiler intrinsic.
+
+        * CMakeLists.txt:
+
 2018-01-28  Filip Pizlo  <fpizlo@apple.com>