diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-10-29 20:20:26 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-10-29 20:20:26 +0000 |
| commit | 45af08f300240ee2d1271d229a40c2e15047a425 (patch) | |
| tree | e26a50cb494a937fc89802c5609f1e4abf3896d0 /libcxxabi | |
| parent | 3c131e59e94602a3e3165f94bc678d2c399590fa (diff) | |
[libc++abi] Provide __cxa_thread_atexit on Fuchsia
Fuchsia already supports this interface.
Differential Revision: https://reviews.llvm.org/D53801
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/include/cxxabi.h | 4 | ||||
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcxxabi/include/cxxabi.h b/libcxxabi/include/cxxabi.h index 2596560d6e9..c6724ad24dc 100644 --- a/libcxxabi/include/cxxabi.h +++ b/libcxxabi/include/cxxabi.h @@ -160,8 +160,8 @@ __cxa_decrement_exception_refcount(void *primary_exception) throw(); extern _LIBCXXABI_FUNC_VIS bool __cxa_uncaught_exception() throw(); extern _LIBCXXABI_FUNC_VIS unsigned int __cxa_uncaught_exceptions() throw(); -#ifdef __linux__ -// Linux TLS support. Not yet an official part of the Itanium ABI. +#if defined(__linux__) || defined(__Fuchsia__) +// Linux and Fuchsia TLS support. Not yet an official part of the Itanium ABI. // https://sourceware.org/glibc/wiki/Destructor%20support%20for%20thread_local%20variables extern _LIBCXXABI_FUNC_VIS int __cxa_thread_atexit(void (*)(void *), void *, void *) throw(); diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index d3581cc930d..7e21fb2d792 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -31,7 +31,7 @@ else() list(APPEND LIBCXXABI_SOURCES cxa_noexception.cpp) endif() -if (LIBCXXABI_ENABLE_THREADS AND UNIX AND NOT (APPLE OR CYGWIN)) +if (LIBCXXABI_ENABLE_THREADS AND (UNIX OR FUCHSIA) AND NOT (APPLE OR CYGWIN)) list(APPEND LIBCXXABI_SOURCES cxa_thread_atexit.cpp) endif() |