Changeset 274476 in webkit

Timestamp:

Mar 16, 2021, 7:22:51 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[CMake] Build fails on RISC-V with GCC 11
​https://bugs.webkit.org/show_bug.cgi?id=222959

Patch by Khem Raj <​raj.khem@gmail.com> on 2021-03-16
Reviewed by Carlos Alberto Lopez Perez.

.:

Check for 1 byte atomic operations along with 64bit ones, some
architevtures (e.g. RISCV) operations on less than 4 bytes are not lock-free

• Source/cmake/WebKitCompilerFlags.cmake:

Source/JavaScriptCore:

Use renamed variable ATOMICS_REQUIRE_LIBATOMIC instead of ATOMIC_INT64_REQUIRES_LIBATOMIC

• CMakeLists.txt:

Source/WebKit:

Use renamed ATOMICS_REQUIRE_LIBATOMIC instead of ATOMIC_INT64_REQUIRES_LIBATOMIC.

• CMakeLists.txt:

Source/WTF:

Link with libatomic if ATOMICS_REQUIRE_LIBATOMIC is set.

• wtf/CMakeLists.txt:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/CMakeLists.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/CMakeLists.txt (modified) (1 diff)
• Source/WebKit/CMakeLists.txt (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/cmake/WebKitCompilerFlags.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2021-03-16  Khem Raj  <raj.khem@gmail.com>
+
+        [CMake] Build fails on RISC-V with GCC 11
+        https://bugs.webkit.org/show_bug.cgi?id=222959
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Check for 1 byte atomic operations along with 64bit ones, some
+        architevtures (e.g. RISCV) operations on less than 4 bytes are not lock-free
+
+        * Source/cmake/WebKitCompilerFlags.cmake:
+
 2021-03-14  Lauro Moura  <lmoura@igalia.com>
 

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -140 +140 @@
 endif ()
 
-if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
+if (ATOMICS_REQUIRE_LIBATOMIC)
     list(APPEND JavaScriptCore_LIBRARIES atomic)
 endif ()

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-03-16  Khem Raj  <raj.khem@gmail.com>
+
+        [CMake] Build fails on RISC-V with GCC 11
+        https://bugs.webkit.org/show_bug.cgi?id=222959
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Use renamed variable ATOMICS_REQUIRE_LIBATOMIC instead of ATOMIC_INT64_REQUIRES_LIBATOMIC
+
+        * CMakeLists.txt:
+
 2021-03-15  Angelos Oikonomopoulos  <angelos@igalia.com>
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-03-16  Khem Raj  <raj.khem@gmail.com>
+
+        [CMake] Build fails on RISC-V with GCC 11
+        https://bugs.webkit.org/show_bug.cgi?id=222959
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Link with libatomic if ATOMICS_REQUIRE_LIBATOMIC is set.
+
+        * wtf/CMakeLists.txt:
+
 2021-03-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/CMakeLists.txt

@@ -532 +532 @@
 endif ()
 
+if (ATOMICS_REQUIRE_LIBATOMIC)
+    list(APPEND WTF_LIBRARIES atomic)
+endif ()
+
 set(WTF_INTERFACE_LIBRARIES WTF)
 set(WTF_INTERFACE_INCLUDE_DIRECTORIES ${WTF_FRAMEWORK_HEADERS_DIR})

trunk/Source/WebKit/CMakeLists.txt

@@ -347 +347 @@
 endif ()
 
-if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
+if (ATOMICS_REQUIRE_LIBATOMIC)
     list(APPEND WebKit_PRIVATE_LIBRARIES atomic)
 endif ()

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-16  Khem Raj  <raj.khem@gmail.com>
+
+        [CMake] Build fails on RISC-V with GCC 11
+        https://bugs.webkit.org/show_bug.cgi?id=222959
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Use renamed ATOMICS_REQUIRE_LIBATOMIC instead of ATOMIC_INT64_REQUIRES_LIBATOMIC.
+
+        * CMakeLists.txt:
+
 2021-03-16  Lauro Moura  <lmoura@igalia.com>
 

trunk/Source/cmake/WebKitCompilerFlags.cmake

@@ -275 +275 @@
     set(ATOMIC_TEST_SOURCE "
         #include <atomic>
-        int main() { std::atomic<int64_t> i(0); i++; return 0; }
+        int main() {
+          std::atomic<bool> y (false);
+          std::atomic<uint64_t> x (0);
+          bool expected = true;
+          bool j = y.compare_exchange_weak(expected,false);
+          x++;
+          return 0;
+        }
     ")
-    check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_IS_BUILTIN)
-    if (NOT ATOMIC_INT64_IS_BUILTIN)
+    check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMICS_ARE_BUILTIN)
+    if (NOT ATOMICS_ARE_BUILTIN)
         set(CMAKE_REQUIRED_LIBRARIES atomic)
-        check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMIC_INT64_REQUIRES_LIBATOMIC)
+        check_cxx_source_compiles("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC)
         unset(CMAKE_REQUIRED_LIBRARIES)
     endif ()