diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2025-01-08 21:18:36 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2025-01-08 21:32:52 +0300 |
| commit | bd0a6cfde3290e646613dba27e457cdada3b4501 (patch) | |
| tree | 8748dafc753b6761bb19d19f980d9621c7fa0cf9 /contrib/libs/cxxsupp/libcxx/src | |
| parent | 9b668f4d12c7d6fc709ffc4ab3b87a7e8aef8e2f (diff) | |
| download | ydb-bd0a6cfde3290e646613dba27e457cdada3b4501.tar.gz | |
libcxx: Identify libcxxrt by -DLIBCXXRT, just as the upstream does
commit_hash:77f8b13c7ed5331b212f0c1b6c3cf9f856a168e4
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx/src')
4 files changed, 6 insertions, 6 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/src/exception.cpp b/contrib/libs/cxxsupp/libcxx/src/exception.cpp index 6fdf211a2b..ddb186bf80 100644 --- a/contrib/libs/cxxsupp/libcxx/src/exception.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/exception.cpp @@ -10,7 +10,7 @@ #include <new> #include <typeinfo> -#if defined(LIBCXX_BUILDING_LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI) +#if defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI) # include <cxxabi.h> using namespace __cxxabiv1; # define HAVE_DEPENDENT_EH_ABI 1 @@ -22,13 +22,14 @@ using namespace __cxxabiv1; #elif defined(_LIBCPPABI_VERSION) # include "support/runtime/exception_libcxxabi.ipp" # include "support/runtime/exception_pointer_cxxabi.ipp" -#elif defined(LIBCXX_BUILDING_LIBCXXRT) +#elif defined(LIBCXXRT) # include "support/runtime/exception_libcxxrt.ipp" # include "support/runtime/exception_pointer_cxxabi.ipp" #elif defined(__GLIBCXX__) # include "support/runtime/exception_glibcxx.ipp" # include "support/runtime/exception_pointer_glibcxx.ipp" #else +# include "include/atomic_support.h" # include "support/runtime/exception_fallback.ipp" # include "support/runtime/exception_pointer_unimplemented.ipp" #endif diff --git a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_libcxxrt.ipp b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_libcxxrt.ipp index 82f60f5048..f17fecc71e 100644 --- a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_libcxxrt.ipp +++ b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_libcxxrt.ipp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#ifndef LIBCXX_BUILDING_LIBCXXRT +#ifndef LIBCXXRT # error this header may only be used when targeting libcxxrt #endif diff --git a/contrib/libs/cxxsupp/libcxx/src/support/runtime/stdexcept_default.ipp b/contrib/libs/cxxsupp/libcxx/src/support/runtime/stdexcept_default.ipp index f2bb2ea3e7..1f47a0325d 100644 --- a/contrib/libs/cxxsupp/libcxx/src/support/runtime/stdexcept_default.ipp +++ b/contrib/libs/cxxsupp/libcxx/src/support/runtime/stdexcept_default.ipp @@ -9,8 +9,7 @@ #include "../../include/refstring.h" /* For _LIBCPPABI_VERSION */ -#if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) && \ - (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(LIBCXX_BUILDING_LIBCXXRT)) +#if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) && (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(LIBCXXRT)) # include <cxxabi.h> #endif diff --git a/contrib/libs/cxxsupp/libcxx/src/typeinfo.cpp b/contrib/libs/cxxsupp/libcxx/src/typeinfo.cpp index 60230a6c38..e5f59da31c 100644 --- a/contrib/libs/cxxsupp/libcxx/src/typeinfo.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/typeinfo.cpp @@ -47,7 +47,7 @@ size_t std::type_info::hash_code() const noexcept { #endif // _LIBCPP_ABI_MICROSOFT // FIXME: Remove the _LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY configuration. -#if (!defined(LIBCXX_BUILDING_LIBCXXABI) && !defined(LIBCXX_BUILDING_LIBCXXRT) && !defined(__GLIBCXX__) && \ +#if (!defined(LIBCXX_BUILDING_LIBCXXABI) && !defined(LIBCXXRT) && !defined(__GLIBCXX__) && \ !defined(_LIBCPP_ABI_VCRUNTIME)) || \ defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) std::type_info::~type_info() {} |