Blind fix for Linux aarch64 with libcxxabi
...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:
@@ -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,
|
||||
// through a pointer known to actually point at the start):
|
||||
if (header->exceptionDestructor != &deleteException) {
|
||||
header = reinterpret_cast<__cxa_exception const *>(
|
||||
reinterpret_cast<char const *>(header) - 8);
|
||||
header = reinterpret_cast<__cxxabiv1::__cxa_exception *>(
|
||||
reinterpret_cast<char *>(header) - 8);
|
||||
assert(header->exceptionDestructor == &deleteException);
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user