mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt gcc3_linux_arm __cxa_exception to NDK 18 libc++abi

Browse Source 
...which adds a member, and will be relevant when switching armeabi-v7a to
libc++/libc++abi/libunwind (coming soon).

Change-Id: I1f98f50ca299a583e73e0dbd6c8c94d973329f3a
Reviewed-on: https://gerrit.libreoffice.org/64966
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2018-12-11 15:01:30 +01:00
parent 357112d74c
commit 711f523364
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
View File

@ -64,6 +64,15 @@ public:
namespace __cxxabiv1 { namespace __cxxabiv1 {
struct __cxa_exception struct __cxa_exception
{ {
#if defined _LIBCPPABI_VERSION // detect libc++abi
#if defined __LP64__ || defined __ARM_EABI__
// Quoting android-ndk-r18b/sources/cxx-stl/llvm-libc++abi/src/cxa_exception.hpp: "This is a
// new field to support C++ 0x exception_ptr. For binary compatibility it is at the start of
// this struct which is prepended to the object thrown in __cxa_allocate_exception."
std::size_t referenceCount;
#endif
#endif
std::type_info *exceptionType; std::type_info *exceptionType;
void (*exceptionDestructor)(void *); void (*exceptionDestructor)(void *);