diff options
| author | somov <somov@yandex-team.ru> | 2022-02-10 16:45:47 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:47 +0300 |
| commit | a5950576e397b1909261050b8c7da16db58f10b1 (patch) | |
| tree | 7ba7677f6a4c3e19e2cefab34d16df2c8963b4d4 /contrib/libs/cxxsupp/libcxxrt | |
| parent | 81eddc8c0b55990194e112b02d127b87d54164a9 (diff) | |
| download | ydb-a5950576e397b1909261050b8c7da16db58f10b1.tar.gz | |
Restoring authorship annotation for <somov@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'contrib/libs/cxxsupp/libcxxrt')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/cxxabi.h | 6 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/exception.cc | 16 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/ya.make | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/contrib/libs/cxxsupp/libcxxrt/cxxabi.h b/contrib/libs/cxxsupp/libcxxrt/cxxabi.h index 7a8cb6745f..6e33d33c03 100644 --- a/contrib/libs/cxxsupp/libcxxrt/cxxabi.h +++ b/contrib/libs/cxxsupp/libcxxrt/cxxabi.h @@ -183,9 +183,9 @@ struct __cxa_eh_globals */ unsigned int uncaughtExceptions; }; - -#define Y_CXA_EH_GLOBALS_COMPLETE - + +#define Y_CXA_EH_GLOBALS_COMPLETE + /** * ABI function returning the __cxa_eh_globals structure. */ diff --git a/contrib/libs/cxxsupp/libcxxrt/exception.cc b/contrib/libs/cxxsupp/libcxxrt/exception.cc index 6baf428ead..95f05ed474 100644 --- a/contrib/libs/cxxsupp/libcxxrt/exception.cc +++ b/contrib/libs/cxxsupp/libcxxrt/exception.cc @@ -652,14 +652,14 @@ static void free_exception(char *e) } } -static constexpr size_t align_to(size_t size, size_t alignment) noexcept { - return (size + alignment - 1) / alignment * alignment; -} - -static_assert(align_to(15, 16) == 16); -static_assert(align_to(16, 16) == 16); -static_assert(align_to(17, 16) == 32); - +static constexpr size_t align_to(size_t size, size_t alignment) noexcept { + return (size + alignment - 1) / alignment * alignment; +} + +static_assert(align_to(15, 16) == 16); +static_assert(align_to(16, 16) == 16); +static_assert(align_to(17, 16) == 32); + static constexpr size_t exception_size = align_to(sizeof(__cxa_exception), 16); static constexpr size_t dependent_exception_size = align_to(sizeof(__cxa_dependent_exception), 16); #ifdef _YNDX_LIBUNWIND_ENABLE_EXCEPTION_BACKTRACE diff --git a/contrib/libs/cxxsupp/libcxxrt/ya.make b/contrib/libs/cxxsupp/libcxxrt/ya.make index 12dccbd505..735eeccaa4 100644 --- a/contrib/libs/cxxsupp/libcxxrt/ya.make +++ b/contrib/libs/cxxsupp/libcxxrt/ya.make @@ -34,13 +34,13 @@ NO_RUNTIME() CXXFLAGS(-nostdinc++) IF (CXX_UNWIND == "glibcxx_dynamic" OR ARCH_PPC64LE) - LDFLAGS(-lgcc_s) -ELSE() + LDFLAGS(-lgcc_s) +ELSE() PEERDIR( contrib/libs/libunwind ) -ENDIF() - +ENDIF() + IF (SANITIZER_TYPE == undefined OR FUZZING) NO_SANITIZE() NO_SANITIZE_COVERAGE() |