upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Import c812a07cd2f95c1403baf0bbe0366e7618d1d6d3 of libcxxrt:

Browse source 
*   Fix a copy-and-paste error when setting the unexpected exception handler
    (actually set the terminate handler by mistake).

*   Fix some warnings.

    Patch by Joerg Sonnenberger!

*   Don't call the _fast version of the TLS accessor in terminate() or unexpected().

    1) TLS may not have been set up yet.
    2) When we're in one of these functions, Really Bad Stuff has happened and potentially saving a few cycles really isn't important.

*   Merge in fixes from FreeBSD trunk to make atomics work with recent clang.
This commit is contained in:
Dimitry Andric 2013-04-27 17:19:07 +00:00
parent a694e2e496
commit af04c9e2c0
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atomic.h
View file

@ -9,9 +9,9 @@
* Swap macro that enforces a happens-before relationship with a corresponding
* ATOMIC_LOAD.
*/
#if __has_feature(cxx_atomic)
#if __has_builtin(__c11_atomic_exchange)
#define ATOMIC_SWAP(addr, val)\
__atomic_exchange(addr, val, __ATOMIC_ACQ_REL)
__c11_atomic_exchange((_Atomic(__typeof__(val))*)addr, val, __ATOMIC_ACQ_REL)
#elif __has_builtin(__sync_swap)
#define ATOMIC_SWAP(addr, val)\
__sync_swap(addr, val)
@ -20,9 +20,9 @@
__sync_lock_test_and_set(addr, val)
#endif
#if __has_feature(cxx_atomic)
#if __has_builtin(__c11_atomic_load)
#define ATOMIC_LOAD(addr)\
__atomic_load(addr, __ATOMIC_ACQUIRE)
__c11_atomic_load((_Atomic(__typeof__(*addr))*)addr, __ATOMIC_ACQUIRE)
#else
#define ATOMIC_LOAD(addr)\
(__sync_synchronize(), *addr)

6
exception.cc
View file

@ -1387,7 +1387,7 @@ namespace std
{
if (thread_local_handlers) { return pathscale::set_unexpected(f); }
return ATOMIC_SWAP(&terminateHandler, f);
return ATOMIC_SWAP(&unexpectedHandler, f);
}
/**
* Sets the function that is called to terminate the program.
@ -1404,7 +1404,7 @@ namespace std
*/
void terminate()
{
static __cxa_thread_info *info = thread_info_fast();
static __cxa_thread_info *info = thread_info();
if (0 != info && 0 != info->terminateHandler)
{
info->terminateHandler();
@ -1421,7 +1421,7 @@ namespace std
*/
void unexpected()
{
static __cxa_thread_info *info = thread_info_fast();
static __cxa_thread_info *info = thread_info();
if (0 != info && 0 != info->unexpectedHandler)
{
info->unexpectedHandler();