diff options
| author | mikhnenko <mikhnenko@yandex-team.com> | 2024-04-24 09:46:32 +0300 |
|---|---|---|
| committer | mikhnenko <mikhnenko@yandex-team.com> | 2024-04-24 10:01:16 +0300 |
| commit | 10edf75449c54440a95df6c67f1f4e63118cf31a (patch) | |
| tree | 442ac3a1683d52c59c5a7ee469666d3922f6b168 | |
| parent | f123a9ad03e3fed5450470ab4a68741025fdc2e6 (diff) | |
| download | ydb-10edf75449c54440a95df6c67f1f4e63118cf31a.tar.gz | |
Move disabling CUDA-specific defines to epiloge
49394d902af5e4388e6145ab9d0b8e0f8161fadc
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__config | 6 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/__config_epilogue.h | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/__config b/contrib/libs/cxxsupp/libcxx/include/__config index 7b934651b4..f804928a6a 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__config +++ b/contrib/libs/cxxsupp/libcxx/include/__config @@ -1265,7 +1265,7 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c # define _LIBCPP_REINITIALIZES_OBJECT # endif -# if __has_attribute(__nodebug__) && !defined(__CUDACC__) +# if __has_attribute(__nodebug__) # define _LIBCPP_NODEBUG __attribute__((__nodebug__)) # else # define _LIBCPP_NODEBUG @@ -1299,7 +1299,7 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c # define _LIBCPP_IF_WIDE_CHARACTERS(...) __VA_ARGS__ # endif -# if defined(_LIBCPP_ABI_MICROSOFT) && __has_declspec_attribute(empty_bases) && !defined(__CUDACC__) +# if defined(_LIBCPP_ABI_MICROSOFT) && __has_declspec_attribute(empty_bases) # define _LIBCPP_DECLSPEC_EMPTY_BASES __declspec(empty_bases) # else # define _LIBCPP_DECLSPEC_EMPTY_BASES @@ -1421,7 +1421,7 @@ __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, c # define _LIBCPP_PACKED_BYTE_FOR_AIX_END /* empty */ # endif -# if __has_attribute(__packed__) && !defined(__CUDACC__) +# if __has_attribute(__packed__) # define _LIBCPP_PACKED __attribute__((__packed__)) # else # define _LIBCPP_PACKED diff --git a/contrib/libs/cxxsupp/libcxx/include/__config_epilogue.h b/contrib/libs/cxxsupp/libcxx/include/__config_epilogue.h index cc5cf17193..bdc229a325 100644 --- a/contrib/libs/cxxsupp/libcxx/include/__config_epilogue.h +++ b/contrib/libs/cxxsupp/libcxx/include/__config_epilogue.h @@ -1,6 +1,15 @@ #pragma once #if defined(__CUDACC__) - #undef _LIBCPP_USING_IF_EXISTS - #define _LIBCPP_USING_IF_EXISTS + #undef _LIBCPP_DECLSPEC_EMPTY_BASES + #define _LIBCPP_DECLSPEC_EMPTY_BASES + + #undef _LIBCPP_NODEBUG + #define _LIBCPP_NODEBUG + + #undef _LIBCPP_PACKED + #define _LIBCPP_PACKED + + #undef _LIBCPP_USING_IF_EXISTS + #define _LIBCPP_USING_IF_EXISTS #endif |