diff options
| author | dtorilov <dtorilov@yandex-team.com> | 2024-03-27 22:11:00 +0300 |
|---|---|---|
| committer | dtorilov <dtorilov@yandex-team.com> | 2024-03-27 22:22:53 +0300 |
| commit | 1541ebf4e489185a3ec0d47a2ea8e474522af784 (patch) | |
| tree | ede807c00af640aa49309701d98b496a4d46859c /contrib/libs/cxxsupp/libcxxabi/include | |
| parent | 0a9f70229b9ddccbd4a09d389642ddafcbe8fd57 (diff) | |
| download | ydb-1541ebf4e489185a3ec0d47a2ea8e474522af784.tar.gz | |
Update libcxxabi to 16.0.6
0a9e5a8cb8cd8cd03641221da29e1186a61cf984
Diffstat (limited to 'contrib/libs/cxxsupp/libcxxabi/include')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/include/__cxxabi_config.h | 8 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/include/cxxabi.h | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/contrib/libs/cxxsupp/libcxxabi/include/__cxxabi_config.h b/contrib/libs/cxxsupp/libcxxabi/include/__cxxabi_config.h index 7bc39ada8d..c97dd656e1 100644 --- a/contrib/libs/cxxsupp/libcxxabi/include/__cxxabi_config.h +++ b/contrib/libs/cxxsupp/libcxxabi/include/__cxxabi_config.h @@ -10,7 +10,7 @@ #define ____CXXABI_CONFIG_H #if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \ - !defined(__ARM_DWARF_EH__) + !defined(__ARM_DWARF_EH__) && !defined(__SEH__) #define _LIBCXXABI_ARM_EHABI #endif @@ -97,4 +97,10 @@ # define _LIBCXXABI_NO_EXCEPTIONS #endif +#if defined(_WIN32) +#define _LIBCXXABI_DTOR_FUNC __thiscall +#else +#define _LIBCXXABI_DTOR_FUNC +#endif + #endif // ____CXXABI_CONFIG_H diff --git a/contrib/libs/cxxsupp/libcxxabi/include/cxxabi.h b/contrib/libs/cxxsupp/libcxxabi/include/cxxabi.h index 106c4508c4..d05c523cab 100644 --- a/contrib/libs/cxxsupp/libcxxabi/include/cxxabi.h +++ b/contrib/libs/cxxsupp/libcxxabi/include/cxxabi.h @@ -19,7 +19,7 @@ #include <__cxxabi_config.h> -#define _LIBCPPABI_VERSION 1002 +#define _LIBCPPABI_VERSION 15000 #define _LIBCXXABI_NORETURN __attribute__((noreturn)) #define _LIBCXXABI_ALWAYS_COLD __attribute__((cold)) @@ -55,11 +55,11 @@ __cxa_free_exception(void *thrown_exception) _NOEXCEPT; #ifdef __USING_WASM_EXCEPTIONS__ extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_throw(void *thrown_exception, std::type_info *tinfo, - void *(*dest)(void *)); + void *(_LIBCXXABI_DTOR_FUNC *dest)(void *)); #else extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_throw(void *thrown_exception, std::type_info *tinfo, - void (*dest)(void *)); + void (_LIBCXXABI_DTOR_FUNC *dest)(void *)); #endif // 2.5.3 Exception Handlers |