diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-25 19:51:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-26 08:57:07 +0100 |
| commit | baad027bb7d4e4cd3c80ec3051741d21a8d23511 (patch) | |
| tree | fe92b945d3987cf19b88f08067892fbfcc03b712 /bridges | |
| parent | b878666cd117358ff93f7dd49e8837d027bef8e0 (diff) | |
Expect _Unwind_Exception to be defined in the compilers' unwind.h
Change-Id: Ie27018d21cf356ea5c6953958b466153f93f9a51
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 11 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx index 512ae6db2c03..bf9c501013fb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@ -27,6 +27,7 @@ #ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h #define _GLIBCXX_CDTOR_CALLABI #endif +#include <unwind.h> #include "config_gcc.h" #include <uno/any2.h> @@ -37,15 +38,7 @@ namespace CPPU_CURRENT_NAMESPACE void dummy_can_throw_anything( char const * ); -// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h - -struct _Unwind_Exception -{ - unsigned exception_class __attribute__((__mode__(__DI__))); - void * exception_cleanup; - unsigned private_1 __attribute__((__mode__(__word__))); - unsigned private_2 __attribute__((__mode__(__word__))); -} __attribute__((__aligned__)); +// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h struct __cxa_exception { diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx index 96ddfc0be0b3..096c7d49e81b 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @@ -27,6 +27,7 @@ #ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h #define _GLIBCXX_CDTOR_CALLABI #endif +#include <unwind.h> #include "config_gcc.h" #include "uno/any2.h" @@ -61,15 +62,7 @@ extern "C" _LIBCPP_NORETURN void __cxa_throw( namespace CPPU_CURRENT_NAMESPACE { -// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h - -struct _Unwind_Exception -{ - unsigned exception_class __attribute__((__mode__(__DI__))); - void * exception_cleanup; - unsigned private_1 __attribute__((__mode__(__word__))); - unsigned private_2 __attribute__((__mode__(__word__))); -} __attribute__((__aligned__)); +// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h struct __cxa_exception { |