LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[libc++] Refactoring __sync_* builtins; NFC (Reland)"

Browse Source 
This reverts commit r307595. The commit had some issues that needed
to first be addressed in review.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@307746 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-07-12 01:16:33 +00:00
parent 347be61138
commit d60e344b70
5 changed files with 12 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/support/runtime/exception_fallback.ipp
View File

@@ -9,7 +9,6 @@
//===----------------------------------------------------------------------===//
#include <cstdio>
#include <__atomic_support>
namespace std {
@@ -21,13 +20,13 @@ _LIBCPP_SAFE_STATIC static std::unexpected_handler __unexpected_handler;
unexpected_handler
set_unexpected(unexpected_handler func) _NOEXCEPT
{
return __libcpp_sync_lock_test_and_set(&__unexpected_handler, func);
return __sync_lock_test_and_set(&__unexpected_handler, func);
}
unexpected_handler
get_unexpected() _NOEXCEPT
{
return __libcpp_sync_fetch_and_add(&__unexpected_handler, (unexpected_handler)0);
return __sync_fetch_and_add(&__unexpected_handler, (unexpected_handler)0);
}
@@ -42,13 +41,14 @@ void unexpected()
terminate_handler
set_terminate(terminate_handler func) _NOEXCEPT
{
return __libcpp_sync_lock_test_and_set(&__terminate_handler, func);
return __sync_lock_test_and_set(&__terminate_handler, func);
}
terminate_handler
get_terminate() _NOEXCEPT
{
return __libcpp_sync_fetch_and_add(&__terminate_handler, (terminate_handler)0);
return __sync_fetch_and_add(&__terminate_handler, (terminate_handler)0);
}
#ifndef __EMSCRIPTEN__ // We provide this in JS

6
src/support/runtime/new_handler_fallback.ipp
View File

@@ -8,8 +8,6 @@
//
//===----------------------------------------------------------------------===//
#include <__atomic_support>
namespace std {
_LIBCPP_SAFE_STATIC static std::new_handler __new_handler;
@@ -17,13 +15,13 @@ _LIBCPP_SAFE_STATIC static std::new_handler __new_handler;
new_handler
set_new_handler(new_handler handler) _NOEXCEPT
{
return __libcpp_sync_lock_test_and_set(&__new_handler, handler);
return __sync_lock_test_and_set(&__new_handler, handler);
}
new_handler
get_new_handler() _NOEXCEPT
{
return __libcpp_sync_fetch_and_add<new_handler>(&__new_handler, nullptr);
return __sync_fetch_and_add(&__new_handler, nullptr);
}
} // namespace std