bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx | 3 +++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 5 ++++- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-)
New commits: commit e2b7e28c12bb836fd7ab1dcbfc2460f807dd27f6 Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Wed Apr 4 21:41:49 2012 +0200 adjust gcc3_linux_intel bridge to work with clang Otherwise exception throwing seems to be broken. This is a partial revert of b0515ea5fa6c29faebed616ae3e0213c72d24904. diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx index 4c6370f..34f261a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx @@ -36,6 +36,7 @@ #include "typelib/typedescription.h" #include "callvirtualmethod.hxx" +#include "share.hxx" // The call instruction within the asm block of callVirtualMethod may throw // exceptions. At least GCC 4.7.0 with -O0 would create (unnecessary) @@ -66,6 +67,8 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod( // unexpected size of int assert(nStackLongs && pStackLongs); // no stack + if (! pAdjustedThisPtr) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something + volatile long edx = 0, eax = 0; // for register returns void * stackptr; asm volatile ( diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 6515b8f..e7e6e94 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> -#include <uno/any2.h> #include "share.hxx" @@ -60,6 +59,10 @@ using namespace ::__cxxabiv1; namespace CPPU_CURRENT_NAMESPACE { +void dummy_can_throw_anything( char const * ) +{ +} + //================================================================================================== static OUString toUNOname( char const * p ) SAL_THROW(()) { diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx index 2eff557..dfa1bf9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@ -32,9 +32,13 @@ #include <exception> #include <cstddef> +#include <uno/any2.h> + 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
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits