[Libreoffice-commits] core.git: bridges/source

[Caolán McNamara]

 bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 6396e18f4d49c24283b170310a1892db40c128d3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 22 12:07:33 2014 +0100

    Related: rhbz#1125588 force existence of argument save area
    
    ELFv2 ABI on ppc64 optimises stack allocation
    (http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01149.html
    so we're getting no argument save area
    
    This now appears to pass the simple cases and onwards
    to the tricky ones
    
    Change-Id: Ie56d148ebea7fcfc023cb7183bc97f09186e66b4

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index c047ebf..33131ea 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -114,7 +114,11 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
     pMethod += 8 * nVtableIndex;
     pMethod = *((sal_uInt64 *)pMethod);
 
+#if _CALL_ELF == 2
+    typedef void (* FunctionCall )(...);
+#else
     typedef void (* FunctionCall )( sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64 );
+#endif
     FunctionCall pFunc = (FunctionCall)pMethod;
 
     volatile double dret;