aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormikhnenko <mikhnenko@yandex-team.com>2023-10-10 23:26:47 +0300
committermikhnenko <mikhnenko@yandex-team.com>2023-10-10 23:49:41 +0300
commit11a2bf36eda43dad302d5b42e56f933c7b9e178c (patch)
tree0f2d179a05a8100daf0e00b5778689a9547935f5
parente9179704dc5dd5436bd6439b215c469100e1180d (diff)
downloadydb-11a2bf36eda43dad302d5b42e56f933c7b9e178c.tar.gz
Disable Clang builtins which nvcc does not understand
-rw-r--r--contrib/libs/cxxsupp/libcxx/include/__assert3
-rw-r--r--contrib/libs/cxxsupp/libcxx/include/__tuple2
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/__assert b/contrib/libs/cxxsupp/libcxx/include/__assert
index cb397e41980..7d0fd205083 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__assert
+++ b/contrib/libs/cxxsupp/libcxx/include/__assert
@@ -39,7 +39,8 @@
(void)0 : \
::std::__libcpp_assertion_handler(__FILE__, __LINE__, #expression, message))
#else
-# if __has_builtin(__builtin_assume)
+// Disable Clang builtins which nvcc does not understand
+# if __has_builtin(__builtin_assume) && !defined(__CUDACC__)
# define _LIBCPP_ASSERT(expression, message) \
(_LIBCPP_DIAGNOSTIC_PUSH \
_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wassume") \
diff --git a/contrib/libs/cxxsupp/libcxx/include/__tuple b/contrib/libs/cxxsupp/libcxx/include/__tuple
index 89448b0a43d..51ec9a9acda 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__tuple
+++ b/contrib/libs/cxxsupp/libcxx/include/__tuple
@@ -91,6 +91,7 @@ struct __integer_sequence {
using __to_tuple_indices = __tuple_indices<(_Values + _Sp)...>;
};
+// Disable Clang builtins which nvcc does not understand
#if defined(__CUDACC__) || !__has_builtin(__make_integer_seq) || defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE)
namespace __detail {
@@ -133,6 +134,7 @@ template<> struct __parity<7> { template<size_t _Np> struct __pmake : __repeat<t
#endif // !__has_builtin(__make_integer_seq) || defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE)
+// Disable Clang builtins which nvcc does not understand
#if __has_builtin(__make_integer_seq) && !defined(__CUDACC__)
template <size_t _Ep, size_t _Sp>
using __make_indices_imp =