Use __atomic_exchange_n instead of Clang's __sync_swap
Also remove an extra extern "C" from a global variable redeclaration.
This allows building libcxxabi with GCC on my system.
Reviewers: majnemer
Differential Revision: http://reviews.llvm.org/D5604
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@219012 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/src/cxa_default_handlers.cpp b/src/cxa_default_handlers.cpp
index a26ea2a..d34341a 100644
--- a/src/cxa_default_handlers.cpp
+++ b/src/cxa_default_handlers.cpp
@@ -101,9 +101,10 @@
unexpected_handler
set_unexpected(unexpected_handler func) _NOEXCEPT
{
- if (func == 0)
- func = default_unexpected_handler;
- return __sync_swap(&__cxa_unexpected_handler, func);
+ if (func == 0)
+ func = default_unexpected_handler;
+ return __atomic_exchange_n(&__cxa_unexpected_handler, func,
+ __ATOMIC_ACQ_REL);
// Using of C++11 atomics this should be rewritten
// return __cxa_unexpected_handler.exchange(func, memory_order_acq_rel);
}
@@ -111,9 +112,10 @@
terminate_handler
set_terminate(terminate_handler func) _NOEXCEPT
{
- if (func == 0)
- func = default_terminate_handler;
- return __sync_swap(&__cxa_terminate_handler, func);
+ if (func == 0)
+ func = default_terminate_handler;
+ return __atomic_exchange_n(&__cxa_terminate_handler, func,
+ __ATOMIC_ACQ_REL);
// Using of C++11 atomics this should be rewritten
// return __cxa_terminate_handler.exchange(func, memory_order_acq_rel);
}
diff --git a/src/cxa_handlers.cpp b/src/cxa_handlers.cpp
index 674933b..01207ff 100644
--- a/src/cxa_handlers.cpp
+++ b/src/cxa_handlers.cpp
@@ -102,14 +102,14 @@
__terminate(get_terminate());
}
-extern "C" new_handler __cxa_new_handler = 0;
+new_handler __cxa_new_handler = 0;
// In the future these will become:
// std::atomic<std::new_handler> __cxa_new_handler(0);
new_handler
set_new_handler(new_handler handler) _NOEXCEPT
{
- return __sync_swap(&__cxa_new_handler, handler);
+ return __atomic_exchange_n(&__cxa_new_handler, handler, __ATOMIC_ACQ_REL);
// Using of C++11 atomics this should be rewritten
// return __cxa_new_handler.exchange(handler, memory_order_acq_rel);
}
