aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-12-19 10:13:33 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-12-19 10:28:42 +0300
commit1353077f79bb3547792b2fc86c22a695f0bc76f9 (patch)
tree6a043b1e26f9995970dd4f09c05632f566e07a04
parente9866bdcbc5f04545c60374b690b1e04005e091b (diff)
downloadydb-1353077f79bb3547792b2fc86c22a695f0bc76f9.tar.gz
libc++: Revert some patches
* `27-bitset.patch`: `__SIZEOF_SIZE_T__` is used in ([src/filesystem/error.h](https://github.com/ytsaurus/ytsaurus/blob/main/contrib/libs/cxxsupp/libcxx/src/filesystem/error.h)), hence the initial statement from rXXXXXX is no longer relevant * `48-version.patch`: This instance of libc\+\+ is not compiled with MSVC anymore, hence `# if defined(_MSC_VER) && _MSC_VER >= 1926` patches are irrelevant. * `50-operations.patch`: This should be handler by `NO_COMPILER_WARNINGS()` in `ya.make` commit_hash:395d3306c667738bf0af4e252d8bc3ba730b5730
-rw-r--r--contrib/libs/cxxsupp/libcxx/include/bitset8
-rw-r--r--contrib/libs/cxxsupp/libcxx/include/version12
-rw-r--r--contrib/libs/cxxsupp/libcxx/patches/27-bitset.patch27
-rw-r--r--contrib/libs/cxxsupp/libcxx/patches/48-version.patch30
-rw-r--r--contrib/libs/cxxsupp/libcxx/patches/50-operations.patch24
-rw-r--r--contrib/libs/cxxsupp/libcxx/src/filesystem/path_parser.h6
6 files changed, 6 insertions, 101 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/bitset b/contrib/libs/cxxsupp/libcxx/include/bitset
index 8774a6a6ab..308c58995d 100644
--- a/contrib/libs/cxxsupp/libcxx/include/bitset
+++ b/contrib/libs/cxxsupp/libcxx/include/bitset
@@ -154,10 +154,6 @@ template <size_t N> struct hash<std::bitset<N>>;
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-# pragma GCC system_header
-#endif
-
_LIBCPP_BEGIN_NAMESPACE_STD
template <size_t _N_words, size_t _Size>
@@ -281,9 +277,9 @@ inline _LIBCPP_HIDE_FROM_ABI void __bitset<_N_words, _Size>::__init(unsigned lon
template <size_t _N_words, size_t _Size>
inline _LIBCPP_CONSTEXPR __bitset<_N_words, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
#ifndef _LIBCPP_CXX03_LANG
-# if SIZE_MAX == 0xffffffffffffffffULL
+# if __SIZEOF_SIZE_T__ == 8
: __first_{__v}
-# elif SIZE_MAX == 0xffffffffULL
+# elif __SIZEOF_SIZE_T__ == 4
: __first_{static_cast<__storage_type>(__v),
_Size >= 2 * __bits_per_word
? static_cast<__storage_type>(__v >> __bits_per_word)
diff --git a/contrib/libs/cxxsupp/libcxx/include/version b/contrib/libs/cxxsupp/libcxx/include/version
index 9da4974e74..7aa002e257 100644
--- a/contrib/libs/cxxsupp/libcxx/include/version
+++ b/contrib/libs/cxxsupp/libcxx/include/version
@@ -283,11 +283,7 @@ __cpp_lib_within_lifetime 202306L <type_traits>
# define __cpp_lib_allocator_traits_is_always_equal 201411L
# define __cpp_lib_any 201606L
# define __cpp_lib_apply 201603L
-# if defined(_MSC_VER) && _MSC_VER >= 1926
-# define __cpp_lib_array_constexpr 201803L
-# else
-# define __cpp_lib_array_constexpr 201603L
-# endif
+# define __cpp_lib_array_constexpr 201603L
# define __cpp_lib_as_const 201510L
# define __cpp_lib_atomic_is_always_lock_free 201603L
# define __cpp_lib_bool_constant 201505L
@@ -332,11 +328,7 @@ __cpp_lib_within_lifetime 202306L <type_traits>
# endif
# define __cpp_lib_shared_ptr_arrays 201611L
# define __cpp_lib_shared_ptr_weak_type 201606L
-# if defined(_MSC_VER) && _MSC_VER >= 1926
-# define __cpp_lib_string_view 201803L
-# else
-# define __cpp_lib_string_view 201606L
-# endif
+# define __cpp_lib_string_view 201606L
// # define __cpp_lib_to_chars 201611L
# undef __cpp_lib_transparent_operators
# define __cpp_lib_transparent_operators 201510L
diff --git a/contrib/libs/cxxsupp/libcxx/patches/27-bitset.patch b/contrib/libs/cxxsupp/libcxx/patches/27-bitset.patch
deleted file mode 100644
index 3d834d7b2e..0000000000
--- a/contrib/libs/cxxsupp/libcxx/patches/27-bitset.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/include/bitset b/include/bitset
-index 308c589..8774a6a 100644
---- a/include/bitset
-+++ b/include/bitset
-@@ -154,6 +154,10 @@ template <size_t N> struct hash<std::bitset<N>>;
- _LIBCPP_PUSH_MACROS
- #include <__undef_macros>
-
-+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-+# pragma GCC system_header
-+#endif
-+
- _LIBCPP_BEGIN_NAMESPACE_STD
-
- template <size_t _N_words, size_t _Size>
-@@ -277,9 +281,9 @@ inline _LIBCPP_HIDE_FROM_ABI void __bitset<_N_words, _Size>::__init(unsigned lon
- template <size_t _N_words, size_t _Size>
- inline _LIBCPP_CONSTEXPR __bitset<_N_words, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
- #ifndef _LIBCPP_CXX03_LANG
--# if __SIZEOF_SIZE_T__ == 8
-+# if SIZE_MAX == 0xffffffffffffffffULL
- : __first_{__v}
--# elif __SIZEOF_SIZE_T__ == 4
-+# elif SIZE_MAX == 0xffffffffULL
- : __first_{static_cast<__storage_type>(__v),
- _Size >= 2 * __bits_per_word
- ? static_cast<__storage_type>(__v >> __bits_per_word)
diff --git a/contrib/libs/cxxsupp/libcxx/patches/48-version.patch b/contrib/libs/cxxsupp/libcxx/patches/48-version.patch
deleted file mode 100644
index 052d27d3f2..0000000000
--- a/contrib/libs/cxxsupp/libcxx/patches/48-version.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/include/version b/include/version
-index 7aa002e..9da4974 100644
---- a/include/version
-+++ b/include/version
-@@ -283,7 +283,11 @@ __cpp_lib_within_lifetime 202306L <type_traits>
- # define __cpp_lib_allocator_traits_is_always_equal 201411L
- # define __cpp_lib_any 201606L
- # define __cpp_lib_apply 201603L
--# define __cpp_lib_array_constexpr 201603L
-+# if defined(_MSC_VER) && _MSC_VER >= 1926
-+# define __cpp_lib_array_constexpr 201803L
-+# else
-+# define __cpp_lib_array_constexpr 201603L
-+# endif
- # define __cpp_lib_as_const 201510L
- # define __cpp_lib_atomic_is_always_lock_free 201603L
- # define __cpp_lib_bool_constant 201505L
-@@ -328,7 +332,11 @@ __cpp_lib_within_lifetime 202306L <type_traits>
- # endif
- # define __cpp_lib_shared_ptr_arrays 201611L
- # define __cpp_lib_shared_ptr_weak_type 201606L
--# define __cpp_lib_string_view 201606L
-+# if defined(_MSC_VER) && _MSC_VER >= 1926
-+# define __cpp_lib_string_view 201803L
-+# else
-+# define __cpp_lib_string_view 201606L
-+# endif
- // # define __cpp_lib_to_chars 201611L
- # undef __cpp_lib_transparent_operators
- # define __cpp_lib_transparent_operators 201510L
diff --git a/contrib/libs/cxxsupp/libcxx/patches/50-operations.patch b/contrib/libs/cxxsupp/libcxx/patches/50-operations.patch
deleted file mode 100644
index 577dee7765..0000000000
--- a/contrib/libs/cxxsupp/libcxx/patches/50-operations.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/filesystem/path_parser.h b/src/filesystem/path_parser.h
-index 28a8f24..a546604 100644
---- a/src/filesystem/path_parser.h
-+++ b/src/filesystem/path_parser.h
-@@ -323,15 +323,17 @@ private:
- return consumeNSeparators(consumeName(P, End), End, 2);
- }
-
-- PosPtr consumeRootName(PosPtr P, PosPtr End) const noexcept {
- #if defined(_LIBCPP_WIN32API)
-+ PosPtr consumeRootName(PosPtr P, PosPtr End) const noexcept {
- if (PosPtr Ret = consumeDriveLetter(P, End))
- return Ret;
- if (PosPtr Ret = consumeNetworkRoot(P, End))
- return Ret;
--#endif
- return nullptr;
- }
-+#else
-+ PosPtr consumeRootName(PosPtr /*P*/, PosPtr /*End*/) const noexcept { return nullptr; }
-+#endif
- };
-
- inline string_view_pair separate_filename(string_view_t const& s) {
diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/path_parser.h b/contrib/libs/cxxsupp/libcxx/src/filesystem/path_parser.h
index a546604062..28a8f240e3 100644
--- a/contrib/libs/cxxsupp/libcxx/src/filesystem/path_parser.h
+++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/path_parser.h
@@ -323,17 +323,15 @@ private:
return consumeNSeparators(consumeName(P, End), End, 2);
}
-#if defined(_LIBCPP_WIN32API)
PosPtr consumeRootName(PosPtr P, PosPtr End) const noexcept {
+#if defined(_LIBCPP_WIN32API)
if (PosPtr Ret = consumeDriveLetter(P, End))
return Ret;
if (PosPtr Ret = consumeNetworkRoot(P, End))
return Ret;
+#endif
return nullptr;
}
-#else
- PosPtr consumeRootName(PosPtr /*P*/, PosPtr /*End*/) const noexcept { return nullptr; }
-#endif
};
inline string_view_pair separate_filename(string_view_t const& s) {