diff options
author | robot-piglet <robot-piglet@yandex-team.com> | 2025-01-17 18:25:19 +0300 |
---|---|---|
committer | robot-piglet <robot-piglet@yandex-team.com> | 2025-01-17 18:38:57 +0300 |
commit | 5c2d21446714a7fd606b4c3eda548143d746aa1d (patch) | |
tree | a073933a92a37fb4e2d8279da2a32877ec6ead20 /contrib/libs | |
parent | bcd8e10a6e5d58ca2cbad4447821a164eded572a (diff) | |
download | ydb-5c2d21446714a7fd606b4c3eda548143d746aa1d.tar.gz |
Intermediate changes
commit_hash:cb6edb9680129e548f2555698cefff6646834acc
Diffstat (limited to 'contrib/libs')
-rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/patches/01-commit-e0e82fc-initial.patch | 17 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxxabi/patches/02-commit-fd92733-3.1.27.patch | 17 |
2 files changed, 0 insertions, 34 deletions
diff --git a/contrib/libs/cxxsupp/libcxxabi/patches/01-commit-e0e82fc-initial.patch b/contrib/libs/cxxsupp/libcxxabi/patches/01-commit-e0e82fc-initial.patch index 19f128539a..17801a86d3 100644 --- a/contrib/libs/cxxsupp/libcxxabi/patches/01-commit-e0e82fc-initial.patch +++ b/contrib/libs/cxxsupp/libcxxabi/patches/01-commit-e0e82fc-initial.patch @@ -445,23 +445,6 @@ diff --git a/src/cxa_personality.cpp b/src/cxa_personality.cpp static _Unwind_Reason_Code __gxx_personality_imp #else _LIBCXXABI_FUNC_VIS _Unwind_Reason_Code -@@ -990,6 +994,16 @@ __gxx_personality_v0 - exception_header->catchTemp = 0; - #endif - } -+#ifdef __USING_WASM_EXCEPTIONS__ -+ // Wasm uses only one phase in _UA_CLEANUP_PHASE, so we should set -+ // these here. -+ __cxa_exception* exception_header = (__cxa_exception*)(unwind_exception+1) - 1; -+ exception_header->handlerSwitchValue = static_cast<int>(results.ttypeIndex); -+ exception_header->actionRecord = results.actionRecord; -+ exception_header->languageSpecificData = results.languageSpecificData; -+ exception_header->catchTemp = reinterpret_cast<void*>(results.landingPad); -+ exception_header->adjustedPtr = results.adjustedPtr; -+#endif - return _URC_INSTALL_CONTEXT; - } - diff --git a/src/cxa_thread_atexit.cpp b/src/cxa_thread_atexit.cpp --- a/src/cxa_thread_atexit.cpp +++ b/src/cxa_thread_atexit.cpp diff --git a/contrib/libs/cxxsupp/libcxxabi/patches/02-commit-fd92733-3.1.27.patch b/contrib/libs/cxxsupp/libcxxabi/patches/02-commit-fd92733-3.1.27.patch index 7610425424..f4c7b96bf5 100644 --- a/contrib/libs/cxxsupp/libcxxabi/patches/02-commit-fd92733-3.1.27.patch +++ b/contrib/libs/cxxsupp/libcxxabi/patches/02-commit-fd92733-3.1.27.patch @@ -63,20 +63,3 @@ diff --git a/src/cxa_personality.cpp b/src/cxa_personality.cpp } return _URC_HANDLER_FOUND; } -@@ -994,16 +999,6 @@ __gxx_personality_v0 - exception_header->catchTemp = 0; - #endif - } --#ifdef __USING_WASM_EXCEPTIONS__ -- // Wasm uses only one phase in _UA_CLEANUP_PHASE, so we should set -- // these here. -- __cxa_exception* exception_header = (__cxa_exception*)(unwind_exception+1) - 1; -- exception_header->handlerSwitchValue = static_cast<int>(results.ttypeIndex); -- exception_header->actionRecord = results.actionRecord; -- exception_header->languageSpecificData = results.languageSpecificData; -- exception_header->catchTemp = reinterpret_cast<void*>(results.landingPad); -- exception_header->adjustedPtr = results.adjustedPtr; --#endif - return _URC_INSTALL_CONTEXT; - } - |