Kaydet (Commit) 711f5233 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Adapt gcc3_linux_arm __cxa_exception to NDK 18 libc++abi

...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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 357112d7
......@@ -64,6 +64,15 @@ public:
namespace __cxxabiv1 {
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;
void (*exceptionDestructor)(void *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment