diff options
author | maxim-yurchuk <maxim-yurchuk@yandex-team.com> | 2024-10-09 12:29:46 +0300 |
---|---|---|
committer | maxim-yurchuk <maxim-yurchuk@yandex-team.com> | 2024-10-09 13:14:22 +0300 |
commit | 9731d8a4bb7ee2cc8554eaf133bb85498a4c7d80 (patch) | |
tree | a8fb3181d5947c0d78cf402aa56e686130179049 /contrib/libs/cxxsupp/libcxxmsvc/.yandex_meta/patches/56-iostream.patch | |
parent | a44b779cd359f06c3ebbef4ec98c6b38609d9d85 (diff) | |
download | ydb-9731d8a4bb7ee2cc8554eaf133bb85498a4c7d80.tar.gz |
publishFullContrib: true for ydb
<HIDDEN_URL>
commit_hash:c82a80ac4594723cebf2c7387dec9c60217f603e
Diffstat (limited to 'contrib/libs/cxxsupp/libcxxmsvc/.yandex_meta/patches/56-iostream.patch')
-rw-r--r-- | contrib/libs/cxxsupp/libcxxmsvc/.yandex_meta/patches/56-iostream.patch | 165 |
1 files changed, 165 insertions, 0 deletions
diff --git a/contrib/libs/cxxsupp/libcxxmsvc/.yandex_meta/patches/56-iostream.patch b/contrib/libs/cxxsupp/libcxxmsvc/.yandex_meta/patches/56-iostream.patch new file mode 100644 index 0000000000..1cf6e0170b --- /dev/null +++ b/contrib/libs/cxxsupp/libcxxmsvc/.yandex_meta/patches/56-iostream.patch @@ -0,0 +1,165 @@ +diff --git a/src/iostream.cpp b/src/iostream.cpp +index a8948ac..79dbd9a 100644 +--- a/src/iostream.cpp ++++ b/src/iostream.cpp +@@ -17,72 +17,112 @@ + + _LIBCPP_BEGIN_NAMESPACE_STD + ++#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(__clang__) ++_ALIGNAS_TYPE (istream) char _cin [sizeof(istream)]; ++_LIBCPP_FUNC_VIS istream& cin = *reinterpret_cast<istream*>(_cin); ++#else + _ALIGNAS_TYPE (istream) _LIBCPP_FUNC_VIS char cin[sizeof(istream)] + #if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__) + __asm__("?cin@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_istream@DU?$char_traits@D@" _LIBCPP_ABI_NAMESPACE_STR "@std@@@12@A") + #endif + ; ++#endif + _ALIGNAS_TYPE (__stdinbuf<char> ) static char __cin[sizeof(__stdinbuf <char>)]; + static mbstate_t mb_cin; + + #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS ++#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(__clang__) ++_ALIGNAS_TYPE (wistream) char _wcin [sizeof(wistream)]; ++_LIBCPP_FUNC_VIS wistream& wcin = *reinterpret_cast<wistream*>(_wcin); ++#else + _ALIGNAS_TYPE (wistream) _LIBCPP_FUNC_VIS char wcin[sizeof(wistream)] + #if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__) + __asm__("?wcin@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_istream@_WU?$char_traits@_W@" _LIBCPP_ABI_NAMESPACE_STR "@std@@@12@A") + #endif + ; ++#endif + _ALIGNAS_TYPE (__stdinbuf<wchar_t> ) static char __wcin[sizeof(__stdinbuf <wchar_t>)]; + static mbstate_t mb_wcin; + #endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS + ++#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(__clang__) ++_ALIGNAS_TYPE (ostream) char _cout[sizeof(ostream)]; ++_LIBCPP_FUNC_VIS ostream& cout = *reinterpret_cast<ostream*>(_cout); ++#else + _ALIGNAS_TYPE (ostream) _LIBCPP_FUNC_VIS char cout[sizeof(ostream)] + #if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__) + __asm__("?cout@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@DU?$char_traits@D@" _LIBCPP_ABI_NAMESPACE_STR "@std@@@12@A") + #endif + ; ++#endif + _ALIGNAS_TYPE (__stdoutbuf<char>) static char __cout[sizeof(__stdoutbuf<char>)]; + static mbstate_t mb_cout; + + #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS ++#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(__clang__) ++_ALIGNAS_TYPE (wostream) char _wcout[sizeof(wostream)]; ++_LIBCPP_FUNC_VIS wostream& wcout = *reinterpret_cast<wostream*>(_wcout); ++#else + _ALIGNAS_TYPE (wostream) _LIBCPP_FUNC_VIS char wcout[sizeof(wostream)] + #if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__) + __asm__("?wcout@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@_WU?$char_traits@_W@" _LIBCPP_ABI_NAMESPACE_STR "@std@@@12@A") + #endif + ; ++#endif + _ALIGNAS_TYPE (__stdoutbuf<wchar_t>) static char __wcout[sizeof(__stdoutbuf<wchar_t>)]; + static mbstate_t mb_wcout; + #endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS + ++#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(__clang__) ++_ALIGNAS_TYPE (ostream) char _cerr[sizeof(ostream)]; ++_LIBCPP_FUNC_VIS ostream& cerr = *reinterpret_cast<ostream*>(_cerr); ++#else + _ALIGNAS_TYPE (ostream) _LIBCPP_FUNC_VIS char cerr[sizeof(ostream)] + #if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__) + __asm__("?cerr@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@DU?$char_traits@D@" _LIBCPP_ABI_NAMESPACE_STR "@std@@@12@A") + #endif + ; ++#endif + _ALIGNAS_TYPE (__stdoutbuf<char>) static char __cerr[sizeof(__stdoutbuf<char>)]; + static mbstate_t mb_cerr; + + #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS ++#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(__clang__) ++_ALIGNAS_TYPE (wostream) char _wcerr[sizeof(wostream)]; ++_LIBCPP_FUNC_VIS wostream& wcerr = *reinterpret_cast<wostream*>(_wcerr); ++#else + _ALIGNAS_TYPE (wostream) _LIBCPP_FUNC_VIS char wcerr[sizeof(wostream)] + #if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__) + __asm__("?wcerr@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@_WU?$char_traits@_W@" _LIBCPP_ABI_NAMESPACE_STR "@std@@@12@A") + #endif + ; ++#endif + _ALIGNAS_TYPE (__stdoutbuf<wchar_t>) static char __wcerr[sizeof(__stdoutbuf<wchar_t>)]; + static mbstate_t mb_wcerr; + #endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS + ++#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(__clang__) ++_ALIGNAS_TYPE (ostream) char _clog[sizeof(ostream)]; ++_LIBCPP_FUNC_VIS ostream& clog = *reinterpret_cast<ostream*>(_clog); ++#else + _ALIGNAS_TYPE (ostream) _LIBCPP_FUNC_VIS char clog[sizeof(ostream)] + #if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__) + __asm__("?clog@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@DU?$char_traits@D@" _LIBCPP_ABI_NAMESPACE_STR "@std@@@12@A") + #endif + ; ++#endif + + #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS ++#if defined(_LIBCPP_ABI_MICROSOFT) && !defined(__clang__) ++_ALIGNAS_TYPE (wostream) char _wclog[sizeof(wostream)]; ++_LIBCPP_FUNC_VIS wostream& wclog = *reinterpret_cast<wostream*>(_wclog); ++#else + _ALIGNAS_TYPE (wostream) _LIBCPP_FUNC_VIS char wclog[sizeof(wostream)] + #if defined(_LIBCPP_ABI_MICROSOFT) && defined(__clang__) + __asm__("?wclog@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@_WU?$char_traits@_W@" _LIBCPP_ABI_NAMESPACE_STR "@std@@@12@A") + #endif + ; ++#endif + #endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS + + // Pretend we're inside a system header so the compiler doesn't flag the use of the init_priority +@@ -117,19 +157,19 @@ DoIOSInit::DoIOSInit() + { + force_locale_initialization(); + +- istream* cin_ptr = ::new(cin) istream(::new(__cin) __stdinbuf <char>(stdin, &mb_cin)); +- ostream* cout_ptr = ::new(cout) ostream(::new(__cout) __stdoutbuf<char>(stdout, &mb_cout)); +- ostream* cerr_ptr = ::new(cerr) ostream(::new(__cerr) __stdoutbuf<char>(stderr, &mb_cerr)); +- ::new(clog) ostream(cerr_ptr->rdbuf()); ++ istream* cin_ptr = ::new(&cin) istream(::new(__cin) __stdinbuf <char>(stdin, &mb_cin)); ++ ostream* cout_ptr = ::new(&cout) ostream(::new(__cout) __stdoutbuf<char>(stdout, &mb_cout)); ++ ostream* cerr_ptr = ::new(&cerr) ostream(::new(__cerr) __stdoutbuf<char>(stderr, &mb_cerr)); ++ ::new(&clog) ostream(cerr_ptr->rdbuf()); + cin_ptr->tie(cout_ptr); + _VSTD::unitbuf(*cerr_ptr); + cerr_ptr->tie(cout_ptr); + + #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS +- wistream* wcin_ptr = ::new(wcin) wistream(::new(__wcin) __stdinbuf <wchar_t>(stdin, &mb_wcin)); +- wostream* wcout_ptr = ::new(wcout) wostream(::new(__wcout) __stdoutbuf<wchar_t>(stdout, &mb_wcout)); +- wostream* wcerr_ptr = ::new(wcerr) wostream(::new(__wcerr) __stdoutbuf<wchar_t>(stderr, &mb_wcerr)); +- ::new(wclog) wostream(wcerr_ptr->rdbuf()); ++ wistream* wcin_ptr = ::new(&wcin) wistream(::new(__wcin) __stdinbuf <wchar_t>(stdin, &mb_wcin)); ++ wostream* wcout_ptr = ::new(&wcout) wostream(::new(__wcout) __stdoutbuf<wchar_t>(stdout, &mb_wcout)); ++ wostream* wcerr_ptr = ::new(&wcerr) wostream(::new(__wcerr) __stdoutbuf<wchar_t>(stderr, &mb_wcerr)); ++ ::new(&wclog) wostream(wcerr_ptr->rdbuf()); + + wcin_ptr->tie(wcout_ptr); + _VSTD::unitbuf(*wcerr_ptr); +@@ -139,15 +179,15 @@ DoIOSInit::DoIOSInit() + + DoIOSInit::~DoIOSInit() + { +- ostream* cout_ptr = reinterpret_cast<ostream*>(cout); ++ ostream* cout_ptr = reinterpret_cast<ostream*>(&cout); + cout_ptr->flush(); +- ostream* clog_ptr = reinterpret_cast<ostream*>(clog); ++ ostream* clog_ptr = reinterpret_cast<ostream*>(&clog); + clog_ptr->flush(); + + #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS +- wostream* wcout_ptr = reinterpret_cast<wostream*>(wcout); ++ wostream* wcout_ptr = reinterpret_cast<wostream*>(&wcout); + wcout_ptr->flush(); +- wostream* wclog_ptr = reinterpret_cast<wostream*>(wclog); ++ wostream* wclog_ptr = reinterpret_cast<wostream*>(&wclog); + wclog_ptr->flush(); + #endif + } |