diff options
| author | thegeorg <[email protected]> | 2024-02-01 19:57:22 +0300 |
|---|---|---|
| committer | thegeorg <[email protected]> | 2024-02-01 20:16:55 +0300 |
| commit | a9a693d90ec510de5d083f9c54cff958cb4921b9 (patch) | |
| tree | 4f182902802320d9cac3cf377442009ef169ed2a | |
| parent | 6b7a39094ff39f9b5d2e0f6b68c6dcfff8462bed (diff) | |
Fix reimport for contrib/libs/cxxsupp/libcxxrt
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/exception.cc | 34 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/ya.make | 9 |
2 files changed, 19 insertions, 24 deletions
diff --git a/contrib/libs/cxxsupp/libcxxrt/exception.cc b/contrib/libs/cxxsupp/libcxxrt/exception.cc index 0a26befee6a..ec33baba527 100644 --- a/contrib/libs/cxxsupp/libcxxrt/exception.cc +++ b/contrib/libs/cxxsupp/libcxxrt/exception.cc @@ -297,19 +297,19 @@ using namespace ABI_NAMESPACE; */ static _Unwind_Reason_Code trace(struct _Unwind_Context *context, void *c) { - Dl_info myinfo; - int mylookup = - dladdr(reinterpret_cast<void *>(__cxa_current_exception_type), &myinfo); - void *ip = reinterpret_cast<void*>(_Unwind_GetIP(context)); - Dl_info info; - if (dladdr(ip, &info) != 0) - { - if (mylookup == 0 || strcmp(info.dli_fname, myinfo.dli_fname) != 0) - { - printf("%p:%s() in %s\n", ip, info.dli_sname, info.dli_fname); - } - } - return _URC_CONTINUE_UNWIND; + Dl_info myinfo; + int mylookup = + dladdr(reinterpret_cast<void *>(__cxa_current_exception_type), &myinfo); + void *ip = reinterpret_cast<void*>(_Unwind_GetIP(context)); + Dl_info info; + if (dladdr(ip, &info) != 0) + { + if (mylookup == 0 || strcmp(info.dli_fname, myinfo.dli_fname) != 0) + { + printf("%p:%s() in %s\n", ip, info.dli_sname, info.dli_fname); + } + } + return _URC_CONTINUE_UNWIND; } static void bt_terminate_handler() { @@ -898,10 +898,10 @@ extern "C" void __cxa_throw(void *thrown_exception, std::type_info *tinfo, void(*dest)(void*)) { - if (cxa_throw_hook) - { - cxa_throw_hook(thrown_exception, tinfo, dest); - } + if (cxa_throw_hook) + { + cxa_throw_hook(thrown_exception, tinfo, dest); + } __cxa_exception *ex = __cxa_init_primary_exception(thrown_exception, tinfo, dest); ex->referenceCount = 1; diff --git a/contrib/libs/cxxsupp/libcxxrt/ya.make b/contrib/libs/cxxsupp/libcxxrt/ya.make index 93c9d74bb05..67b02f3b55f 100644 --- a/contrib/libs/cxxsupp/libcxxrt/ya.make +++ b/contrib/libs/cxxsupp/libcxxrt/ya.make @@ -23,14 +23,10 @@ NO_COMPILER_WARNINGS() NO_RUNTIME() -CXXFLAGS( - -nostdinc++ -) +CXXFLAGS(-nostdinc++) IF (CXX_UNWIND == "glibcxx_dynamic" OR ARCH_PPC64LE) - LDFLAGS( - -lgcc_s - ) + LDFLAGS(-lgcc_s) ELSE() PEERDIR( contrib/libs/libunwind @@ -39,7 +35,6 @@ ENDIF() IF (SANITIZER_TYPE == undefined OR FUZZING) NO_SANITIZE() - NO_SANITIZE_COVERAGE() ENDIF() |