From d2aee115cc30f7ef14866ab9dd48c705a61c3f64 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 5 Apr 2016 20:03:46 +0100 Subject: [PATCH] Restore atomic builtins usage in libstdc++-v3 PR libstdc++/70554 * acinclude.m4 (GLIBCXX_ENABLE_ATOMIC_BUILTINS): Don't test __atomic_fetch_add for bool. * configure: Regenerate. From-SVN: r234761 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/acinclude.m4 | 4 ++-- libstdc++-v3/configure | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e12cfbf1bde..4f9e9ef89b8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2016-04-05 Jonathan Wakely + PR libstdc++/70554 + * acinclude.m4 (GLIBCXX_ENABLE_ATOMIC_BUILTINS): Don't test + __atomic_fetch_add for bool. + * configure: Regenerate. + * testsuite/30_threads/thread/70503.cc: Require -static to work. PR libstdc++/70503 diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 95df24a9062..b0f88cbb404 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -3290,7 +3290,7 @@ AC_DEFUN([GLIBCXX_ENABLE_ATOMIC_BUILTINS], [ atomic_type c1; atomic_type c2; atomic_type c3(0); - __atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED); + // N.B. __atomic_fetch_add is not supported for bool. __atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); __atomic_test_and_set(&c1, __ATOMIC_RELAXED); @@ -3375,7 +3375,7 @@ int main() atomic_type c1; atomic_type c2; atomic_type c3(0); - __atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED); + // N.B. __atomic_fetch_add is not supported for bool. __atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); __atomic_test_and_set(&c1, __ATOMIC_RELAXED); diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index acbc6a6bd6e..41797a971b5 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -15229,7 +15229,7 @@ typedef bool atomic_type; atomic_type c1; atomic_type c2; atomic_type c3(0); - __atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED); + // N.B. __atomic_fetch_add is not supported for bool. __atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); __atomic_test_and_set(&c1, __ATOMIC_RELAXED); @@ -15395,7 +15395,7 @@ int main() atomic_type c1; atomic_type c2; atomic_type c3(0); - __atomic_fetch_add(&c1, c2, __ATOMIC_RELAXED); + // N.B. __atomic_fetch_add is not supported for bool. __atomic_compare_exchange_n(&c1, &c2, c3, true, __ATOMIC_ACQ_REL, __ATOMIC_RELAXED); __atomic_test_and_set(&c1, __ATOMIC_RELAXED);