diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2024-03-02 10:12:12 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-03-02 10:28:26 +0300 |
| commit | 430c76ad07bec1885b150b4c73b8e6a8c8e75681 (patch) | |
| tree | 3ec30e01bcf4160c07abde0fe1267b300cc98bb6 | |
| parent | ede142833218a848ec5b75819111cff6fc0bc9ca (diff) | |
| download | ydb-430c76ad07bec1885b150b4c73b8e6a8c8e75681.tar.gz | |
Intermediate changes
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/src/fallback_malloc.cpp | 4 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/src/stdlib_new_delete.cpp | 4 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/ya.make | 14 |
3 files changed, 21 insertions, 1 deletions
diff --git a/contrib/libs/cxxsupp/libcxxabi/src/fallback_malloc.cpp b/contrib/libs/cxxsupp/libcxxabi/src/fallback_malloc.cpp index 7e356d9fe4..0443fd9e62 100644 --- a/contrib/libs/cxxsupp/libcxxabi/src/fallback_malloc.cpp +++ b/contrib/libs/cxxsupp/libcxxabi/src/fallback_malloc.cpp @@ -15,6 +15,10 @@ #endif #endif +#ifdef __EMSCRIPTEN__ +#include <__memory/aligned_alloc.h> +#endif + #include <stdlib.h> // for malloc, calloc, free #include <string.h> // for memset #include <new> // for std::__libcpp_aligned_{alloc,free} diff --git a/contrib/libs/cxxsupp/libcxxabi/src/stdlib_new_delete.cpp b/contrib/libs/cxxsupp/libcxxabi/src/stdlib_new_delete.cpp index 48e509ba2b..3a04ad39b1 100644 --- a/contrib/libs/cxxsupp/libcxxabi/src/stdlib_new_delete.cpp +++ b/contrib/libs/cxxsupp/libcxxabi/src/stdlib_new_delete.cpp @@ -12,6 +12,10 @@ #include <new> #include <cstdlib> +#ifdef __EMSCRIPTEN__ +#include <__memory/aligned_alloc.h> +#endif + #if !defined(_THROW_BAD_ALLOC) || !defined(_LIBCXXABI_WEAK) #error The _THROW_BAD_ALLOC and _LIBCXXABI_WEAK libc++ macros must \ already be defined by libc++. diff --git a/contrib/libs/cxxsupp/libcxxabi/ya.make b/contrib/libs/cxxsupp/libcxxabi/ya.make index d71d5b8ec2..1f739ea96f 100644 --- a/contrib/libs/cxxsupp/libcxxabi/ya.make +++ b/contrib/libs/cxxsupp/libcxxabi/ya.make @@ -1,4 +1,4 @@ -# Generated by devtools/yamaker from nixpkgs 22.11. +# Generated by devtools/yamaker from nixpkgs 23.05. LIBRARY() @@ -15,6 +15,10 @@ VERSION(14.0.6) ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-14.0.6.tar.gz) +PEERDIR( + library/cpp/sanitizer/include +) + ADDINCL( contrib/libs/cxxsupp/libcxxabi/include contrib/libs/cxxsupp/libcxx/include @@ -56,4 +60,12 @@ SRC_C_PIC( -fno-lto ) +IF (OS_EMSCRIPTEN) + CFLAGS( + -D_LIBCPP_SAFE_STATIC= + -D_LIBCXXABI_DTOR_FUNC= + -D__USING_WASM_EXCEPTIONS__ + ) +ENDIF() + END() |