[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
GitOrigin-RevId: 368faacac7525e538fa6680aea74e19a75e3458d
diff --git a/include/threading_support.h b/include/threading_support.h
deleted file mode 100644
index 3e533f9..0000000
--- a/include/threading_support.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#ifndef _LIBCXXABI_THREADING_SUPPORT_H
-#define _LIBCXXABI_THREADING_SUPPORT_H
-
-#pragma GCC system_header
-#include <__threading_support>
-
-#endif // _LIBCXXABI_THREADING_SUPPORT_H
diff --git a/src/cxa_exception_storage.cpp b/src/cxa_exception_storage.cpp
index ce44c3a..3a3233a 100644
--- a/src/cxa_exception_storage.cpp
+++ b/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/src/cxa_guard_impl.h b/src/cxa_guard_impl.h
index b3c3202..72940cc 100644
--- a/src/cxa_guard_impl.h
+++ b/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/src/cxa_thread_atexit.cpp b/src/cxa_thread_atexit.cpp
index 1a04ddd..665f9e5 100644
--- a/src/cxa_thread_atexit.cpp
+++ b/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/src/fallback_malloc.cpp b/src/fallback_malloc.cpp
index 9db431e..1d6c380 100644
--- a/src/fallback_malloc.cpp
+++ b/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")
diff --git a/test/test_exception_storage.pass.cpp b/test/test_exception_storage.pass.cpp
index 4f1121b..934cc4b 100644
--- a/test/test_exception_storage.pass.cpp
+++ b/test/test_exception_storage.pass.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include <cstdio>
#include <cstdlib>
-#include "threading_support.h"
+#include <__threading_support>
#include <unistd.h>
#include "../src/cxa_exception.h"
diff --git a/test/test_fallback_malloc.pass.cpp b/test/test_fallback_malloc.pass.cpp
index 886b9a5..cc59129 100644
--- a/test/test_fallback_malloc.pass.cpp
+++ b/test/test_fallback_malloc.pass.cpp
@@ -9,7 +9,7 @@
#include <cstdio>
#include <deque>
-#include "threading_support.h"
+#include <__threading_support>
typedef std::deque<void *> container;
