diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-12 12:47:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-12 16:20:15 +0100 |
| commit | 6dd94a4dd8f0b842cd62ec872ede17c8077be98c (patch) | |
| tree | 64f6c981c556002bd86c2de556539061ef1af682 /bridges | |
| parent | b54e6db754f67c4a216c0f6d9b4a8d6315b1df16 (diff) | |
Blind fix for Linux aarch64 with libcxxabi
...after untested a7d1fed24557b203acb5016a98af26f4ef24d27a "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>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx index 611442a31e31..4a5a1d1b662d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx @@ -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 |