Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: trivial 2024 10 23 pr10 #6353

Merged
merged 8 commits into from
Oct 25, 2024
Merged

backport: trivial 2024 10 23 pr10 #6353

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f39fcd1
Merge bitcoin/bitcoin#24988: lint: Mention NONFATAL_UNREACHABLE in li…
fanquake Apr 28, 2022
c91f010
Merge bitcoin/bitcoin#25092: doc: various developer notes updates
May 16, 2022
de17997
Merge bitcoin/bitcoin#24062: refactor: replace RecursiveMutex `m_most…
May 17, 2022
1204dc0
Merge bitcoin/bitcoin#25486: test: fix failing test `interface_usdt_u…
Jun 28, 2022
b66eebe
Merge bitcoin/bitcoin#25599: build: Check for std::atomic::exchange r…
fanquake Jul 18, 2022
e2e8598
Merge bitcoin/bitcoin#23997: wallet: avoid rescans under assumed-vali…
achow101 Jul 18, 2022
c59cb15
Merge bitcoin/bitcoin#26282: wallet: have prune error take precedence…
fanquake Oct 10, 2022
4101fea
Merge bitcoin/bitcoin#28304: doc: Remove confusing assert linter
fanquake Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge bitcoin#25599: build: Check for std::atomic::exchange rather th… 
…an std::atomic_exchange

4de4221 build: Check for std::atomic::exchange rather than std::atomic_exchange (Andrew Chow)

Pull request description:

  Our usage of std::atomic is with it's own exchange function, not std::atomic_exchange. So we should be looking specifically for that function.

  This removes the need for -latomic for riscv builds, which resolves a guix cross architecture reproducibility issue.

ACKs for top commit:
  hebasto:
    ACK 4de4221
  fanquake:
    ACK 4de4221

Tree-SHA512: dd8225fc9c6a335601f611700003d0249b9ef941efa502db39306129677929d013048e9221be1d6d7f0ea2d90313d4b87de239f441be21b25bea40a6c19a031e
  • Loading branch information
@fanquake @PastaPastaPasta
fanquake authored and PastaPastaPasta committed Oct 25, 2024
commit b66eebe64d20eab262f715748c8df11a8786f72c
5 changes: 4 additions & 1 deletion build-aux/m4/l_atomic.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ m4_define([_CHECK_ATOMIC_testbody], [[

int main() {
std::atomic<bool> lock{true};
std::atomic_exchange(&lock, false);
lock.exchange(false);

std::atomic<std::chrono::seconds> t{0s};
t.store(2s);
Expand All @@ -34,6 +34,8 @@ m4_define([_CHECK_ATOMIC_testbody], [[
AC_DEFUN([CHECK_ATOMIC], [

AC_LANG_PUSH(C++)
TEMP_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"

AC_MSG_CHECKING([whether std::atomic can be used without link library])

Expand All @@ -51,5 +53,6 @@ AC_DEFUN([CHECK_ATOMIC], [
])
])

CXXFLAGS="$TEMP_CXXFLAGS"
AC_LANG_POP
])
6 changes: 3 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ else
AX_CXX_COMPILE_STDCXX([20], [noext], [mandatory])
fi

dnl Check if -latomic is required for <std::atomic>
CHECK_ATOMIC

dnl check if additional link flags are required for std::filesystem
CHECK_FILESYSTEM

Expand Down Expand Up @@ -896,6 +893,9 @@ AC_C_BIGENDIAN
dnl Check for pthread compile/link requirements
AX_PTHREAD

dnl Check if -latomic is required for <std::atomic>
CHECK_ATOMIC

dnl The following macro will add the necessary defines to bitcoin-config.h, but
dnl they also need to be passed down to any subprojects. Pull the results out of
dnl the cache and add them to CPPFLAGS.
Expand Down