aboutsummaryrefslogtreecommitdiff
path: root/libcxx/include/__configuration
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/include/__configuration')
-rw-r--r--libcxx/include/__configuration/abi.h8
-rw-r--r--libcxx/include/__configuration/compiler.h12
2 files changed, 6 insertions, 14 deletions
diff --git a/libcxx/include/__configuration/abi.h b/libcxx/include/__configuration/abi.h
index c9936df..38b85c6 100644
--- a/libcxx/include/__configuration/abi.h
+++ b/libcxx/include/__configuration/abi.h
@@ -61,14 +61,6 @@
// According to the Standard, `bitset::operator[] const` returns bool
# define _LIBCPP_ABI_BITSET_VECTOR_BOOL_CONST_SUBSCRIPT_RETURN_BOOL
-// In LLVM 20, we've changed to take these ABI breaks unconditionally. These flags only exist in case someone is running
-// into the static_asserts we added to catch the ABI break and don't care that it is one.
-// TODO(LLVM 22): Remove these flags
-# define _LIBCPP_ABI_LIST_REMOVE_NODE_POINTER_UB
-# define _LIBCPP_ABI_TREE_REMOVE_NODE_POINTER_UB
-# define _LIBCPP_ABI_FIX_UNORDERED_NODE_POINTER_UB
-# define _LIBCPP_ABI_FORWARD_LIST_REMOVE_NODE_POINTER_UB
-
// These flags are documented in ABIGuarantees.rst
# define _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
# define _LIBCPP_ABI_DO_NOT_EXPORT_BASIC_STRING_COMMON
diff --git a/libcxx/include/__configuration/compiler.h b/libcxx/include/__configuration/compiler.h
index 11c07ed..7cd81e0 100644
--- a/libcxx/include/__configuration/compiler.h
+++ b/libcxx/include/__configuration/compiler.h
@@ -33,16 +33,16 @@
// Warn if a compiler version is used that is not supported anymore
// LLVM RELEASE Update the minimum compiler versions
# if defined(_LIBCPP_CLANG_VER)
-# if _LIBCPP_CLANG_VER < 1900
-# warning "Libc++ only supports Clang 19 and later"
+# if _LIBCPP_CLANG_VER < 2001
+# warning "Libc++ only supports Clang 20 and later"
# endif
# elif defined(_LIBCPP_APPLE_CLANG_VER)
-# if _LIBCPP_APPLE_CLANG_VER < 1600
-# warning "Libc++ only supports AppleClang 15 and later"
+# if _LIBCPP_APPLE_CLANG_VER < 1700
+# warning "Libc++ only supports AppleClang 26 and later"
# endif
# elif defined(_LIBCPP_GCC_VER)
-# if _LIBCPP_GCC_VER < 1400
-# warning "Libc++ only supports GCC 14 and later"
+# if _LIBCPP_GCC_VER < 1500
+# warning "Libc++ only supports GCC 15 and later"
# endif
# endif