diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-12 12:47:04 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2020-08-04 13:43:39 +0200 |
| commit | 69d6c4b42bdeb9ed2fa0d3680510b8f0cf81a72e (patch) | |
| tree | e68df0f607955d8d67d20a0df4069bc82c58e224 /bridges | |
| parent | 8b1a1036f254dc8c68a4a067ec368abea5b27e83 (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100014
Tested-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.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 02d7bcd9aa9d..83359439456a 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 |