diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2022-03-01 00:37:25 +0300 |
|---|---|---|
| committer | Louis Dionne <ldionne.2@gmail.com> | 2022-03-01 16:20:24 +0300 |
| commit | 368faacac7525e538fa6680aea74e19a75e3458d (patch) | |
| tree | 8d30d81bea34e7779e3504bb6221f698bff2e23a /libcxxabi/src | |
| parent | 5c73db24df14501e1a76ef2e31111562a3a3287d (diff) | |
[libc++] Revert "Protect users from relying on detail headers" & related changes
This commit reverts 5aaefa51 (and also partly 7f285f48e77 and b6d75682f9,
which were related to the original commit). As landed, 5aaefa51 had
unintended consequences on some downstream bots and didn't have proper
coverage upstream due to a few subtle things. Implementing this is
something we should do in libc++, however we'll first need to address
a few issues listed in https://reviews.llvm.org/D106124#3349710.
Differential Revision: https://reviews.llvm.org/D120683
Diffstat (limited to 'libcxxabi/src')
| -rw-r--r-- | libcxxabi/src/cxa_exception_storage.cpp | 2 | ||||
| -rw-r--r-- | libcxxabi/src/cxa_guard_impl.h | 2 | ||||
| -rw-r--r-- | libcxxabi/src/cxa_thread_atexit.cpp | 2 | ||||
| -rw-r--r-- | libcxxabi/src/fallback_malloc.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libcxxabi/src/cxa_exception_storage.cpp b/libcxxabi/src/cxa_exception_storage.cpp index ce44c3a176a4..3a3233a1b927 100644 --- a/libcxxabi/src/cxa_exception_storage.cpp +++ b/libcxxabi/src/cxa_exception_storage.cpp @@ -12,7 +12,7 @@ #include "cxa_exception.h" -#include "threading_support.h" +#include <__threading_support> #if defined(_LIBCXXABI_HAS_NO_THREADS) diff --git a/libcxxabi/src/cxa_guard_impl.h b/libcxxabi/src/cxa_guard_impl.h index b3c32028dc5a..72940cc7e869 100644 --- a/libcxxabi/src/cxa_guard_impl.h +++ b/libcxxabi/src/cxa_guard_impl.h @@ -56,7 +56,7 @@ #include <limits.h> #include <stdlib.h> -#include "threading_support.h" +#include <__threading_support> #ifndef _LIBCXXABI_HAS_NO_THREADS # if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB) # pragma comment(lib, "pthread") diff --git a/libcxxabi/src/cxa_thread_atexit.cpp b/libcxxabi/src/cxa_thread_atexit.cpp index 1a04dddb34be..665f9e55694a 100644 --- a/libcxxabi/src/cxa_thread_atexit.cpp +++ b/libcxxabi/src/cxa_thread_atexit.cpp @@ -8,7 +8,7 @@ #include "abort_message.h" #include "cxxabi.h" -#include "threading_support.h" +#include <__threading_support> #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 9db431ee8297..1d6c3808b217 100644 --- a/libcxxabi/src/fallback_malloc.cpp +++ b/libcxxabi/src/fallback_malloc.cpp @@ -8,7 +8,7 @@ #include "fallback_malloc.h" -#include "threading_support.h" +#include <__threading_support> #ifndef _LIBCXXABI_HAS_NO_THREADS #if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB) #pragma comment(lib, "pthread") |