Skip to content

Commit 368faac

Browse files
committed
[libc++] Revert "Protect users from relying on detail headers" & related changes
This commit reverts 5aaefa5 (and also partly 7f285f4 and b6d7568, which were related to the original commit). As landed, 5aaefa5 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
1 parent 5c73db2 commit 368faac

File tree

767 files changed

+10
-8045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

767 files changed

+10
-8045
lines changed

libcxx/cmake/Modules/HandleLibCXXABI.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi")
117117

118118
setup_abi_lib(
119119
"-DLIBCXX_BUILDING_LIBCXXABI"
120-
"${shared}" "${static}" "cxxabi.h;__cxxabi_config.h;threading_support.h" "")
120+
"${shared}" "${static}" "cxxabi.h;__cxxabi_config.h" "")
121121
elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxrt")
122122
if(NOT LIBCXX_CXX_ABI_INCLUDE_PATHS)
123123
set(LIBCXX_CXX_ABI_INCLUDE_PATHS "/usr/include/c++/v1")

libcxx/include/__algorithm/adjacent_find.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1818
# pragma GCC system_header
19-
# pragma clang include_instead(<algorithm>)
2019
#endif
2120

2221
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/include/__algorithm/all_of.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1616
# pragma GCC system_header
17-
# pragma clang include_instead(<algorithm>)
1817
#endif
1918

2019
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/include/__algorithm/any_of.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1616
# pragma GCC system_header
17-
# pragma clang include_instead(<algorithm>)
1817
#endif
1918

2019
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/include/__algorithm/binary_search.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1919
# pragma GCC system_header
20-
# pragma clang include_instead(<algorithm>)
2120
#endif
2221

2322
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/include/__algorithm/clamp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1717
# pragma GCC system_header
18-
# pragma clang include_instead(<algorithm>)
1918
#endif
2019

2120
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/include/__algorithm/comp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1515
# pragma GCC system_header
16-
# pragma clang include_instead(<algorithm>)
1716
#endif
1817

1918
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/include/__algorithm/comp_ref_type.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1818
# pragma GCC system_header
19-
# pragma clang include_instead(<algorithm>)
2019
#endif
2120

2221
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/include/__algorithm/copy.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1919
# pragma GCC system_header
20-
# pragma clang include_instead(<algorithm>)
2120
#endif
2221

2322
_LIBCPP_BEGIN_NAMESPACE_STD

libcxx/include/__algorithm/copy_backward.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1919
# pragma GCC system_header
20-
# pragma clang include_instead(<algorithm>)
2120
#endif
2221

2322
_LIBCPP_BEGIN_NAMESPACE_STD

0 commit comments

Comments
 (0)