mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blind fix for Linux aarch64 with libcxxabi

Browse Source 
...after untested a7d1fed245 "Hack to dynamically
adapt to __cxa_exceptiom in LLVM 5.0 libcxxabi" had been submitted

Change-Id: I68694645825ddebb249a90d9af9b8ba04c0bdbb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88519
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2020-02-12 12:47:04 +01:00
parent b54e6db754
commit 6dd94a4dd8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
View File

@@ -153,8 +153,8 @@ extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) {
// unaffected, as it only accesses members towards the start of the struct, // unaffected, as it only accesses members towards the start of the struct,
// through a pointer known to actually point at the start): // through a pointer known to actually point at the start):
if (header->exceptionDestructor != &deleteException) { if (header->exceptionDestructor != &deleteException) {
header = reinterpret_cast<__cxa_exception const *>( header = reinterpret_cast<__cxxabiv1::__cxa_exception *>(
reinterpret_cast<char const *>(header) - 8); reinterpret_cast<char *>(header) - 8);
assert(header->exceptionDestructor == &deleteException); assert(header->exceptionDestructor == &deleteException);
} }
#endif #endif