Attachment 232330 Details for Bug 262008 – editors/libreoffice: work around changed alignment of __cxa_exception

[patch] editors/libreoffice: work around changed alignment of __cxa_exception

editors__libreoffice-enable-cxa-exception-detection-1.diff (text/plain), 2.67 KB, created by Dimitry Andric on 2022-03-08 22:23:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2022-03-08 22:23:39 UTC

Size: 2.67 KB

patch

obsolete

>commit 9d0944c6d90dee888e60743c2a68d67e9656b423
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Tue Mar 8 23:21:26 2022 +0100
>
>    editors/libreoffice: work around changed alignment of __cxa_exception
>    
>    LibreOffice has special detection for the change in alignment and size
>    of struct cxa_exception, when using libc++abi. However, this updated
>    alignment also applies to libunwind and upstream libcxxrt, and will soon
>    apply to our libcxxrt too.
>    
>    Enable the special detection unconditionally for x86_64 and aarch64, so
>    libreoffice packages built on 13.0-R (with the old alignment) will
>    seamlessly work on 13.1-R (which will have the new alignment).
>
>diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_abi.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_abi.cxx
>new file mode 100644
>index 000000000000..dc8af45ecfea
>--- /dev/null
>+++ b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__aarch64_abi.cxx
>@@ -0,0 +1,11 @@
>+--- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx.orig	2022-01-26 14:35:29 UTC
>++++ bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
>+@@ -147,7 +147,7 @@ extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException
>+ extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) {
>+     __cxxabiv1::__cxa_exception * header =
>+         static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1;
>+-#if !defined MACOSX && defined _LIBCPPABI_VERSION // detect libc++abi
>++#if 1
>+     // First, the libcxxabi commit
>+     // <http://llvm.org/viewvc/llvm-project?view=revision&revision=303175>
>+     // "[libcxxabi] Align unwindHeader on a double-word boundary" towards
>diff --git a/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_except.cxx b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_except.cxx
>new file mode 100644
>index 000000000000..4553e0303b2a
>--- /dev/null
>+++ b/editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_except.cxx
>@@ -0,0 +1,11 @@
>+--- bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx.orig	2022-01-26 14:35:29 UTC
>++++ bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
>+@@ -82,7 +82,7 @@ static void _GLIBCXX_CDTOR_CALLABI deleteException( vo
>+ static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
>+ {
>+     __cxxabiv1::__cxa_exception const * header = static_cast<__cxxabiv1::__cxa_exception const *>(pExc) - 1;
>+-#if defined _LIBCPPABI_VERSION // detect libc++abi
>++#if 1
>+     // First, the libcxxabi commit
>+     // <http://llvm.org/viewvc/llvm-project?view=revision&revision=303175>
>+     // "[libcxxabi] Align unwindHeader on a double-word boundary" towards

Actions: View | Diff

Attachments on bug 262008: 231887 | 231895 | 232152 | 232274 | 232330 | 233272