Skip to content

Commit c80f57b

Browse files
committed
Merge bitcoin#29177: build: Fix check whether -latomic needed
f8ca135 build: Fix check whether `-latomic` needed (Hennadii Stepanov) Pull request description: Clang >=15 still might need linking against `libatomic`. We use `std::atomic<std::chrono::seconds>::compare_exchange_strong` in `net_processing.cpp`. Addresses the bitcoin#29165 (comment). ACKs for top commit: maflcko: lgtm ACK f8ca135 fanquake: ACK f8ca135 Tree-SHA512: ba8b6a88fd3471a206d068e8a000a053c99cb46d26bd04624418ddb066b3b9664a569ec8a1569af67c96b3e27f13dccbd5e24f985290ac072b6d74c92524e35d
2 parents 143ace6 + f8ca135 commit c80f57b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

build-aux/m4/l_atomic.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dnl permitted in any medium without royalty provided the copyright notice
44
dnl and this notice are preserved. This file is offered as-is, without any
55
dnl warranty.
66

7-
# Clang prior to version 15, when building for 32-bit,
7+
# Clang, when building for 32-bit,
88
# and linking against libstdc++, requires linking with
99
# -latomic if using the C++ atomic library.
1010
# Can be tested with: clang++ test.cpp -m32
@@ -24,6 +24,8 @@ m4_define([_CHECK_ATOMIC_testbody], [[
2424
2525
std::atomic<std::chrono::seconds> t{0s};
2626
t.store(2s);
27+
auto t1 = t.load();
28+
t.compare_exchange_strong(t1, 3s);
2729
2830
std::atomic<int64_t> a{};
2931

0 commit comments

Comments
 (0)