Put libc++ under ym2

31 files changed, 75 insertions, 76 deletions

diff --git a/contrib/libs/cxxsupp/libcxx/include/__algorithm/comp_ref_type.h b/contrib/libs/cxxsupp/libcxx/include/__algorithm/comp_ref_type.h
index e450a670f7..3e90e9adae 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__algorithm/comp_ref_type.h
+++ b/contrib/libs/cxxsupp/libcxx/include/__algorithm/comp_ref_type.h
@@ -55,8 +55,8 @@ struct __debug_less
     __do_compare_assert(int, _LHS & __l, _RHS & __r) {
         _LIBCPP_ASSERT(!__comp_(__l, __r),
             "Comparator does not induce a strict weak ordering");
-            (void)__l;
-            (void)__r;
+        (void)__l;
+        (void)__r;
     }
 
     template <class _LHS, class _RHS>
diff --git a/contrib/libs/cxxsupp/libcxx/include/__bit/bit_cast.h b/contrib/libs/cxxsupp/libcxx/include/__bit/bit_cast.h
index d8a053a1d5..10c2c94281 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__bit/bit_cast.h
+++ b/contrib/libs/cxxsupp/libcxx/include/__bit/bit_cast.h
@@ -40,9 +40,9 @@ template<class _ToType, class _FromType, class = enable_if_t<
 >>
 _LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI
 constexpr _ToType bit_cast(_FromType const& __from) noexcept {
-	_ToType __to;
-	::memcpy(&__to, &__from, sizeof(__from));
-	return __to;
+    _ToType __to;
+    ::memcpy(&__to, &__from, sizeof(__from));
+    return __to;
 }
 
 #endif // _LIBCPP_STD_VER > 17
diff --git a/contrib/libs/cxxsupp/libcxx/include/__functional/not_fn.h b/contrib/libs/cxxsupp/libcxx/include/__functional/not_fn.h
index 831f27e469..b5c415c25c 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__functional/not_fn.h
+++ b/contrib/libs/cxxsupp/libcxx/include/__functional/not_fn.h
@@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER > 14
 
 struct __not_fn_op {
-    template<class... _Args>
+    template <class... _Args>
     _LIBCPP_HIDE_FROM_ABI
     _LIBCPP_CONSTEXPR_AFTER_CXX17 auto operator()(_Args&&... __args) const
         noexcept(noexcept(!_VSTD::invoke(_VSTD::forward<_Args>(__args)...)))
@@ -38,7 +38,7 @@ struct __not_fn_t : __perfect_forward<__not_fn_op, _Fn> {
     using __perfect_forward<__not_fn_op, _Fn>::__perfect_forward;
 };
 
-template<class _Fn, class = enable_if_t<
+template <class _Fn, class = enable_if_t<
     is_constructible_v<decay_t<_Fn>, _Fn> &&
     is_move_constructible_v<decay_t<_Fn>>
 >>
diff --git a/contrib/libs/cxxsupp/libcxx/include/__iterator/advance.h b/contrib/libs/cxxsupp/libcxx/include/__iterator/advance.h
index 6f81fe3f65..1e49676ce7 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__iterator/advance.h
+++ b/contrib/libs/cxxsupp/libcxx/include/__iterator/advance.h
@@ -149,6 +149,7 @@ public:
                    "If `n < 0`, then `bidirectional_iterator<I> && same_as<I, S>` must be true.");
     // If `S` and `I` model `sized_sentinel_for<S, I>`:
     if constexpr (sized_sentinel_for<_Sp, _Ip>) {
+      // If |n| >= |bound - i|, equivalent to `ranges::advance(i, bound)`.
       // __magnitude_geq(a, b) returns |a| >= |b|, assuming they have the same sign.
       auto __magnitude_geq = [](auto __a, auto __b) {
         return __a == 0 ? __b == 0 :
diff --git a/contrib/libs/cxxsupp/libcxx/include/atomic b/contrib/libs/cxxsupp/libcxx/include/atomic
index bdb986fcc3..09e3dd3bb0 100644
--- a/contrib/libs/cxxsupp/libcxx/include/atomic
+++ b/contrib/libs/cxxsupp/libcxx/include/atomic
@@ -615,7 +615,7 @@ static_assert((is_same<underlying_type<memory_order>::type, __memory_order_under
   "unexpected underlying type for std::memory_order");
 
 #if defined(_LIBCPP_HAS_GCC_ATOMIC_IMP) || \
-	defined(_LIBCPP_ATOMIC_ONLY_USE_BUILTINS)
+    defined(_LIBCPP_ATOMIC_ONLY_USE_BUILTINS)
 
 // [atomics.types.generic]p1 guarantees _Tp is trivially copyable. Because
 // the default operator= in an object is not volatile, a byte-by-byte copy
diff --git a/contrib/libs/cxxsupp/libcxx/include/barrier b/contrib/libs/cxxsupp/libcxx/include/barrier
index 1b917f014a..b0975a5519 100644
--- a/contrib/libs/cxxsupp/libcxx/include/barrier
+++ b/contrib/libs/cxxsupp/libcxx/include/barrier
@@ -309,11 +309,11 @@ public:
     {
         __b.wait(_VSTD::move(__phase));
     }
-	_LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
     void arrive_and_wait()
     {
         wait(arrive());
-	}
+    }
     _LIBCPP_AVAILABILITY_SYNC _LIBCPP_INLINE_VISIBILITY
     void arrive_and_drop()
     {
diff --git a/contrib/libs/cxxsupp/libcxx/include/cmath b/contrib/libs/cxxsupp/libcxx/include/cmath
index 582183edcc..be5cbe3626 100644
--- a/contrib/libs/cxxsupp/libcxx/include/cmath
+++ b/contrib/libs/cxxsupp/libcxx/include/cmath
@@ -622,9 +622,9 @@ _Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept {
     if (__t == 1) return __b;
     const _Fp __x = __a + __t * (__b - __a);
     if ((__t > 1) == (__b > __a))
-    	return __b < __x ? __x : __b;
+        return __b < __x ? __x : __b;
     else
-    	return __x < __b ? __x : __b;
+        return __x < __b ? __x : __b;
 }
 
 constexpr float
diff --git a/contrib/libs/cxxsupp/libcxx/include/fstream b/contrib/libs/cxxsupp/libcxx/include/fstream
index eeab0b5398..80bda63755 100644
--- a/contrib/libs/cxxsupp/libcxx/include/fstream
+++ b/contrib/libs/cxxsupp/libcxx/include/fstream
@@ -192,7 +192,7 @@ typedef basic_fstream<wchar_t> wfstream;
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)
-#include <filesystem>
+#   include <filesystem>
 #endif
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/contrib/libs/cxxsupp/libcxx/include/locale b/contrib/libs/cxxsupp/libcxx/include/locale
index ab1a8bf988..1e437027d4 100644
--- a/contrib/libs/cxxsupp/libcxx/include/locale
+++ b/contrib/libs/cxxsupp/libcxx/include/locale
@@ -213,8 +213,8 @@ template <class charT> class messages_byname;
 // Most unix variants have catopen.  These are the specific ones that don't.
 #  if !defined(__BIONIC__) && !defined(_NEWLIB_VERSION)
 #    define _LIBCPP_HAS_CATOPEN 1
-#include <nl_types.h>
-#endif
+#    include <nl_types.h>
+#  endif
 #endif
 
 #ifdef _LIBCPP_LOCALE__L_EXTENSIONS
@@ -1489,7 +1489,7 @@ num_put<_CharT, _OutputIterator>::__do_put_integral(iter_type __s, ios_base& __i
     _LIBCPP_CONSTEXPR const unsigned __nbuf
         = (numeric_limits<_Unsigned>::digits / 3)        // 1 char per 3 bits
         + ((numeric_limits<_Unsigned>::digits % 3) != 0) // round up
-        + 2; // base prefix + terminating null character                                                 // terminating null character
+        + 2; // base prefix + terminating null character
     char __nar[__nbuf];
     _LIBCPP_DIAGNOSTIC_PUSH
     _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wformat-nonliteral")
diff --git a/contrib/libs/cxxsupp/libcxx/include/map b/contrib/libs/cxxsupp/libcxx/include/map
index d6a5ad1fa4..9a9826f472 100644
--- a/contrib/libs/cxxsupp/libcxx/include/map
+++ b/contrib/libs/cxxsupp/libcxx/include/map
@@ -198,7 +198,7 @@ public:
       size_type count(const K& x) const;        // C++14
     size_type      count(const key_type& k) const;
 
-        bool contains(const key_type& x) const; // C++20
+    bool           contains(const key_type& x) const;  // C++20
     template<class K> bool contains(const K& x) const; // C++20
 
           iterator lower_bound(const key_type& k);
@@ -438,7 +438,7 @@ public:
       size_type count(const K& x) const;        // C++14
     size_type      count(const key_type& k) const;
 
-        bool contains(const key_type& x) const; // C++20
+    bool           contains(const key_type& x) const;  // C++20
     template<class K> bool contains(const K& x) const; // C++20
 
           iterator lower_bound(const key_type& k);
diff --git a/contrib/libs/cxxsupp/libcxx/include/set b/contrib/libs/cxxsupp/libcxx/include/set
index 99a061a038..176369e81b 100644
--- a/contrib/libs/cxxsupp/libcxx/include/set
+++ b/contrib/libs/cxxsupp/libcxx/include/set
@@ -159,7 +159,7 @@ public:
         size_type count(const K& x) const;        // C++14
     size_type      count(const key_type& k) const;
 
-        bool contains(const key_type& x) const; // C++20
+    bool           contains(const key_type& x) const;  // C++20
     template<class K> bool contains(const K& x) const; // C++20
 
           iterator lower_bound(const key_type& k);
@@ -383,7 +383,7 @@ public:
         size_type count(const K& x) const;      // C++14
     size_type      count(const key_type& k) const;
 
-        bool contains(const key_type& x) const; // C++20
+    bool           contains(const key_type& x) const;  // C++20
     template<class K> bool contains(const K& x) const; // C++20
 
           iterator lower_bound(const key_type& k);
diff --git a/contrib/libs/cxxsupp/libcxx/include/string b/contrib/libs/cxxsupp/libcxx/include/string
index d0df0afd16..a1bfff1f6a 100644
--- a/contrib/libs/cxxsupp/libcxx/include/string
+++ b/contrib/libs/cxxsupp/libcxx/include/string
@@ -652,7 +652,7 @@ class
 #endif
     basic_string
 {
-	static_assert(sizeof(_CharT) <= 4, "libc++ implementation of std::basic_string does not support extra-wide character types");
+    static_assert(sizeof(_CharT) <= 4, "libc++ implementation of std::basic_string does not support extra-wide character types");
 public:
     typedef basic_string                                 __self;
     typedef basic_string_view<_CharT, _Traits>           __self_view;
diff --git a/contrib/libs/cxxsupp/libcxx/include/string_view b/contrib/libs/cxxsupp/libcxx/include/string_view
index e0e54a08a0..81d8c8a2b7 100644
--- a/contrib/libs/cxxsupp/libcxx/include/string_view
+++ b/contrib/libs/cxxsupp/libcxx/include/string_view
@@ -748,7 +748,7 @@ bool operator==(basic_string_view<_CharT, _Traits> __lhs,
     return __lhs.compare(__rhs) == 0;
 }
 
-// The dummy default template parameters are used to work around a MSVC issue with mangling, see VSO-409236 for details.
+// The dummy default template parameters are used to work around a MSVC issue with mangling, see VSO-409326 for details.
 // This applies to the other sufficient overloads below for the other comparison operators.
 template<class _CharT, class _Traits, int = 1>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
@@ -779,7 +779,6 @@ bool operator!=(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_Cha
     return __lhs.compare(__rhs) != 0;
 }
 
-
 template<class _CharT, class _Traits, int = 1>
 _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
 bool operator!=(basic_string_view<_CharT, _Traits> __lhs,
diff --git a/contrib/libs/cxxsupp/libcxx/include/system_error b/contrib/libs/cxxsupp/libcxx/include/system_error
index 4b23f1cd85..66a3f3c1e0 100644
--- a/contrib/libs/cxxsupp/libcxx/include/system_error
+++ b/contrib/libs/cxxsupp/libcxx/include/system_error
@@ -201,8 +201,6 @@ class _LIBCPP_TYPE_VIS error_category
 public:
     virtual ~error_category() _NOEXCEPT;
 
-// ODR violation is used for binary compatibility with older versions of libc++.
-// We don't have old libc++ versions for MSVC, so we don't need it.
 #if defined(_LIBCPP_BUILDING_LIBRARY) && \
     defined(_LIBCPP_DEPRECATED_ABI_LEGACY_LIBRARY_DEFINITIONS_FOR_INLINE_FUNCTIONS)
     error_category() _NOEXCEPT;
diff --git a/contrib/libs/cxxsupp/libcxx/include/tuple b/contrib/libs/cxxsupp/libcxx/include/tuple
index ca6024879f..868b66d254 100644
--- a/contrib/libs/cxxsupp/libcxx/include/tuple
+++ b/contrib/libs/cxxsupp/libcxx/include/tuple
@@ -483,7 +483,7 @@ template<class _Dest, class _Source, size_t ..._Np>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
 void __memberwise_copy_assign(_Dest& __dest, _Source const& __source, __tuple_indices<_Np...>) {
     _VSTD::__swallow(((_VSTD::get<_Np>(__dest) = _VSTD::get<_Np>(__source)), void(), 0)...);
-    }
+}
 
 template<class _Dest, class _Source, class ..._Up, size_t ..._Np>
 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
@@ -491,7 +491,7 @@ void __memberwise_forward_assign(_Dest& __dest, _Source&& __source, __tuple_type
     _VSTD::__swallow(((
         _VSTD::get<_Np>(__dest) = _VSTD::forward<_Up>(_VSTD::get<_Np>(__source))
     ), void(), 0)...);
-    }
+}
 
 template <class ..._Tp>
 class _LIBCPP_TEMPLATE_VIS tuple
diff --git a/contrib/libs/cxxsupp/libcxx/include/variant b/contrib/libs/cxxsupp/libcxx/include/variant
index 993248df62..be8e44bf3d 100644
--- a/contrib/libs/cxxsupp/libcxx/include/variant
+++ b/contrib/libs/cxxsupp/libcxx/include/variant
@@ -1166,17 +1166,17 @@ public:
       if constexpr (__all<is_nothrow_move_constructible_v<_Types>...>::value) {
         this->__generic_construct(*__rhs, _VSTD::move(*__lhs));
       } else {
-      // EXTENSION: When the move construction of `__lhs` into `__rhs` throws
-      // and `__tmp` is nothrow move constructible then we move `__tmp` back
-      // into `__rhs` and provide the strong exception safety guarantee.
-      try {
-        this->__generic_construct(*__rhs, _VSTD::move(*__lhs));
-      } catch (...) {
-        if (__tmp.__move_nothrow()) {
-          this->__generic_construct(*__rhs, _VSTD::move(__tmp));
+        // EXTENSION: When the move construction of `__lhs` into `__rhs` throws
+        // and `__tmp` is nothrow move constructible then we move `__tmp` back
+        // into `__rhs` and provide the strong exception safety guarantee.
+        try {
+          this->__generic_construct(*__rhs, _VSTD::move(*__lhs));
+        } catch (...) {
+          if (__tmp.__move_nothrow()) {
+            this->__generic_construct(*__rhs, _VSTD::move(__tmp));
+          }
+          throw;
         }
-        throw;
-      }
       }
 #else
       // this isn't consolidated with the `if constexpr` branch above due to
@@ -1697,9 +1697,9 @@ inline _LIBCPP_INLINE_VISIBILITY
   const bool __valueless =
       (... || _VSTD::__as_variant(__vs).valueless_by_exception());
   if (__valueless) {
-      __throw_bad_variant_access();
-    }
+    __throw_bad_variant_access();
   }
+}
 
 template <
     class _Visitor, class... _Vs,
diff --git a/contrib/libs/cxxsupp/libcxx/src/atomic.cpp b/contrib/libs/cxxsupp/libcxx/src/atomic.cpp
index 250d33e98b..5968aafb53 100644
--- a/contrib/libs/cxxsupp/libcxx/src/atomic.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/atomic.cpp
@@ -52,11 +52,11 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo
 #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK)
 
 extern "C" int __ulock_wait(uint32_t operation, void *addr, uint64_t value,
-		uint32_t timeout); /* timeout is specified in microseconds */
+        uint32_t timeout); /* timeout is specified in microseconds */
 extern "C" int __ulock_wake(uint32_t operation, void *addr, uint64_t wake_value);
 
-#define UL_COMPARE_AND_WAIT				1
-#define ULF_WAKE_ALL					0x00000100
+#define UL_COMPARE_AND_WAIT                1
+#define ULF_WAKE_ALL                    0x00000100
 
 static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr,
                                               __cxx_contention_t __val)
diff --git a/contrib/libs/cxxsupp/libcxx/src/chrono_system_time_init.h b/contrib/libs/cxxsupp/libcxx/src/chrono_system_time_init.h
index 3c5a0c33a5..b1bdc691b3 100644
--- a/contrib/libs/cxxsupp/libcxx/src/chrono_system_time_init.h
+++ b/contrib/libs/cxxsupp/libcxx/src/chrono_system_time_init.h
@@ -1,2 +1,2 @@
 #pragma GCC system_header
-GetSystemTimeInit GetSystemTimeAsFileTimeFunc _LIBCPP_INIT_PRIORITY_MAX;
\ No newline at end of file
+GetSystemTimeInit GetSystemTimeAsFileTimeFunc _LIBCPP_INIT_PRIORITY_MAX;
diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h b/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h
index dffce1895c..f6ba686b41 100644
--- a/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h
+++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/filesystem_common.h
@@ -83,14 +83,14 @@ format_string_impl(const char* msg, va_list ap) {
   if (static_cast<size_t>(ret) < buf.size()) {
     result.assign(buf.data(), static_cast<size_t>(ret));
   } else {
-  // we did not provide a long enough buffer on our first attempt. The
-  // return value is the number of bytes (excluding the null byte) that are
-  // needed for formatting.
+    // we did not provide a long enough buffer on our first attempt. The
+    // return value is the number of bytes (excluding the null byte) that are
+    // needed for formatting.
     size_t size_with_null = static_cast<size_t>(ret) + 1;
-  result.__resize_default_init(size_with_null - 1);
+    result.__resize_default_init(size_with_null - 1);
     ret = ::vsnprintf(&result[0], size_with_null, msg, ap);
-  _LIBCPP_ASSERT(static_cast<size_t>(ret) == (size_with_null - 1), "TODO");
-}
+    _LIBCPP_ASSERT(static_cast<size_t>(ret) == (size_with_null - 1), "TODO");
+  }
   return result;
 }
 
diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp b/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp
index e19d042f87..9e0abc83b1 100644
--- a/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp
@@ -999,7 +999,7 @@ void __copy_symlink(const path& existing_symlink, const path& new_symlink,
     __create_directory_symlink(real_path, new_symlink, ec);
   else
 #endif
-  __create_symlink(real_path, new_symlink, ec);
+    __create_symlink(real_path, new_symlink, ec);
 }
 
 bool __create_directories(const path& p, error_code* ec) {
@@ -1070,7 +1070,7 @@ bool __create_directory(path const& p, path const& attributes, error_code* ec) {
     return err.report(capture_errno());
 
   mec = capture_errno();
-    error_code ignored_ec;
+  error_code ignored_ec;
   st = status(p, ignored_ec);
   if (!is_directory(st))
     return err.report(mec);
diff --git a/contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h b/contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h
index 96e8fb7957..762763f9b9 100644
--- a/contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h
+++ b/contrib/libs/cxxsupp/libcxx/src/include/ryu/d2s_intrinsics.h
@@ -47,8 +47,6 @@
 
 #include "include/ryu/ryu.h"
 
-#include "include/ryu/ryu.h"
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 #if defined(_M_X64) && defined(_MSC_VER)
diff --git a/contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h b/contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h
index aa2be6d088..cb44bd3fef 100644
--- a/contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h
+++ b/contrib/libs/cxxsupp/libcxx/src/include/ryu/ryu.h
@@ -58,7 +58,7 @@
 #include "include/ryu/d2fixed.h"
 
 #if defined(_MSC_VER)
-#include <intrin.h> // for _umul128() and __shiftright128()
+#include <intrin.h> // for _umul128(), __shiftright128(), _BitScanForward{,64}
 #endif // defined(_MSC_VER)
 
 #if defined(_WIN64) || defined(_M_AMD64) || defined(__x86_64__) ||  defined(__aarch64__)
diff --git a/contrib/libs/cxxsupp/libcxx/src/ios.cpp b/contrib/libs/cxxsupp/libcxx/src/ios.cpp
index 218b27f1a6..870406b554 100644
--- a/contrib/libs/cxxsupp/libcxx/src/ios.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/ios.cpp
@@ -145,11 +145,11 @@ int ios_base::__xindex_ = 0;
 template <typename _Tp>
 static size_t __ios_new_cap(size_t __req_size, size_t __current_cap)
 { // Precondition: __req_size > __current_cap
-	const size_t mx = std::numeric_limits<size_t>::max() / sizeof(_Tp);
-	if (__req_size < mx/2)
-		return _VSTD::max(2 * __current_cap, __req_size);
-	else
-		return mx;
+    const size_t mx = std::numeric_limits<size_t>::max() / sizeof(_Tp);
+    if (__req_size < mx/2)
+        return _VSTD::max(2 * __current_cap, __req_size);
+    else
+        return mx;
 }
 
 int
diff --git a/contrib/libs/cxxsupp/libcxx/src/iostream.cpp b/contrib/libs/cxxsupp/libcxx/src/iostream.cpp
index 5a95eb7aef..79dbd9a52b 100644
--- a/contrib/libs/cxxsupp/libcxx/src/iostream.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/iostream.cpp
@@ -149,8 +149,8 @@ static void force_locale_initialization() {
 
 class DoIOSInit {
 public:
-	DoIOSInit();
-	~DoIOSInit();
+    DoIOSInit();
+    ~DoIOSInit();
 };
 
 DoIOSInit::DoIOSInit()
diff --git a/contrib/libs/cxxsupp/libcxx/src/iostream_init.h b/contrib/libs/cxxsupp/libcxx/src/iostream_init.h
index b0a60f42a6..7d1bb5c2d7 100644
--- a/contrib/libs/cxxsupp/libcxx/src/iostream_init.h
+++ b/contrib/libs/cxxsupp/libcxx/src/iostream_init.h
@@ -1,2 +1,2 @@
 #pragma GCC system_header
-_LIBCPP_HIDDEN ios_base::Init __start_std_streams _LIBCPP_INIT_PRIORITY_MAX;
\ No newline at end of file
+_LIBCPP_HIDDEN ios_base::Init __start_std_streams _LIBCPP_INIT_PRIORITY_MAX;
diff --git a/contrib/libs/cxxsupp/libcxx/src/locale.cpp b/contrib/libs/cxxsupp/libcxx/src/locale.cpp
index 3f1bbd0730..fc95dad600 100644
--- a/contrib/libs/cxxsupp/libcxx/src/locale.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/locale.cpp
@@ -34,12 +34,13 @@
 #endif
 
 #if defined(_LIBCPP_MSVCRT)
-#    define _CTYPE_DISABLE_MACROS
+#   define _CTYPE_DISABLE_MACROS
 #endif
+
 #if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#    include "__support/win32/locale_win32.h"
+#   include "__support/win32/locale_win32.h"
 #elif !defined(__BIONIC__) && !defined(__NuttX__)
-#    include <langinfo.h>
+#   include <langinfo.h>
 #endif
 
 #include "atomic"
@@ -4804,7 +4805,7 @@ __check_grouping(const string& __grouping, unsigned* __g, unsigned* __g_end,
 {
 //  if the grouping pattern is empty _or_ there are no grouping bits, then do nothing
 //  we always have at least a single entry in [__g, __g_end); the end of the input sequence
-	if (__grouping.size() != 0 && __g_end - __g > 1)
+    if (__grouping.size() != 0 && __g_end - __g > 1)
     {
         reverse(__g, __g_end);
         const char* __ig = __grouping.data();
diff --git a/contrib/libs/cxxsupp/libcxx/src/memory.cpp b/contrib/libs/cxxsupp/libcxx/src/memory.cpp
index c836533949..e4933881bf 100644
--- a/contrib/libs/cxxsupp/libcxx/src/memory.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/memory.cpp
@@ -12,7 +12,7 @@
 #  include <mutex>
 #  include <thread>
 #  if defined(__ELF__) && defined(_LIBCPP_LINK_PTHREAD_LIB)
-#      pragma comment(lib, "pthread")
+#    pragma comment(lib, "pthread")
 #  endif
 #endif
 
diff --git a/contrib/libs/cxxsupp/libcxx/src/new.cpp b/contrib/libs/cxxsupp/libcxx/src/new.cpp
index 136084809d..937e860337 100644
--- a/contrib/libs/cxxsupp/libcxx/src/new.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/new.cpp
@@ -137,7 +137,7 @@ _LIBCPP_WEAK
 void
 operator delete(void* ptr) noexcept
 {
-        ::free(ptr);
+    ::free(ptr);
 }
 
 _LIBCPP_WEAK
@@ -258,8 +258,8 @@ _LIBCPP_WEAK
 void
 operator delete(void* ptr, std::align_val_t) noexcept
 {
-        std::__libcpp_aligned_free(ptr);
-    }
+    std::__libcpp_aligned_free(ptr);
+}
 
 _LIBCPP_WEAK
 void
diff --git a/contrib/libs/cxxsupp/libcxx/src/optional.cpp b/contrib/libs/cxxsupp/libcxx/src/optional.cpp
index ac1a0a5b5e..e9573bfa30 100644
--- a/contrib/libs/cxxsupp/libcxx/src/optional.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/optional.cpp
@@ -31,9 +31,9 @@ class _LIBCPP_EXCEPTION_ABI _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS bad_optiona
     : public std::logic_error
 {
 public:
-	bad_optional_access() : std::logic_error("Bad optional Access") {}
+    bad_optional_access() : std::logic_error("Bad optional Access") {}
 
-//	Get the key function ~bad_optional_access() into the dylib
+//    Get the key function ~bad_optional_access() into the dylib
     virtual ~bad_optional_access() noexcept;
 };
 
diff --git a/contrib/libs/cxxsupp/libcxx/src/random.cpp b/contrib/libs/cxxsupp/libcxx/src/random.cpp
index 17aaeedfeb..466b015772 100644
--- a/contrib/libs/cxxsupp/libcxx/src/random.cpp
+++ b/contrib/libs/cxxsupp/libcxx/src/random.cpp
@@ -213,7 +213,7 @@ random_device::entropy() const noexcept
 #elif defined(__OpenBSD__) || defined(_LIBCPP_USING_FUCHSIA_CPRNG)
   return std::numeric_limits<result_type>::digits;
 #else
-    return 0;
+  return 0;
 #endif
 }
 
diff --git a/contrib/libs/cxxsupp/libcxx/ya.make b/contrib/libs/cxxsupp/libcxx/ya.make
index 319c00b05c..94d4a0e438 100644
--- a/contrib/libs/cxxsupp/libcxx/ya.make
+++ b/contrib/libs/cxxsupp/libcxx/ya.make
@@ -4,13 +4,14 @@ LICENSE(
     Apache-2.0 AND
     Apache-2.0 WITH LLVM-exception AND
     BSD-2-Clause AND
+    BSL-1.0 AND
     MIT AND
     NCSA
 )
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(2022-02-20)
+VERSION(2022-02-18)
 
 ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/34313583331e5c8cb0d3df28efb6c34c428fd235.tar.gz)
 
@@ -41,8 +42,8 @@ IF (OS_ANDROID)
     CFLAGS(
         -DLIBCXX_BUILDING_LIBCXXABI
     )
+# Take cxxabi implementation from system.
 ELSEIF (OS_IOS)
-    # Take cxxabi implementation from system.
     LDFLAGS(-lc++abi)
     CFLAGS(
         -DLIBCXX_BUILDING_LIBCXXABI
@@ -113,6 +114,7 @@ ENDIF()
 DEFAULT(CXX_RT "default")
 
 DISABLE(NEED_GLIBCXX_CXX17_SHIMS)
+
 DISABLE(NEED_CXX_RT_ADDINCL)
 
 IF (CXX_RT == "libcxxrt")
@@ -178,7 +180,7 @@ IF (NEED_CXX_RT_ADDINCL)
     # This looks extremely weird and we have to use cxxabi.h from libsupc++ instead.
     # This ADDINCL is placed here just to fix the status quo
     ADDINCL(
-         GLOBAL contrib/libs/cxxsupp/libcxxrt/include
+        GLOBAL contrib/libs/cxxsupp/libcxxrt/include
     )
 ENDIF()