Hello, I'm attaching the patch updated (rebased for this release) and submitted upstream.
Description: Link with latomic where needed Author: Gianfranco Costamagna <[email protected]> Bug-Debian: https://bugs.debian.org/1030295 Forwarded: https://github.com/tomopy/tomopy/pull/599 https://github.com/jrmadsen/PTL/pull/40 Last-Update: 2023-02-02
Description: Link with latomic where needed Author: Gianfranco Costamagna <[email protected]> Bug-Debian: https://bugs.debian.org/1030295 Forwarded: https://github.com/tomopy/tomopy/pull/599 https://github.com/jrmadsen/PTL/pull/40 Last-Update: 2023-02-02 From a0ea18b6362245af879a6e4ac8d0ad86f40c3e4c Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna <[email protected]> Date: Thu, 2 Feb 2023 08:34:53 +0100 Subject: [PATCH] Add CheckAtomic package helper to fix build on riscv64 architecture (needing latomic library) --- cmake/Modules/CheckAtomic.cmake | 95 +++++++++++++++++++++++++++++++++ cmake/Modules/Packages.cmake | 10 ++++ 2 files changed, 105 insertions(+) create mode 100644 cmake/Modules/CheckAtomic.cmake diff --git a/cmake/Modules/CheckAtomic.cmake b/cmake/Modules/CheckAtomic.cmake new file mode 100644 index 0000000..d154b11 --- /dev/null +++ b/cmake/Modules/CheckAtomic.cmake @@ -0,0 +1,95 @@ +# SPDX-FileCopyrightText: 2003-2018 University of Illinois at Urbana-Champaign. +# +# SPDX-License-Identifier: BSD-3-Clause + +#[=======================================================================[.rst: +CheckAtomic +----------- + +Check if the compiler supports std:atomic out of the box or if libatomic is +needed for atomic support. If it is needed libatomicis added to +``CMAKE_REQUIRED_LIBRARIES``. So after running CheckAtomic you can use +std:atomic. + +Since 5.75.0. +#]=======================================================================] + +include(CheckCXXSourceCompiles) +include(CheckLibraryExists) + +# Sometimes linking against libatomic is required for atomic ops, if +# the platform doesn't support lock-free atomics. + +function(check_working_cxx_atomics varname) + set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11") + check_cxx_source_compiles(" + #include <atomic> + std::atomic<int> x; + std::atomic<short> y; + std::atomic<char> z; + int main() { + ++z; + ++y; + return ++x; + } + " ${varname}) + set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) +endfunction() + +function(check_working_cxx_atomics64 varname) + set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) + set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}") + check_cxx_source_compiles(" + #include <atomic> + #include <cstdint> + std::atomic<uint64_t> x (0); + int main() { + uint64_t i = x.load(std::memory_order_relaxed); + return 0; + } + " ${varname}) + set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) +endfunction() + +# Check for (non-64-bit) atomic operations. +if(MSVC) + set(HAVE_CXX_ATOMICS_WITHOUT_LIB True) +elseif(LLVM_COMPILER_IS_GCC_COMPATIBLE) + # First check if atomics work without the library. + check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB) + # If not, check if the library exists, and atomics work with it. + if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) + check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) + if(HAVE_LIBATOMIC) + list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") + check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB) + if (NOT HAVE_CXX_ATOMICS_WITH_LIB) + message(FATAL_ERROR "Host compiler must support std::atomic!") + endif() + else() + message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.") + endif() + endif() +endif() + +# Check for 64 bit atomic operations. +if(MSVC) + set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True) +elseif(LLVM_COMPILER_IS_GCC_COMPATIBLE) + # First check if atomics work without the library. + check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB) + # If not, check if the library exists, and atomics work with it. + if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) + check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64) + if(HAVE_CXX_LIBATOMICS64) + list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") + check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB) + if (NOT HAVE_CXX_ATOMICS64_WITH_LIB) + message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!") + endif() + else() + message(FATAL_ERROR "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.") + endif() + endif() +endif() diff --git a/cmake/Modules/Packages.cmake b/cmake/Modules/Packages.cmake index 22a1fbe..ff9648c 100644 --- a/cmake/Modules/Packages.cmake +++ b/cmake/Modules/Packages.cmake @@ -23,6 +23,16 @@ if(CMAKE_C_COMPILER_IS_INTEL OR CMAKE_CXX_COMPILER_IS_INTEL) endif() +# ############################################################################## +# +# Link atomic library if needed +# +# ############################################################################## +include(CheckAtomic) +if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) + list(APPEND TOMOPY_EXTERNAL_PRIVATE_LIBRARIES "atomic") +endif() + ################################################################################ # # Prefix path to Anaconda installation diff --git a/PTL/cmake/Modules/Packages.cmake b/PTL/cmake/Modules/Packages.cmake index 2f92d5e..0883e54 100644 --- a/PTL/cmake/Modules/Packages.cmake +++ b/PTL/cmake/Modules/Packages.cmake @@ -21,6 +21,16 @@ if(Threads_FOUND) list(APPEND PRIVATE_EXTERNAL_LIBRARIES Threads::Threads) endif() +# ############################################################################## +# +# Link atomic library if needed +# +# ############################################################################## +include(CheckAtomic) +if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) + list(APPEND EXTERNAL_PRIVATE_LIBRARIES "atomic") +endif() + ################################################################################ # # TiMemory -- 2.34.1
0001-Patching-setup.py.patch 0002-Don-t-try-to-git-clone-the-PTL-submodule.patch cmake-args.patch 0004-Check-for-appropriate-version-of-libufo.patch fix-build.patch
OpenPGP_signature
Description: OpenPGP digital signature
