-----BEGIN PGP SIGNATURE----- iQJHBAABCgAxFiEE5688gqe4PSusUZcLZkYmW1hrg8sFAmJ/5PkTHG1pdHlhNTdA ZGViaWFuLm9yZwAKCRBmRiZbWGuDy5EoD/wN/xznFEfPL8/eVhFsvsDXIysndIQV N7GpO57VUdGsfeK2fjqbdv3lblvytqvG5jk6KF5ihAUyR1s4YxoYUMUilyjmXaB+ eGoMj8PEG3yA6xncAxNBRYCEaUfdUO6OsGWyPew1EULclvtX56ot/iN8GTSQWv6J SYrJxF7xH5nq0Sn8CVPbauFR/wPu5k2644cVVcFAJ6Xw265iY/I9Ndy4XJHdfH5i VS36AotbqLrrcJBvnx4E3G/rzZT5ArqCzJq4Wnz+Z4f1TF4UzFhp46FkyFFRE0IS H41UWrAY6DcS31wysSxHz1YPdOc/WMm1o+JEdhNqq0YrfXa8h+Don66eTvkntSFd cmSbqW69aZvhOYEjb8Yd8IDyVgZD9sO3SIFLcePCt3nh5f8KtWl4bKn7CHq5BGnm W83whObuGCFM1lfAuZqIperh9hhSlSnsvu0eFRtw6rpB5CLmCFozqJNauX2ml6H5 TlbILE3iw7kEEHs0SNzwt+QoXWc4X1Z3E6CzV5mFEXMYMrTkMUrQ4ChTrums2r88 ZJZgtn6xxLNrVivzMUu85Td27egZWMP8OL8R++oDtnuobQ2MpcYl0kXFOWgJy2Mk MIL6gLsuz/03uzkwXMjFwAryF9wN+gdTaj0cRpy38yGAmhBduirHjTuQxaq52WyZ D/CVeP2lYb2egQ== =HnZA -----END PGP SIGNATURE----- Merge tag 'debian/6.2.4+dfsg-7' into experimental 6.2.4+dfsg-7 unstable; urgency=mediumci/unstable
Dmitry Shachnev
3 years ago
commit
fec0a88773
@ -0,0 +1,82 @@
|
||||
From 4088b27b9397fa9877bf60b8e707bba5dc51e9cb Mon Sep 17 00:00:00 2001
|
||||
From: Moody Liu <mooodyhunter@outlook.com>
|
||||
Date: Tue, 12 Apr 2022 10:40:00 +0100
|
||||
Subject: [PATCH] Explicitly check for atomic addition and relaxed load
|
||||
operation support
|
||||
|
||||
...and properly find and link against `libatomic` using find_library.
|
||||
This fixes the qtdeclarative build on the RISC-V platform.
|
||||
|
||||
Initial-patch-by: Sprite <SpriteOvO@gmail.com>
|
||||
Pick-to: 6.2
|
||||
Pick-to: 6.3
|
||||
Task-number: QTBUG-99234
|
||||
Change-Id: I2b5e4812886ce45cb02bed3106ce8c519b294cbe
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
||||
---
|
||||
cmake/FindWrapAtomic.cmake | 34 +++++++++++++++++++---------------
|
||||
1 file changed, 19 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/cmake/FindWrapAtomic.cmake b/cmake/FindWrapAtomic.cmake
|
||||
index c2582bdd6b..3ea72bb188 100644
|
||||
--- a/cmake/FindWrapAtomic.cmake
|
||||
+++ b/cmake/FindWrapAtomic.cmake
|
||||
@@ -10,35 +10,39 @@ include(CheckCXXSourceCompiles)
|
||||
set (atomic_test_sources "#include <atomic>
|
||||
#include <cstdint>
|
||||
|
||||
-void test(volatile std::atomic<std::int64_t> &a)
|
||||
-{
|
||||
- std::int64_t v = a.load(std::memory_order_acquire);
|
||||
- while (!a.compare_exchange_strong(v, v + 1,
|
||||
- std::memory_order_acq_rel,
|
||||
- std::memory_order_acquire)) {
|
||||
- v = a.exchange(v - 1);
|
||||
- }
|
||||
- a.store(v + 1, std::memory_order_release);
|
||||
-}
|
||||
-
|
||||
int main(int, char **)
|
||||
{
|
||||
- void *ptr = (void*)0xffffffc0; // any random pointer
|
||||
- test(*reinterpret_cast<std::atomic<std::int64_t> *>(ptr));
|
||||
+ volatile std::atomic<char> size_1;
|
||||
+ volatile std::atomic<short> size_2;
|
||||
+ volatile std::atomic<int> size_4;
|
||||
+ volatile std::atomic<int64_t> size_8;
|
||||
+
|
||||
+ ++size_1;
|
||||
+ ++size_2;
|
||||
+ ++size_4;
|
||||
+ ++size_8;
|
||||
+
|
||||
+ (void)size_1.load(std::memory_order_relaxed);
|
||||
+ (void)size_2.load(std::memory_order_relaxed);
|
||||
+ (void)size_4.load(std::memory_order_relaxed);
|
||||
+ (void)size_8.load(std::memory_order_relaxed);
|
||||
+
|
||||
return 0;
|
||||
}")
|
||||
|
||||
check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC)
|
||||
if(NOT HAVE_STDATOMIC)
|
||||
set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}")
|
||||
- set(CMAKE_REQUIRED_LIBRARIES "atomic")
|
||||
+ find_library(atomic_LIB atomic REQUIRED)
|
||||
+ set(CMAKE_REQUIRED_LIBRARIES ${atomic_LIB})
|
||||
check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB)
|
||||
set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}")
|
||||
endif()
|
||||
|
||||
add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
|
||||
if(HAVE_STDATOMIC_WITH_LIB)
|
||||
- target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
|
||||
+ # atomic_LIB is already found above.
|
||||
+ target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${atomic_LIB})
|
||||
endif()
|
||||
|
||||
set(WrapAtomic_FOUND 1)
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From e2a8b0adbd099cfda84e931f6a24f34e80b12fd7 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Shachnev <mitya57@gmail.com>
|
||||
Date: Sat, 7 May 2022 20:51:25 +0300
|
||||
Subject: [PATCH] Hardcode atomic_LIB as -latomic
|
||||
|
||||
find_library does not always work because libatomic.so may be in a path
|
||||
like /usr/lib/gcc/x86_64-linux-gnu/11/libatomic.so, which CMake does not
|
||||
consider by default.
|
||||
|
||||
Pick-to: 6.3
|
||||
Change-Id: I73a657c470efa4f84f8629bd531edfcac3b3a352
|
||||
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
||||
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
||||
---
|
||||
cmake/FindWrapAtomic.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/FindWrapAtomic.cmake b/cmake/FindWrapAtomic.cmake
|
||||
index 3ea72bb188..006be0ed8f 100644
|
||||
--- a/cmake/FindWrapAtomic.cmake
|
||||
+++ b/cmake/FindWrapAtomic.cmake
|
||||
@@ -33,7 +33,7 @@ int main(int, char **)
|
||||
check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC)
|
||||
if(NOT HAVE_STDATOMIC)
|
||||
set(_req_libraries "${CMAKE_REQUIRED_LIBRARIES}")
|
||||
- find_library(atomic_LIB atomic REQUIRED)
|
||||
+ set(atomic_LIB "-latomic")
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${atomic_LIB})
|
||||
check_cxx_source_compiles("${atomic_test_sources}" HAVE_STDATOMIC_WITH_LIB)
|
||||
set(CMAKE_REQUIRED_LIBRARIES "${_req_libraries}")
|
||||
--
|
||||
2.35.1
|
||||
|
||||
Loading…
Reference in new issue