Title: [275024] releases/WebKitGTK/webkit-2.32
- Revision
- 275024
- Author
- [email protected]
- Date
- 2021-03-25 07:06:53 -0700 (Thu, 25 Mar 2021)
Log Message
Merge r274476 - [CMake] Build fails on RISC-V with GCC 11
https://bugs.webkit.org/show_bug.cgi?id=222959
Patch by Khem Raj <[email protected]> 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/_javascript_Core:
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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/ChangeLog (275023 => 275024)
--- releases/WebKitGTK/webkit-2.32/ChangeLog 2021-03-25 14:06:48 UTC (rev 275023)
+++ releases/WebKitGTK/webkit-2.32/ChangeLog 2021-03-25 14:06:53 UTC (rev 275024)
@@ -1,3 +1,15 @@
+2021-03-16 Khem Raj <[email protected]>
+
+ [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-12 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.31.91 release
Modified: releases/WebKitGTK/webkit-2.32/Source/_javascript_Core/CMakeLists.txt (275023 => 275024)
--- releases/WebKitGTK/webkit-2.32/Source/_javascript_Core/CMakeLists.txt 2021-03-25 14:06:48 UTC (rev 275023)
+++ releases/WebKitGTK/webkit-2.32/Source/_javascript_Core/CMakeLists.txt 2021-03-25 14:06:53 UTC (rev 275024)
@@ -137,7 +137,7 @@
list(APPEND _javascript_Core_LIBRARIES capstone)
endif ()
-if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
+if (ATOMICS_REQUIRE_LIBATOMIC)
list(APPEND _javascript_Core_LIBRARIES atomic)
endif ()
Modified: releases/WebKitGTK/webkit-2.32/Source/_javascript_Core/ChangeLog (275023 => 275024)
--- releases/WebKitGTK/webkit-2.32/Source/_javascript_Core/ChangeLog 2021-03-25 14:06:48 UTC (rev 275023)
+++ releases/WebKitGTK/webkit-2.32/Source/_javascript_Core/ChangeLog 2021-03-25 14:06:53 UTC (rev 275024)
@@ -1,3 +1,14 @@
+2021-03-16 Khem Raj <[email protected]>
+
+ [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 <[email protected]>
postprocess-asm/resolve-asm-file-conflicts.rb build failure after upgrading to F34
Modified: releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog (275023 => 275024)
--- releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog 2021-03-25 14:06:48 UTC (rev 275023)
+++ releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog 2021-03-25 14:06:53 UTC (rev 275024)
@@ -1,3 +1,14 @@
+2021-03-16 Khem Raj <[email protected]>
+
+ [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-11 Carlos Garcia Campos <[email protected]>
Unreviewed. [GTK][WPE] Bump libsoup3 version to 2.99.3
Modified: releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/CMakeLists.txt (275023 => 275024)
--- releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/CMakeLists.txt 2021-03-25 14:06:48 UTC (rev 275023)
+++ releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/CMakeLists.txt 2021-03-25 14:06:53 UTC (rev 275024)
@@ -531,6 +531,10 @@
set(WTF_FRAMEWORKS bmalloc)
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})
set(WTF_INTERFACE_DEPENDENCIES WTF_CopyHeaders)
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/CMakeLists.txt (275023 => 275024)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/CMakeLists.txt 2021-03-25 14:06:48 UTC (rev 275023)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/CMakeLists.txt 2021-03-25 14:06:53 UTC (rev 275024)
@@ -346,7 +346,7 @@
list(APPEND WebKit_LIBRARIES webrtc)
endif ()
-if (ATOMIC_INT64_REQUIRES_LIBATOMIC)
+if (ATOMICS_REQUIRE_LIBATOMIC)
list(APPEND WebKit_PRIVATE_LIBRARIES atomic)
endif ()
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (275023 => 275024)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-03-25 14:06:48 UTC (rev 275023)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-03-25 14:06:53 UTC (rev 275024)
@@ -1,3 +1,14 @@
+2021-03-16 Khem Raj <[email protected]>
+
+ [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-15 Philippe Normand <[email protected]>
REGRESSION(r233845): EME Keysystem permission when MediaStream is disabled
Modified: releases/WebKitGTK/webkit-2.32/Source/cmake/WebKitCompilerFlags.cmake (275023 => 275024)
--- releases/WebKitGTK/webkit-2.32/Source/cmake/WebKitCompilerFlags.cmake 2021-03-25 14:06:48 UTC (rev 275023)
+++ releases/WebKitGTK/webkit-2.32/Source/cmake/WebKitCompilerFlags.cmake 2021-03-25 14:06:53 UTC (rev 275024)
@@ -274,12 +274,19 @@
if (COMPILER_IS_GCC_OR_CLANG)
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 ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
