Changeset 232062 in webkit

Timestamp:

May 22, 2018 6:20:03 AM (6 years ago)

Author:

Michael Catanzaro

Message:

Unreviewed, rolling out r231843.

Broke cross build

Reverted changeset:

"[CMake] Properly detect compiler flags, needed libs, and
fallbacks for usage of 64-bit atomic operations"
​https://bugs.webkit.org/show_bug.cgi?id=182622
​https://trac.webkit.org/changeset/231843

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/CMakeLists.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/WebKit/CMakeLists.txt (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)
• Source/cmake/OptionsJSCOnly.cmake (modified) (1 diff)
• Source/cmake/OptionsWPE.cmake (modified) (1 diff)
• Source/cmake/WebKitCompilerFlags.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2018-05-22  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r231843.
+
+        Broke cross build
+
+        Reverted changeset:
+
+        "[CMake] Properly detect compiler flags, needed libs, and
+        fallbacks for usage of 64-bit atomic operations"
+        https://bugs.webkit.org/show_bug.cgi?id=182622
+        https://trac.webkit.org/changeset/231843
+
 2018-05-21  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -125 +125 @@
 endif ()
 
-if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
-    list(APPEND JavaScriptCore_LIBRARIES atomic)
+# 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 ()
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-05-22  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r231843.
+
+        Broke cross build
+
+        Reverted changeset:
+
+        "[CMake] Properly detect compiler flags, needed libs, and
+        fallbacks for usage of 64-bit atomic operations"
+        https://bugs.webkit.org/show_bug.cgi?id=182622
+        https://trac.webkit.org/changeset/231843
+
 2018-05-21  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebKit/CMakeLists.txt

@@ -811 +811 @@
 endif ()
 
-if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
-    list(APPEND WebKit_LIBRARIES PRIVATE atomic)
+if (COMPILER_IS_GCC_OR_CLANG)
+    set(ATOMIC_TEST_SOURCE
+    "
+        #include <atomic>
+        int main() { std::atomic<int64_t> i(0); i++; return 0; }
+    "
+    )
+    check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_IS_BUILTIN)
+    if (NOT ATOMIC_INT64_IS_BUILTIN)
+        set(CMAKE_REQUIRED_LIBRARIES atomic)
+        check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_REQUIRES_LIBATOMIC)
+        if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
+            list(APPEND WebKit_LIBRARIES PRIVATE atomic)
+        endif ()
+        unset(CMAKE_REQUIRED_LIBRARIES)
+    endif ()
 endif ()
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-05-22  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, rolling out r231843.
+
+        Broke cross build
+
+        Reverted changeset:
+
+        "[CMake] Properly detect compiler flags, needed libs, and
+        fallbacks for usage of 64-bit atomic operations"
+        https://bugs.webkit.org/show_bug.cgi?id=182622
+        https://trac.webkit.org/changeset/231843
+
 2018-05-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -17 +17 @@
 set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
 set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 find_package(Cairo 1.10.2 REQUIRED)

trunk/Source/cmake/OptionsJSCOnly.cmake

@@ -1 @@
-set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 

trunk/Source/cmake/OptionsWPE.cmake

@@ -12 +12 @@
 set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
 set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
-
-set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 WEBKIT_OPTION_BEGIN()

trunk/Source/cmake/WebKitCompilerFlags.cmake

@@ -231 +231 @@
    set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
 endif ()
-
-if (COMPILER_IS_GCC_OR_CLANG)
-    set(ATOMIC_TEST_SOURCE "
-        #include <atomic>
-        int main() { std::atomic<int64_t> i(0); i++; return 0; }
-    ")
-    check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_IS_BUILTIN)
-    if (NOT ATOMIC_INT64_IS_BUILTIN)
-        set(CMAKE_REQUIRED_LIBRARIES atomic)
-        check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_REQUIRES_LIBATOMIC)
-        unset(CMAKE_REQUIRED_LIBRARIES)
-    endif ()
-endif ()