Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame^] | 1 | From dd2d42a7f877d292f86e421dd9651f4b7c2abf18 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 19 Apr 2022 14:57:58 -0700 |
| 4 | Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 |
| 5 | |
| 6 | Use of <atomic> needs to link in libatomic on riscv |
| 7 | Fixes |
| 8 | |
| 9 | undefined reference to `__atomic_exchange_1' |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | src/lib/CMakeLists.txt | 8 +++++++- |
| 15 | 1 file changed, 7 insertions(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt |
| 18 | index 3293376..65018be 100644 |
| 19 | --- a/src/lib/CMakeLists.txt |
| 20 | +++ b/src/lib/CMakeLists.txt |
| 21 | @@ -37,6 +37,12 @@ else() |
| 22 | set(SOCKET_LIBRARY socket) |
| 23 | endif() |
| 24 | |
| 25 | +if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") |
| 26 | + set(ATOMIC_LIBRARY atomic) |
| 27 | +else() |
| 28 | + set(ATOMIC_LIBRARY "") |
| 29 | +endif() |
| 30 | + |
| 31 | if(HAVE_FUNC_PTHREAD_SETNAME_NP) |
| 32 | add_definitions(-DDLT_USE_PTHREAD_SETNAME_NP) |
| 33 | message(STATUS "Using pthread_setname_np API to set thread name") |
| 34 | @@ -44,7 +50,7 @@ else() |
| 35 | message(STATUS "pthread_setname_np API not available on this platform") |
| 36 | endif() |
| 37 | |
| 38 | -target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} Threads::Threads) |
| 39 | +target_link_libraries(dlt ${RT_LIBRARY} ${SOCKET_LIBRARY} ${ATOMIC_LIBRARY} Threads::Threads) |
| 40 | |
| 41 | target_include_directories(dlt |
| 42 | PUBLIC |
| 43 | -- |
| 44 | 2.36.0 |
| 45 | |