[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - bridges/source

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 924fb638ed3983461a5f503b99bc84be2cc23d84
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Feb 12 12:47:04 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Aug 4 13:52:03 2020 +0200

    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 at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100019
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

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