diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2024-02-05 12:18:52 -0500 |
|---|---|---|
| committer | Louis Dionne <ldionne.2@gmail.com> | 2024-02-05 12:19:15 -0500 |
| commit | c5f68a711c62aa1748c03215d95ad9b8c7dff9dd (patch) | |
| tree | d56eeab7875f616e442e81bf7b457a0a596c1e1d | |
| parent | 04f99bec9af495c2571c9e7dcb14face3cfea4ce (diff) | |
| download | llvm-c5f68a711c62aa1748c03215d95ad9b8c7dff9dd.zip llvm-c5f68a711c62aa1748c03215d95ad9b8c7dff9dd.tar.gz llvm-c5f68a711c62aa1748c03215d95ad9b8c7dff9dd.tar.bz2 | |
[libc++abi] Revert temporary workaround to unblock Chrome
This reverts commit 372f7dd48f016, which is not needed by Chrome anymore.
| -rw-r--r-- | libcxxabi/src/cxa_exception_storage.cpp | 7 | ||||
| -rw-r--r-- | libcxxabi/src/cxa_guard_impl.h | 8 | ||||
| -rw-r--r-- | libcxxabi/src/cxa_thread_atexit.cpp | 7 | ||||
| -rw-r--r-- | libcxxabi/src/fallback_malloc.cpp | 7 | ||||
| -rw-r--r-- | libcxxabi/test/test_fallback_malloc.pass.cpp | 7 |
5 files changed, 5 insertions, 31 deletions
diff --git a/libcxxabi/src/cxa_exception_storage.cpp b/libcxxabi/src/cxa_exception_storage.cpp index b2a31f8..2479f55 100644 --- a/libcxxabi/src/cxa_exception_storage.cpp +++ b/libcxxabi/src/cxa_exception_storage.cpp @@ -12,12 +12,7 @@ #include "cxa_exception.h" -// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302 -#if __has_include(<__thread/support.h>) -# include <__thread/support.h> -#else -# include <__threading_support> -#endif +#include <__thread/support.h> #if defined(_LIBCXXABI_HAS_NO_THREADS) diff --git a/libcxxabi/src/cxa_guard_impl.h b/libcxxabi/src/cxa_guard_impl.h index 197eb78..7b140d3 100644 --- a/libcxxabi/src/cxa_guard_impl.h +++ b/libcxxabi/src/cxa_guard_impl.h @@ -55,13 +55,7 @@ # endif #endif -// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302 -#if __has_include(<__thread/support.h>) -# include <__thread/support.h> -#else -# include <__threading_support> -#endif - +#include <__thread/support.h> #include <cstdint> #include <cstring> #include <limits.h> diff --git a/libcxxabi/src/cxa_thread_atexit.cpp b/libcxxabi/src/cxa_thread_atexit.cpp index 5502513..c6bd0aa 100644 --- a/libcxxabi/src/cxa_thread_atexit.cpp +++ b/libcxxabi/src/cxa_thread_atexit.cpp @@ -8,12 +8,7 @@ #include "abort_message.h" #include "cxxabi.h" -// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302 -#if __has_include(<__thread/support.h>) -# include <__thread/support.h> -#else -# include <__threading_support> -#endif +#include <__thread/support.h> #ifndef _LIBCXXABI_HAS_NO_THREADS #if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB) #pragma comment(lib, "pthread") diff --git a/libcxxabi/src/fallback_malloc.cpp b/libcxxabi/src/fallback_malloc.cpp index 8ff40f6..76bd2e9 100644 --- a/libcxxabi/src/fallback_malloc.cpp +++ b/libcxxabi/src/fallback_malloc.cpp @@ -9,12 +9,7 @@ #include "fallback_malloc.h" #include "abort_message.h" -// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302 -#if __has_include(<__thread/support.h>) -# include <__thread/support.h> -#else -# include <__threading_support> -#endif +#include <__thread/support.h> #ifndef _LIBCXXABI_HAS_NO_THREADS #if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB) #pragma comment(lib, "pthread") diff --git a/libcxxabi/test/test_fallback_malloc.pass.cpp b/libcxxabi/test/test_fallback_malloc.pass.cpp index 885960d..c8a6a07 100644 --- a/libcxxabi/test/test_fallback_malloc.pass.cpp +++ b/libcxxabi/test/test_fallback_malloc.pass.cpp @@ -11,12 +11,7 @@ #include <cassert> #include <inttypes.h> -// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302 -#if __has_include(<__thread/support.h>) -# include <__thread/support.h> -#else -# include <__threading_support> -#endif +#include <__thread/support.h> // UNSUPPORTED: c++03 // UNSUPPORTED: modules-build && no-threads |