bridges/Library_cpp_uno.mk                                      |    8 
 bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx |  117 -
 bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx |   47 
 bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx           |  520 --------
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx            |  292 ----
 bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx             |   82 -
 bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx           |  356 -----
 bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx           |  569 
---------
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx            |  289 ----
 bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx             |   92 -
 bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx           |  604 
----------
 solenv/clang-format/excludelist                                 |   10 
 12 files changed, 2986 deletions(-)

New commits:
commit f43e882629b8027b13370514b3a0b277707a3c2c
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 23 11:51:59 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 27 07:29:39 2023 +0000

    Remove Solaris 32-bit SPARC and x86 C++ UNO bridge implementations
    
    As discussed in the mailing list thread starting at
    
<https://lists.freedesktop.org/archives/libreoffice/2023-January/089808.html>
    "Plan to remove dead C++ UNO bridge implementations 
(bridges/source/cpp_uno/*)",
    the bridge implementations at bridges/source/cpp_uno/gcc3_solaris_intel and
    bridges/source/cpp_uno/gcc3_solaris_sparc are apparently dead and should 
thus be
    removed.  Those were the only bridge implementations for Solaris, but the
    referenced thread mentions that there are recent builds for OpenIndiana 
x86-64
    (however they are done; presumably using
    bridges/source/cpp_uno/gcc3_linux_x86-64), so keep general support for 
Solaris
    intact for now.
    
    Change-Id: I09ec098f5509f25a126342536745509bbe9faaac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146059
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index ca7a3d908ed9..56d86c5aaec2 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -77,10 +77,6 @@ bridges_SELECTED_BRIDGE := gcc3_linux_intel
 bridge_asm_objects := call
 bridge_exception_objects := cpp2uno except uno2cpp
 bridge_noncallexception_objects := callvirtualmethod
-else ifeq ($(OS),SOLARIS)
-bridges_SELECTED_BRIDGE := gcc3_solaris_intel
-bridge_exception_objects := cpp2uno except uno2cpp
-bridge_noncallexception_objects := callvirtualmethod
 else ifeq ($(COM),MSC)
 bridges_SELECTED_BRIDGE := msvc_win32_intel
 bridge_exception_objects := cpp2uno uno2cpp
@@ -162,10 +158,6 @@ bridges_SELECTED_BRIDGE := gcc3_linux_sparc
 bridge_asm_objects := call
 bridge_noopt_objects := except
 bridge_exception_objects := cpp2uno uno2cpp
-else ifeq ($(OS),SOLARIS)
-bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
-bridge_noopt_objects := cpp2uno uno2cpp
-bridge_exception_objects := except
 endif
 
 else ifeq ($(OS)-$(CPUNAME),LINUX-SPARC64)
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx 
b/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx
deleted file mode 100644
index 1f54296fce11..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.cxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <uno/data.h>
-
-#include "bridge.hxx"
-#include "types.hxx"
-#include "unointerfaceproxy.hxx"
-#include "vtables.hxx"
-
-#include "share.hxx"
-
-#include "callvirtualmethod.hxx"
-
-void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
-    void * pAdjustedThisPtr,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs )
-{
-    // parameter list is mixed list of * and values
-    // reference parameters are pointers
-
-    assert(pStackLongs && pAdjustedThisPtr);
-    static_assert((sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### 
unexpected size of int!");
-    assert(nStackLongs && pStackLongs && "### no stack in callVirtualMethod 
!");
-
-    // never called
-    if (! pAdjustedThisPtr) 
CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
-
-    long edx, eax; // for register returns
-    void * stackptr;
-    asm volatile (
-        "mov   %%esp, %2\n\t"
-       // preserve potential 128bit stack alignment
-        "and   $0xfffffff0, %%esp\n\t"
-        "mov   %3, %%eax\n\t"
-        "lea   -4(,%%eax,4), %%eax\n\t"
-        "and   $0xf, %%eax\n\t"
-        "sub   $0xc, %%eax\n\t"
-        "add   %%eax, %%esp\n\t"
-        // copy values
-        "mov   %3, %%eax\n\t"
-        "mov   %%eax, %%edx\n\t"
-        "dec   %%edx\n\t"
-        "shl   $2, %%edx\n\t"
-        "add   %4, %%edx\n"
-        "Lcopy:\n\t"
-        "pushl 0(%%edx)\n\t"
-        "sub   $4, %%edx\n\t"
-        "dec   %%eax\n\t"
-        "jne   Lcopy\n\t"
-        // do the actual call
-        "mov   %5, %%edx\n\t"
-        "mov   0(%%edx), %%edx\n\t"
-        "mov   %6, %%eax\n\t"
-        "shl   $2, %%eax\n\t"
-        "add   %%eax, %%edx\n\t"
-        "mov   0(%%edx), %%edx\n\t"
-        "call  *%%edx\n\t"
-        // save return registers
-         "mov   %%eax, %0\n\t"
-         "mov   %%edx, %1\n\t"
-        // cleanup stack
-        "mov   %2, %%esp\n\t"
-        : "=m"(eax), "=m"(edx), "=m"(stackptr)
-        : "m"(nStackLongs), "m"(pStackLongs), "m"(pAdjustedThisPtr), 
"m"(nVtableIndex)
-        : "eax", "ecx", "edx" );
-    switch( eReturnType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            ((long*)pRegisterReturn)[1] = edx;
-        case typelib_TypeClass_LONG:
-        case typelib_TypeClass_UNSIGNED_LONG:
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_ENUM:
-            ((long*)pRegisterReturn)[0] = eax;
-            break;
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-            *(unsigned short*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_BOOLEAN:
-        case typelib_TypeClass_BYTE:
-            *(unsigned char*)pRegisterReturn = eax;
-            break;
-        case typelib_TypeClass_FLOAT:
-            asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) );
-            break;
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx 
b/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx
deleted file mode 100644
index eab54c7b05d1..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/callvirtualmethod.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-
-#include <malloc.h>
-#include "sal/alloca.h"
-
-#include "sal/config.h"
-
-#include <cstring>
-
-
-#include "sal/types.h"
-#include "typelib/typeclass.h"
-#include "typelib/typedescription.h"
-
-namespace CPPU_CURRENT_NAMESPACE {
-
-void callVirtualMethod(
-    void * pAdjustedThisPtr,
-    sal_Int32 nVtableIndex,
-    void * pRegisterReturn,
-    typelib_TypeClass eReturnType,
-    sal_Int32 * pStackLongs,
-    sal_Int32 nStackLongs );
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
deleted file mode 100644
index 33687f1d0a02..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ /dev/null
@@ -1,520 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <sal/alloca.h>
-#include <strings.h>
-#include <typeinfo>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <sal/log.hxx>
-#include <uno/data.h>
-#include <typelib/typedescription.hxx>
-
-#include "bridge.hxx"
-#include "cppinterfaceproxy.hxx"
-#include "types.hxx"
-#include "vtablefactory.hxx"
-
-#include "share.hxx"
-
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-static typelib_TypeClass cpp2uno_call(
-    bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
-    const typelib_TypeDescription * pMemberTypeDescr,
-    typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void 
return
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    // pCallStack: ret, [return ptr], this, params
-    char * pCppStack = (char *)(pCallStack +1);
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    if (pReturnTypeRef)
-        TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
-    void * pUnoReturn = 0;
-    void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, 
reconversion need
-
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pUnoReturn = pRegisterReturn; // direct way for simple types
-        }
-        else // complex return via ptr (pCppReturn)
-        {
-            pCppReturn = *(void **)pCppStack;
-            pCppStack += sizeof(void *);
-
-            pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                              pReturnTypeDescr )
-                          ? alloca( pReturnTypeDescr->nSize )
-                          : pCppReturn); // direct way
-        }
-    }
-    // pop this
-    pCppStack += sizeof( void* );
-
-    // stack space
-    static_assert(sizeof(void *) == sizeof(sal_Int32), "### unexpected size!");
-    // parameters
-    void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-    void ** pCppArgs = pUnoArgs + nParams;
-    // indices of values this have to be converted (interface conversion 
cpp<=>uno)
-    sal_Int32 * pTempIndices = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription 
**)(pUnoArgs + (3 * nParams));
-
-    sal_Int32 nTempIndices   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut
-            && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-            // value
-        {
-            pCppArgs[nPos] = pCppStack;
-            pUnoArgs[nPos] = pCppStack;
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            pCppArgs[nPos] = *(void **)pCppStack;
-
-            if (! rParam.bIn) // is pure out
-            {
-                // uno out is unconstructed mem!
-                pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-                pTempIndices[nTempIndices] = nPos;
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                         pParamTypeDescr ))
-            {
-                uno_copyAndConvertData( pUnoArgs[nPos] = alloca( 
pParamTypeDescr->nSize ),
-                                        *(void **)pCppStack, pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-                pTempIndices[nTempIndices] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                pUnoArgs[nPos] = *(void **)pCppStack;
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    // ExceptionHolder
-    uno_Any aUnoExc; // Any will be constructed by callee
-    uno_Any * pUnoExc = &aUnoExc;
-
-    // invoke uno dispatch call
-    (*pThis->getUnoI()->pDispatcher)(
-        pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
-
-    // in case an exception occurred...
-    if (pUnoExc)
-    {
-        // destruct temporary in/inout params
-        for ( ; nTempIndices--; )
-        {
-            sal_Int32 nIndex = pTempIndices[nTempIndices];
-
-            if (pParams[nIndex].bIn) // is in/inout => was constructed
-                uno_destructData( pUnoArgs[nIndex], 
ppTempParamTypeDescr[nTempIndices], 0 );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndices] );
-        }
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-
-        CPPU_CURRENT_NAMESPACE::raiseException(
-            &aUnoExc, pThis->getBridge()->getUno2Cpp() );
-            // has to destruct the any
-        // is here for dummy
-        return typelib_TypeClass_VOID;
-    }
-    else // else no exception occurred...
-    {
-        // temporary params
-        for ( ; nTempIndices--; )
-        {
-            sal_Int32 nIndex = pTempIndices[nTempIndices];
-            typelib_TypeDescription * pParamTypeDescr = 
ppTempParamTypeDescr[nTempIndices];
-
-            if (pParams[nIndex].bOut) // inout/out
-            {
-                // convert and assign
-                uno_destructData( pCppArgs[nIndex], pParamTypeDescr, 
cpp_release );
-                uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], 
pParamTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-            }
-            // destroy temp uno param
-            uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return
-        if (pCppReturn) // has complex return
-        {
-            if (pUnoReturn != pCppReturn) // needs reconversion
-            {
-                uno_copyAndConvertData( pCppReturn, pUnoReturn, 
pReturnTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-                // destroy temp uno return
-                uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-            }
-            // complex return ptr is set to eax
-            *(void **)pRegisterReturn = pCppReturn;
-        }
-        if (pReturnTypeDescr)
-        {
-            typelib_TypeClass eRet = 
(typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-            return eRet;
-        }
-        else
-            return typelib_TypeClass_VOID;
-    }
-}
-
-
-static typelib_TypeClass cpp_mediate(
-    sal_Int32 nFunctionIndex,
-    sal_Int32 nVtableOffset,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    static_assert(sizeof(sal_Int32)==sizeof(void *), "### unexpected!");
-
-    // pCallStack: ret adr, [ret *], this, params
-    void * pThis;
-    if( nFunctionIndex & 0x80000000 )
-    {
-        nFunctionIndex &= 0x7fffffff;
-        pThis = pCallStack[2];
-    }
-    else
-    {
-        pThis = pCallStack[1];
-    }
-    pThis = static_cast< char * >(pThis) - nVtableOffset;
-    bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
-        = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
-            pThis);
-
-    typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
-    if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-    {
-        SAL_WARN(
-            "bridges",
-            "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
-                << " vtable index " << nFunctionIndex << "/"
-                << pTypeDescr->nMapFunctionIndexToMemberIndex);
-        throw RuntimeException(
-            ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
-             + " vtable index " + OUString::number(nFunctionIndex) + "/"
-             + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
-            (XInterface *)pThis);
-    }
-
-    // determine called method
-    sal_Int32 nMemberPos = 
pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
-    assert(nMemberPos < pTypeDescr->nAllMembers);
-
-    TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
-    typelib_TypeClass eRet;
-    switch (aMemberDescr.get()->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == 
nFunctionIndex)
-        {
-            // is GET method
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceAttributeTypeDescription 
*)aMemberDescr.get())->pAttributeTypeRef,
-                0, 0, // no params
-                pCallStack, pRegisterReturn );
-        }
-        else
-        {
-            // is SET method
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription 
*)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                0, // indicates void return
-                1, &aParam,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        // is METHOD
-        switch (nFunctionIndex)
-        {
-        case 1: // acquire()
-            pCppI->acquireProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 2: // release()
-            pCppI->releaseProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( 
pCallStack[3] )->getTypeLibType() );
-            if (pTD)
-            {
-                XInterface * pInterface = 0;
-                (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
-                    pCppI->getBridge()->getCppEnv(),
-                    (void **)&pInterface, pCppI->getOid().pData,
-                    (typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pCallStack[1] ),
-                        &pInterface, pTD, cpp_acquire );
-                    pInterface->release();
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *(void **)pRegisterReturn = pCallStack[1];
-                    eRet = typelib_TypeClass_ANY;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceMethodTypeDescription 
*)aMemberDescr.get())->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription 
*)aMemberDescr.get())->nParams,
-                ((typelib_InterfaceMethodTypeDescription 
*)aMemberDescr.get())->pParams,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    default:
-    {
-        throw RuntimeException( "no member description found!", (XInterface 
*)pThis );
-    }
-    }
-
-    return eRet;
-}
-
-/**
- * is called on incoming vtable calls
- * (called by asm snippets)
- */
-static void __attribute__((noinline,regparm(3))) cpp_vtable_call(
-    int nFunctionIndex, int nVtableOffset, void** pCallStack )
-{
-    volatile long nRegReturn[2];
-    typelib_TypeClass aType = cpp_mediate(
-        nFunctionIndex, nVtableOffset, pCallStack, (sal_Int64*)nRegReturn );
-
-    switch( aType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            __asm__( "movl %1, %%edx\n\t"
-                     "movl %0, %%eax\n"
-                     : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) );
-            break;
-        case typelib_TypeClass_FLOAT:
-            __asm__( "flds %0\n\t"
-                     "fstp %%st(0)\n\t"
-                     "flds %0\n"
-                     : : "m"(*(float *)nRegReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            __asm__( "fldl %0\n\t"
-                     "fstp %%st(0)\n\t"
-                     "fldl %0\n"
-                     : : "m"(*(double *)nRegReturn) );
-            break;
-//      case typelib_TypeClass_UNSIGNED_SHORT:
-//      case typelib_TypeClass_SHORT:
-//          __asm__( "movswl %0, %%eax\n"
-//                   : : "m"(nRegReturn) );
-//      break;
-        default:
-            __asm__( "movl %0, %%eax\n"
-                     : : "m"(nRegReturn[0]) );
-            break;
-    }
-}
-
-
-int const codeSnippetSize = 20;
-
-unsigned char * codeSnippet(
-    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-    bool simpleRetType)
-{
-    if (!simpleRetType) {
-        functionIndex |= 0x80000000;
-    }
-    unsigned char * p = code;
-    static_assert(sizeof (sal_Int32) == 4, "boo");
-    // mov function_index, %eax:
-    *p++ = 0xB8;
-    *reinterpret_cast< sal_Int32 * >(p) = functionIndex;
-    p += sizeof (sal_Int32);
-    // mov vtable_offset, %edx:
-    *p++ = 0xBA;
-    *reinterpret_cast< sal_Int32 * >(p) = vtableOffset;
-    p += sizeof (sal_Int32);
-    // mov %esp, %ecx:
-    *p++ = 0x89;
-    *p++ = 0xE1;
-    // jmp cpp_vtable_call:
-    *p++ = 0xE9;
-    *reinterpret_cast< sal_Int32 * >(p)
-        = ((unsigned char *) cpp_vtable_call) - p - sizeof (sal_Int32);
-    p += sizeof (sal_Int32);
-    assert(p - code <= codeSnippetSize);
-    return code + codeSnippetSize;
-}
-
-}
-
-struct bridges::cpp_uno::shared::VtableFactory::Slot { void const * fn; };
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
-{
-    return static_cast< Slot * >(block) + 2;
-}
-
-std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
-    sal_Int32 slotCount)
-{
-    return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
-}
-
-namespace {
-// Some dummy type whose RTTI is used in the synthesized proxy vtables to make 
uses of dynamic_cast
-// on such proxy objects not crash:
-struct ProxyRtti {};
-}
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::initializeBlock(
-    void * block, sal_Int32 slotCount, sal_Int32,
-    typelib_InterfaceTypeDescription *)
-{
-    Slot * slots = mapBlockToVtable(block);
-    slots[-2].fn = 0;
-    slots[-1].fn = &typeid(ProxyRtti);
-    return slots + slotCount;
-}
-
-unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
-    typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
-    sal_Int32 functionCount, sal_Int32 vtableOffset)
-{
-    (*slots) -= functionCount;
-    Slot * s = *slots;
-    for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-        typelib_TypeDescription * member = 0;
-        TYPELIB_DANGER_GET(&member, type->ppMembers[i]);
-        assert(member != 0);
-        switch (member->eTypeClass) {
-        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-            // Getter:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vtableOffset,
-                bridges::cpp_uno::shared::isSimpleType(
-                    reinterpret_cast<
-                    typelib_InterfaceAttributeTypeDescription * >(
-                        member)->pAttributeTypeRef));
-            // Setter:
-            if (!reinterpret_cast<
-                typelib_InterfaceAttributeTypeDescription * >(
-                    member)->bReadOnly)
-            {
-                (s++)->fn = code;
-                code = codeSnippet(code, functionOffset++, vtableOffset, true);
-            }
-            break;
-
-        case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vtableOffset,
-                bridges::cpp_uno::shared::isSimpleType(
-                    reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription * >(
-                        member)->pReturnTypeRef));
-            break;
-
-        default:
-            assert(false);
-            break;
-        }
-        TYPELIB_DANGER_RELEASE(member);
-    }
-    return code;
-}
-
-void bridges::cpp_uno::shared::VtableFactory::flushCode(
-    unsigned char const *, unsigned char const *)
-{}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx 
b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
deleted file mode 100644
index 1eb183aa7c1f..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ /dev/null
@@ -1,292 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <stdio.h>
-#include <strings.h>
-#include <dlfcn.h>
-#include <cxxabi.h>
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <sal/log.hxx>
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <typelib/typedescription.hxx>
-#include <uno/any2.h>
-#include <unordered_map>
-#include "share.hxx"
-
-
-using namespace ::std;
-using namespace ::osl;
-using namespace ::com::sun::star::uno;
-using namespace ::__cxxabiv1;
-
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * )
-{
-}
-
-static OUString toUNOname( char const * p )
-{
-#if OSL_DEBUG_LEVEL > 1
-    char const * start = p;
-#endif
-
-    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
-    OUStringBuffer buf( 64 );
-    assert( 'N' == *p );
-    ++p; // skip N
-
-    while ('E' != *p)
-    {
-        // read chars count
-        long n = (*p++ - '0');
-        while ('0' <= *p && '9' >= *p)
-        {
-            n *= 10;
-            n += (*p++ - '0');
-        }
-        buf.appendAscii( p, n );
-        p += n;
-        if ('E' != *p)
-            buf.append( '.' );
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-    OUString ret( buf.makeStringAndClear() );
-    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-    return ret;
-#else
-    return buf.makeStringAndClear();
-#endif
-}
-
-class RTTI
-{
-    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
-
-    Mutex m_mutex;
-    t_rtti_map m_rttis;
-    t_rtti_map m_generatedRttis;
-
-    void * m_hApp;
-
-public:
-    RTTI();
-    ~RTTI();
-
-    type_info * getRTTI( typelib_CompoundTypeDescription * );
-};
-
-RTTI::RTTI()
-    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-{
-}
-
-RTTI::~RTTI()
-{
-    dlclose( m_hApp );
-}
-
-
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
-{
-    type_info * rtti;
-
-    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
-    MutexGuard guard( m_mutex );
-    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-    if (iFind == m_rttis.end())
-    {
-        // RTTI symbol
-        OStringBuffer buf( 64 );
-        buf.append( "_ZTIN" );
-        sal_Int32 index = 0;
-        do
-        {
-            OUString token( unoName.getToken( 0, '.', index ) );
-            buf.append( token.getLength() );
-            OString c_token( OUStringToOString( token, 
RTL_TEXTENCODING_ASCII_US ) );
-            buf.append( c_token );
-        }
-        while (index >= 0);
-        buf.append( 'E' );
-
-        OString symName( buf.makeStringAndClear() );
-        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-
-        if (rtti)
-        {
-            pair< t_rtti_map::iterator, bool > insertion(
-                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-            assert(insertion.second && "### inserting new rtti failed?!");
-        }
-        else
-        {
-            // try to lookup the symbol in the generated rtti map
-            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) 
);
-            if (iFind == m_generatedRttis.end())
-            {
-                // we must generate it !
-                // symbol and rtti-name is nearly identical,
-                // the symbol is prefixed with _ZTI
-                char const * rttiName = symName.getStr() +4;
-#if OSL_DEBUG_LEVEL > 1
-                fprintf( stderr,"generated rtti for %s\n", rttiName );
-#endif
-                if (pTypeDescr->pBaseTypeDescription)
-                {
-                    // ensure availability of base
-                    type_info * base_rtti = getRTTI(
-                        (typelib_CompoundTypeDescription 
*)pTypeDescr->pBaseTypeDescription );
-                    rtti = new __si_class_type_info(
-                        strdup( rttiName ), (__class_type_info *)base_rtti );
-                }
-                else
-                {
-                    // this class has no base class
-                    rtti = new __class_type_info( strdup( rttiName ) );
-                }
-
-                pair< t_rtti_map::iterator, bool > insertion(
-                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, 
rtti ) ) );
-                assert(insertion.second && "### inserting new generated rtti 
failed?!");
-            }
-            else // taking already generated rtti
-            {
-                rtti = iFind->second;
-            }
-        }
-    }
-    else
-    {
-        rtti = iFind->second;
-    }
-
-    return rtti;
-}
-
-
-static void deleteException( void * pExc )
-{
-    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-    typelib_TypeDescription * pTD = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-    assert(pTD && "### unknown exception type! leaving out destruction => 
leaking!!!");
-    if (pTD)
-    {
-        ::uno_destructData( pExc, pTD, cpp_release );
-        ::typelib_typedescription_release( pTD );
-    }
-}
-
-void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-{
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr(
-        OUStringToOString(
-            OUString::unacquired( &pUnoExc->pType->pTypeName ),
-            RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
-#endif
-    void * pCppExc;
-    type_info * rtti;
-
-    {
-    // construct cpp exception object
-    typelib_TypeDescription * pTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-    assert(pTypeDescr);
-    if (! pTypeDescr)
-    {
-        throw RuntimeException(
-            OUString("cannot get typedescription for type ") +
-            OUString::unacquired( &pUnoExc->pType->pTypeName ) );
-    }
-
-    pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-    ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
-    // destruct uno exception
-    ::uno_any_destruct( pUnoExc, 0 );
-    // avoiding locked counts
-    static RTTI rtti_data;
-    rtti = 
(type_info*)rtti_data.getRTTI((typelib_CompoundTypeDescription*)pTypeDescr);
-    TYPELIB_DANGER_RELEASE( pTypeDescr );
-    assert(rtti);
-    if (! rtti)
-    {
-        throw RuntimeException(
-            OUString("no rtti for type ") +
-            OUString::unacquired( &pUnoExc->pType->pTypeName ) );
-    }
-    }
-
-    __cxa_throw( pCppExc, rtti, deleteException );
-}
-
-void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno)
-{
-    __cxa_exception * header = __cxa_get_globals()->caughtExceptions;
-    if (! header)
-    {
-        RuntimeException aRE( "no exception header!" );
-        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, 
rType.getTypeLibType(), pCpp2Uno );
-        SAL_WARN("bridges", aRE.Message);
-        return;
-    }
-
-    std::type_info *exceptionType = __cxa_current_exception_type();
-
-    typelib_TypeDescription * pExcTypeDescr = 0;
-    OUString unoName( toUNOname( exceptionType->name() ) );
-#if OSL_DEBUG_LEVEL > 1
-    OString cstr_unoName( OUStringToOString( unoName, 
RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
-#endif
-    typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-    if (0 == pExcTypeDescr)
-    {
-        RuntimeException aRE( OUString("exception type not found: ") + unoName 
);
-        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, 
rType.getTypeLibType(), pCpp2Uno );
-        SAL_WARN("bridges", aRE.Message);
-    }
-    else
-    {
-        // construct uno exception any
-        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, 
pExcTypeDescr, pCpp2Uno );
-        typelib_typedescription_release( pExcTypeDescr );
-    }
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx 
b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
deleted file mode 100644
index de13a4f9b582..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#pragma once
-
-#include "uno/mapping.h"
-
-#include <typeinfo>
-#include <exception>
-#include <cstddef>
-
-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__));
-
-struct __cxa_exception
-{
-    std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
-    void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
-    std::terminate_handler terminateHandler;
-
-    __cxa_exception *nextException;
-
-    int handlerCount;
-
-    int handlerSwitchValue;
-    const unsigned char *actionRecord;
-    const unsigned char *languageSpecificData;
-    void *catchTemp;
-    void *adjustedPtr;
-
-    _Unwind_Exception unwindHeader;
-};
-
-extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) 
__attribute__((noreturn));
-
-struct __cxa_eh_globals
-{
-    __cxa_exception *caughtExceptions;
-    unsigned int uncaughtExceptions;
-};
-extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-extern "C" std::type_info *__cxa_current_exception_type() throw();
-
-void raiseException(
-    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-
-void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
deleted file mode 100644
index cd0bd2c743c6..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx
+++ /dev/null
@@ -1,356 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/config.h>
-
-#include <exception>
-#include <typeinfo>
-
-#include <malloc.h>
-#include <sal/alloca.h>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include <com/sun/star/uno/Exception.hpp>
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include <o3tl/runtimetooustring.hxx>
-#include <uno/data.h>
-
-#include "bridge.hxx"
-#include "types.hxx"
-#include "unointerfaceproxy.hxx"
-#include "vtables.hxx"
-
-#include "share.hxx"
-
-#include "callvirtualmethod.hxx"
-
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-static void cpp_call(
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
-    bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-    typelib_TypeDescriptionReference * pReturnTypeRef,
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-{
-      // max space for: [complex ret ptr], values|ptr ...
-      char * pCppStack      =
-          (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * 
sizeof(sal_Int64)) );
-      char * pCppStackStart = pCppStack;
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-    assert(pReturnTypeDescr);
-
-    void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pCppReturn = pUnoReturn; // direct way for simple types
-        }
-        else
-        {
-            // complex return via ptr
-            pCppReturn = *(void **)pCppStack
-                = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                       pReturnTypeDescr )
-                   ? alloca( pReturnTypeDescr->nSize )
-                   : pUnoReturn); // direct way
-            pCppStack += sizeof(void *);
-        }
-    }
-    // push this
-    void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI())
-        + aVtableSlot.offset;
-    *(void**)pCppStack = pAdjustedThisPtr;
-    pCppStack += sizeof( void* );
-
-    // stack space
-    static_assert(sizeof(void *) == sizeof(sal_Int32), "### unexpected size!");
-    // args
-    void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-    // indices of values this have to be converted (interface conversion 
cpp<=>uno)
-    sal_Int32 * pTempIndices = (sal_Int32 *)(pCppArgs + nParams);
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription 
**)(pCppArgs + (2 * nParams));
-
-    sal_Int32 nTempIndices   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-        if (!rParam.bOut
-            && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
-        {
-            uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, 
pUnoArgs[nPos], pParamTypeDescr,
-                                    pThis->getBridge()->getUno2Cpp() );
-
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                pCppStack += sizeof(sal_Int32); // extra long
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            if (! rParam.bIn) // is pure out
-            {
-                // cpp out is constructed mem, uno out is not!
-                uno_constructData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( 
pParamTypeDescr->nSize ),
-                    pParamTypeDescr );
-                pTempIndices[nTempIndices] = nPos; // default constructed for 
cpp call
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                         pParamTypeDescr ))
-            {
-                uno_copyAndConvertData(
-                    *(void **)pCppStack = pCppArgs[nPos] = alloca( 
pParamTypeDescr->nSize ),
-                    pUnoArgs[nPos], pParamTypeDescr,
-                    pThis->getBridge()->getUno2Cpp() );
-
-                pTempIndices[nTempIndices] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    try
-    {
-        assert( !( (pCppStack - pCppStackStart ) & 3) && "UNALIGNED STACK !!! 
(Please DO panic)");
-        try {
-            CPPU_CURRENT_NAMESPACE::callVirtualMethod(
-                pAdjustedThisPtr, aVtableSlot.index,
-                pCppReturn, pReturnTypeDescr->eTypeClass,
-                (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / 
sizeof(sal_Int32) );
-        } catch (css::uno::Exception &) {
-            throw;
-        } catch (std::exception & e) {
-            throw css::uno::RuntimeException(
-                "C++ code threw " + o3tl::runtimeToOUString(typeid(e).name()) 
+ ": "
-                + o3tl::runtimeToOUString(e.what()));
-        } catch (...) {
-            throw css::uno::RuntimeException("C++ code threw unknown 
exception");
-        }
-        // NO exception occurred...
-        *ppUnoExc = 0;
-
-        // reconvert temporary params
-        for ( ; nTempIndices--; )
-        {
-            sal_Int32 nIndex = pTempIndices[nTempIndices];
-            typelib_TypeDescription * pParamTypeDescr = 
ppTempParamTypeDescr[nTempIndices];
-
-            if (pParams[nIndex].bIn)
-            {
-                if (pParams[nIndex].bOut) // inout
-                {
-                    uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); 
// destroy uno value
-                    uno_copyAndConvertData( pUnoArgs[nIndex], 
pCppArgs[nIndex], pParamTypeDescr,
-                                            pThis->getBridge()->getCpp2Uno() );
-                }
-            }
-            else // pure out
-            {
-                uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], 
pParamTypeDescr,
-                                        pThis->getBridge()->getCpp2Uno() );
-            }
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return value
-        if (pCppReturn && pUnoReturn != pCppReturn)
-        {
-            uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
-                                    pThis->getBridge()->getCpp2Uno() );
-            uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
-        }
-    }
-    catch (...)
-    {
-        // fill uno exception
-        CPPU_CURRENT_NAMESPACE::fillUnoException(*ppUnoExc, 
pThis->getBridge()->getCpp2Uno());
-
-        // temporary params
-        for ( ; nTempIndices--; )
-        {
-            sal_Int32 nIndex = pTempIndices[nTempIndices];
-            // destroy temp cpp param => cpp: every param was constructed
-            uno_destructData( pCppArgs[nIndex], 
ppTempParamTypeDescr[nTempIndices], cpp_release );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndices] );
-        }
-        // return type
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-    }
-}
-
-}
-
-namespace bridges::cpp_uno::shared {
-
-void unoInterfaceProxyDispatch(
-    uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
-    void * pReturn, void * pArgs[], uno_Any ** ppException )
-{
-    // is my surrogate
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
-        = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
-
-    switch (pMemberDescr->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        VtableSlot aVtableSlot(
-            getVtableSlot(
-                reinterpret_cast<
-                    typelib_InterfaceAttributeTypeDescription const * >(
-                        pMemberDescr)));
-        if (pReturn)
-        {
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceAttributeTypeDescription 
*)pMemberDescr)->pAttributeTypeRef,
-                0, 0, // no params
-                pReturn, pArgs, ppException );
-        }
-        else
-        {
-            // is SET
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription 
*)pMemberDescr)->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            typelib_TypeDescriptionReference * pReturnTypeRef = 0;
-            OUString aVoidName("void");
-            typelib_typedescriptionreference_new(
-                &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
-
-            // dependent dispatch
-            aVtableSlot.index += 1; // get, then set method
-            cpp_call(
-                pThis, aVtableSlot,
-                pReturnTypeRef,
-                1, &aParam,
-                pReturn, pArgs, ppException );
-
-            typelib_typedescriptionreference_release( pReturnTypeRef );
-        }
-
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        VtableSlot aVtableSlot(
-            getVtableSlot(
-                reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription const * >(
-                        pMemberDescr)));
-        switch (aVtableSlot.index)
-        {
-            // standard calls
-        case 1: // acquire uno interface
-            (*pUnoI->acquire)( pUnoI );
-            *ppException = 0;
-            break;
-        case 2: // release uno interface
-            (*pUnoI->release)( pUnoI );
-            *ppException = 0;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] 
)->getTypeLibType() );
-            if (pTD)
-            {
-                uno_Interface * pInterface = 0;
-                (*pThis->pBridge->getUnoEnv()->getRegisteredInterface)(
-                    pThis->pBridge->getUnoEnv(),
-                    (void **)&pInterface, pThis->oid.pData, 
(typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pReturn ),
-                        &pInterface, pTD, 0 );
-                    (*pInterface->release)( pInterface );
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *ppException = 0;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            // dependent dispatch
-            cpp_call(
-                pThis, aVtableSlot,
-                ((typelib_InterfaceMethodTypeDescription 
*)pMemberDescr)->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription 
*)pMemberDescr)->nParams,
-                ((typelib_InterfaceMethodTypeDescription 
*)pMemberDescr)->pParams,
-                pReturn, pArgs, ppException );
-        }
-        break;
-    }
-    default:
-    {
-        ::com::sun::star::uno::RuntimeException aExc(
-            "illegal member type description!",
-            ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface >() );
-
-        Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
-        // binary identical null reference
-        ::uno_type_any_construct( *ppException, &aExc, 
rExcType.getTypeLibType(), 0 );
-    }
-    }
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
deleted file mode 100644
index 55c1360f844e..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ /dev/null
@@ -1,569 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/config.h>
-
-#include <typeinfo>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include <sal/log.hxx>
-#include <typelib/typedescription.hxx>
-#include <uno/data.h>
-#include "bridge.hxx"
-#include "cppinterfaceproxy.hxx"
-#include "types.hxx"
-#include "vtablefactory.hxx"
-#include "share.hxx"
-#include <sal/alloca.h>
-
-using namespace com::sun::star::uno;
-
-namespace
-{
-
-static typelib_TypeClass cpp2uno_call(
-     bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
-    const typelib_TypeDescription * pMemberTypeDescr,
-    typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void 
return
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    // pCallStack: [ret ptr], this, params
-    char * pCppStack = (char *)pCallStack;
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    if (pReturnTypeRef)
-        TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-
-    void * pUnoReturn = 0;
-    void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, 
reconversion need
-
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-            pUnoReturn = pRegisterReturn; // direct way for simple types
-        else // complex return via ptr (pCppReturn)
-        {
-            pCppReturn = *(void**)pCppStack;
-            pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType(
-                                   pReturnTypeDescr )
-                          ? alloca( pReturnTypeDescr->nSize )
-                          : pCppReturn); // direct way
-            pCppStack += sizeof( void* );
-        }
-    }
-    // pop this
-    pCppStack += sizeof( void* );
-
-    // stack space
-    static_assert(sizeof(void *) == sizeof(sal_Int32), "### unexpected size!");
-    // parameters
-    void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-    void ** pCppArgs = pUnoArgs + nParams;
-    // indices of values this have to be converted (interface conversion 
cpp<=>uno)
-    sal_Int32 * pTempIndices = (sal_Int32 *)(pUnoArgs + (2 * nParams));
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription 
**)(pUnoArgs + (3 * nParams));
-
-    sal_Int32 nTempIndices   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-
-         if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( 
pParamTypeDescr ))  // value
-        {
-            pCppArgs[nPos] = pUnoArgs[nPos] = 
CPPU_CURRENT_NAMESPACE::adjustPointer(pCppStack, pParamTypeDescr);
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-                    case typelib_TypeClass_DOUBLE:
-                    {
-            if ((reinterpret_cast< long >(pCppStack) & 7) != 0)
-                      {
-                   static_assert(sizeof (double) == sizeof (sal_Int64), "boo");
-                           void * pDest = alloca( sizeof (sal_Int64) );
-                           *reinterpret_cast< sal_Int32 * >(pDest) =
-                           *reinterpret_cast< sal_Int32 const * >(pCppStack);
-                           *(reinterpret_cast< sal_Int32 * >(pDest) + 1) =
-                           *(reinterpret_cast< sal_Int32 const * >(pCppStack) 
+ 1);
-                           pCppArgs[nPos] = pUnoArgs[nPos] = pDest;
-            }
-               pCppStack += sizeof (sal_Int32); // extra long
-                       break;
-            }
-            }
-            // no longer needed
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        else // ptr to complex value | ref
-        {
-            pCppArgs[nPos] = *(void **)pCppStack;
-
-            if (! rParam.bIn) // is pure out
-            {
-                // uno out is unconstructed mem!
-                pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
-                pTempIndices[nTempIndices] = nPos;
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr;
-            }
-            // is in/inout
-            else if (bridges::cpp_uno::shared::relatesToInterfaceType(
-                              pParamTypeDescr ))
-            {
-                uno_copyAndConvertData( pUnoArgs[nPos] = alloca( 
pParamTypeDescr->nSize ),
-                                        *(void **)pCppStack, pParamTypeDescr,
-                                          pThis->getBridge()->getCpp2Uno() );
-                pTempIndices[nTempIndices] = nPos; // has to be reconverted
-                // will be released at reconversion
-                ppTempParamTypeDescr[nTempIndices++] = pParamTypeDescr;
-            }
-            else // direct way
-            {
-                pUnoArgs[nPos] = *(void **)pCppStack;
-                // no longer needed
-                TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-            }
-        }
-        pCppStack += sizeof(sal_Int32); // standard parameter length
-    }
-
-    // ExceptionHolder
-    uno_Any aUnoExc; // Any will be constructed by callee
-    uno_Any * pUnoExc = &aUnoExc;
-
-    // invoke uno dispatch call
-    (*pThis->getUnoI()->pDispatcher)(pThis->getUnoI(), pMemberTypeDescr, 
pUnoReturn, pUnoArgs, &pUnoExc );
-
-    // in case an exception occurred...
-    if (pUnoExc)
-    {
-        // destruct temporary in/inout params
-        for ( ; nTempIndices--; )
-        {
-            sal_Int32 nIndex = pTempIndices[nTempIndices];
-
-            if (pParams[nIndex].bIn) // is in/inout => was constructed
-                uno_destructData( pUnoArgs[nIndex], 
ppTempParamTypeDescr[nTempIndices], 0 );
-            TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndices] );
-        }
-        if (pReturnTypeDescr)
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-        CPPU_CURRENT_NAMESPACE::raiseException(&aUnoExc, 
pThis->getBridge()->getUno2Cpp() );
-                 // has to destruct the any
-        // is here for dummy
-        return typelib_TypeClass_VOID;
-    }
-    else // else no exception occurred...
-    {
-        // temporary params
-        for ( ; nTempIndices--; )
-        {
-            sal_Int32 nIndex = pTempIndices[nTempIndices];
-            typelib_TypeDescription * pParamTypeDescr = 
ppTempParamTypeDescr[nTempIndices];
-
-            if (pParams[nIndex].bOut) // inout/out
-            {
-                // convert and assign
-                uno_destructData( pCppArgs[nIndex], pParamTypeDescr, 
cpp_release );
-                uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], 
pParamTypeDescr,
-                                    pThis->getBridge()->getUno2Cpp() );
-            }
-            // destroy temp uno param
-            uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
-
-            TYPELIB_DANGER_RELEASE( pParamTypeDescr );
-        }
-        // return
-        if (pCppReturn) // has complex return
-        {
-            if (pUnoReturn != pCppReturn) // needs reconversion
-            {
-                uno_copyAndConvertData( pCppReturn, pUnoReturn, 
pReturnTypeDescr,
-                                        pThis->getBridge()->getUno2Cpp() );
-                // destroy temp uno return
-                uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
-            }
-            // complex return ptr is set to eax
-            *(void **)pRegisterReturn = pCppReturn;
-        }
-        if (pReturnTypeDescr)
-        {
-            typelib_TypeClass eRet = 
(typelib_TypeClass)pReturnTypeDescr->eTypeClass;
-            TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
-            return eRet;
-        }
-        else
-            return typelib_TypeClass_VOID;
-    }
-}
-
-
-static typelib_TypeClass cpp_mediate(
-    sal_Int32   nFunctionIndex,
-    sal_Int32   nVtableOffset,
-    void ** pCallStack,
-    sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-    static_assert( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" );
-
-    // pCallStack: this, params
-    // eventual [ret*] lies at pCallStack -1
-    // so count down pCallStack by one to keep it simple
-    // pCallStack: this, params
-    // eventual [ret*] lies at pCallStack -1
-    // so count down pCallStack by one to keep it simple
-    bridges::cpp_uno::shared::CppInterfaceProxy * pCppI
-        = bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy(
-    static_cast< char * >(*pCallStack) - nVtableOffset);
-    if ((nFunctionIndex & 0x80000000) != 0) {
-        nFunctionIndex &= 0x7FFFFFFF;
-        --pCallStack;
-    }
-
-    typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
-
-    if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
-    {
-        SAL_WARN(
-            "bridges",
-            "illegal " << OUString::unacquired(&pTypeDescr->aBase.pTypeName)
-                << " vtable index " << nFunctionIndex << "/"
-                << pTypeDescr->nMapFunctionIndexToMemberIndex);
-        throw RuntimeException(
-            ("illegal " + OUString::unacquired(&pTypeDescr->aBase.pTypeName)
-             + " vtable index " + OUString::number(nFunctionIndex) + "/"
-             + OUString::number(pTypeDescr->nMapFunctionIndexToMemberIndex)),
-            (XInterface *)pCppI);
-    }
-
-    // determine called method
-    sal_Int32 nMemberPos = 
pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
-    assert(nMemberPos < pTypeDescr->nAllMembers);
-
-    TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
-
-#if defined BRIDGES_DEBUG
-    OString cstr( OUStringToOString( aMemberDescr.get()->pTypeName, 
RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "calling %s, nFunctionIndex=%d\n", cstr.getStr(), 
nFunctionIndex );
-#endif
-
-    typelib_TypeClass eRet;
-    switch (aMemberDescr.get()->eTypeClass)
-    {
-    case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-    {
-        if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == 
nFunctionIndex)
-        {
-            // is GET method
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceAttributeTypeDescription 
*)aMemberDescr.get())->pAttributeTypeRef,
-                0, 0, // no params
-                pCallStack, pRegisterReturn );
-        }
-        else
-        {
-            // is SET method
-            typelib_MethodParameter aParam;
-            aParam.pTypeRef =
-                ((typelib_InterfaceAttributeTypeDescription 
*)aMemberDescr.get())->pAttributeTypeRef;
-            aParam.bIn      = sal_True;
-            aParam.bOut     = sal_False;
-
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                0, // indicates void return
-                1, &aParam,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    case typelib_TypeClass_INTERFACE_METHOD:
-    {
-        // is METHOD
-        switch (nFunctionIndex)
-        {
-        case 1: // acquire()
-            pCppI->acquireProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 2: // release()
-            pCppI->releaseProxy(); // non virtual call!
-            eRet = typelib_TypeClass_VOID;
-            break;
-        case 0: // queryInterface() opt
-        {
-            typelib_TypeDescription * pTD = 0;
-            TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( 
pCallStack[2] )->getTypeLibType() );
-            if (pTD)
-            {
-                XInterface * pInterface = 0;
-        (*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)(
-            pCppI->getBridge()->getCppEnv(),
-            (void **)&pInterface, pCppI->getOid().pData, 
(typelib_InterfaceTypeDescription *)pTD );
-
-                if (pInterface)
-                {
-                    ::uno_any_construct(
-                        reinterpret_cast< uno_Any * >( pCallStack[0] ),
-                        &pInterface, pTD, cpp_acquire );
-                    pInterface->release();
-                    TYPELIB_DANGER_RELEASE( pTD );
-                    *(void **)pRegisterReturn = pCallStack[0];
-                    eRet = typelib_TypeClass_ANY;
-                    break;
-                }
-                TYPELIB_DANGER_RELEASE( pTD );
-            }
-        } // else perform queryInterface()
-        default:
-            eRet = cpp2uno_call(
-                pCppI, aMemberDescr.get(),
-                ((typelib_InterfaceMethodTypeDescription 
*)aMemberDescr.get())->pReturnTypeRef,
-                ((typelib_InterfaceMethodTypeDescription 
*)aMemberDescr.get())->nParams,
-                ((typelib_InterfaceMethodTypeDescription 
*)aMemberDescr.get())->pParams,
-                pCallStack, pRegisterReturn );
-        }
-        break;
-    }
-    default:
-    {
-        throw RuntimeException("no member description found!", (XInterface 
*)pCppI );
-    }
-    }
-    return eRet;
-}
-
-
-/**
- * is called on incoming vtable calls
- * (called by asm snippets)
- */
-static void cpp_vtable_call()
-{
-    volatile sal_Int64 nRegReturn;
-    int nFunctionIndex;
-    void** pCallStack;
-    int vTableOffset;
-
-    __asm__( "st %%i0, %0\n\t"
-            "st %%i1, %1\n\t"
-             "st %%i2, %2\n\t"
-            : : "m"(nFunctionIndex), "m"(pCallStack), "m"(vTableOffset) );
-
-//  fprintf(stderr,"cpp_mediate nFunctionIndex=%x\n",nFunctionIndex);
-//  fflush(stderr);
-
-    sal_Bool bComplex = (nFunctionIndex & 0x80000000) ? sal_True : sal_False;
-    typelib_TypeClass aType =
-        cpp_mediate( nFunctionIndex, vTableOffset, pCallStack+17, 
(sal_Int64*)&nRegReturn );
-
-    switch( aType )
-    {
-        case typelib_TypeClass_BOOLEAN:
-        case typelib_TypeClass_BYTE:
-            __asm__( "ld %0, %%l0\n\t"
-                     "ldsb [%%l0], %%i0\n"
-                     : : "m"(&nRegReturn) );
-            break;
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-            __asm__( "ld %0, %%l0\n\t"
-                     "ldsh [%%l0], %%i0\n"
-                     : : "m"(&nRegReturn) );
-            break;
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-
-            __asm__( "ld %0, %%l0\n\t"
-                     "ld [%%l0], %%i0\n\t"
-                     "ld %1, %%l0\n\t"
-                     "ld [%%l0], %%i1\n\t"
-                     : : "m"(&nRegReturn), "m"(((long*)&nRegReturn) +1) );
-
-            break;
-        case typelib_TypeClass_FLOAT:
-            __asm__( "ld %0, %%l0\n\t"
-                     "ld [%%l0], %%f0\n"
-                     : : "m"(&nRegReturn) );
-            break;
-        case typelib_TypeClass_DOUBLE:
-            __asm__( "ld %0, %%l0\n\t"
-                     "ldd [%%l0], %%f0\n"
-                     : : "m"(&nRegReturn) );
-            break;
-        case typelib_TypeClass_VOID:
-            break;
-        default:
-            __asm__( "ld %0, %%l0\n\t"
-                     "ld [%%l0], %%i0\n"
-                     : : "m"(&nRegReturn) );
-            break;
-    }
-
-    if( bComplex )
-    {
-        __asm__( "add %i7, 4, %i7\n\t" );
-        // after call to complex return valued function there is an unimp 
instruction
-    }
-
-}
-
-
-int const codeSnippetSize = 56;
-unsigned char * codeSnippet(
-    unsigned char * code, sal_Int32 functionIndex, sal_Int32 vtableOffset,
-    bool simpleRetType)
-{
-    sal_uInt32 index = functionIndex;
-    if (!simpleRetType) {
-        index |= 0x80000000;
-    }
-    unsigned int * p = reinterpret_cast< unsigned int * >(code);
-    static_assert(sizeof (unsigned int) == 4);
-    // st %o0, [%sp+68]:
-    *p++ = 0xD023A044;
-    // st %o1, [%sp+72]:
-    *p++ = 0xD223A048;
-    // st %o2, [%sp+76]:
-    *p++ = 0xD423A04C;
-    // st %o3, [%sp+80]:
-    *p++ = 0xD623A050;
-    // st %o4, [%sp+84]:
-    *p++ = 0xD823A054;
-    // st %o5, [%sp+88]:
-    *p++ = 0xDA23A058;
-    // sethi %hi(index), %o0:
-    *p++ = 0x11000000 | (index >> 10);
-    // or %o0, %lo(index), %o0:
-    *p++ = 0x90122000 | (index & 0x3FF);
-    // sethi %hi(vtableOffset), %o2:
-    *p++ = 0x15000000 | (vtableOffset >> 10);
-    // or %o2, %lo(vtableOffset), %o2:
-    *p++ = 0x9412A000 | (vtableOffset & 0x3FF);
-    // sethi %hi(cpp_vtable_call), %o3:
-    *p++ = 0x17000000 | (reinterpret_cast< unsigned int >(cpp_vtable_call) >> 
10);
-    // or %o3, %lo(cpp_vtable_call), %o3:
-    *p++ = 0x9612E000 | (reinterpret_cast< unsigned int >(cpp_vtable_call) & 
0x3FF);
-    // jmpl %o3, %g0:
-    *p++ = 0x81C2C000;
-    // mov %sp, %o1:
-    *p++ = 0x9210000E;
-    assert(reinterpret_cast< unsigned char * >(p) - code <= codeSnippetSize);
-    return code + codeSnippetSize;
-}
-
-} //end of namespace
-
-struct bridges::cpp_uno::shared::VtableFactory::Slot { void const * fn; };
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
-{
-    return static_cast< Slot * >(block) + 2;
-}
-
-std::size_t bridges::cpp_uno::shared::VtableFactory::getBlockSize(
-    sal_Int32 slotCount)
-{
-    return (slotCount + 2) * sizeof (Slot) + slotCount * codeSnippetSize;
-}
-
-namespace {
-// Some dummy type whose RTTI is used in the synthesized proxy vtables to make 
uses of dynamic_cast
-// on such proxy objects not crash:
-struct ProxyRtti {};
-}
-
-bridges::cpp_uno::shared::VtableFactory::Slot *
-bridges::cpp_uno::shared::VtableFactory::initializeBlock(
-    void * block, sal_Int32 slotCount, sal_Int32,
-    typelib_InterfaceTypeDescription *)
-{
-    Slot * slots = mapBlockToVtable(block);
-    slots[-2].fn = 0; //null
-    slots[-1].fn = &typeid(ProxyRtti);
-    return slots + slotCount;
-}
-
-unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
-    Slot ** slots, unsigned char * code,
-    typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
-    sal_Int32 functionCount, sal_Int32 vTableOffset)
-{
-    (*slots) -= functionCount;
-    Slot * s = *slots;
-    for (sal_Int32 i = 0; i < type->nMembers; ++i) {
-        typelib_TypeDescription * member = 0;
-        TYPELIB_DANGER_GET(&member, type->ppMembers[i]);
-        assert(member != 0);
-        switch (member->eTypeClass) {
-        case typelib_TypeClass_INTERFACE_ATTRIBUTE:
-            // Getter:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vTableOffset,
-                bridges::cpp_uno::shared::isSimpleType(
-                    reinterpret_cast<
-            typelib_InterfaceAttributeTypeDescription * >(
-            member)->pAttributeTypeRef));
-            // Setter:
-            if (!reinterpret_cast<
-                typelib_InterfaceAttributeTypeDescription * >(
-                    member)->bReadOnly)
-            {
-                (s++)->fn = code;
-                code = codeSnippet(code, functionOffset++, vTableOffset, true);
-            }
-            break;
-
-        case typelib_TypeClass_INTERFACE_METHOD:
-            (s++)->fn = code;
-            code = codeSnippet(
-                code, functionOffset++, vTableOffset,
-                bridges::cpp_uno::shared::isSimpleType(
-                    reinterpret_cast<
-                    typelib_InterfaceMethodTypeDescription * >(
-                        member)->pReturnTypeRef));
-            break;
-
-        default:
-            assert(false);
-            break;
-        }
-        TYPELIB_DANGER_RELEASE(member);
-    }
-    return code;
-}
-
-void bridges::cpp_uno::shared::VtableFactory::flushCode(
-       unsigned char const *, unsigned char const *)
-      {
-        //TODO: IZ 25819  flush the instruction cache (there probably is OS 
support for this)
-    }
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx 
b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
deleted file mode 100644
index 752b03e619f5..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <stdio.h>
-#include <dlfcn.h>
-#include <cxxabi.h>
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <sal/log.hxx>
-#include <osl/mutex.hxx>
-
-#include <com/sun/star/uno/genfunc.hxx>
-#include <typelib/typedescription.hxx>
-#include <uno/any2.h>
-#include <unordered_map>
-#include "share.hxx"
-
-
-using namespace ::std;
-using namespace ::osl;
-using namespace ::com::sun::star::uno;
-using namespace ::__cxxabiv1;
-
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-
-void dummy_can_throw_anything( char const * )
-{
-}
-
-static OUString toUNOname( char const * p )
-{
-#if defined BRIDGES_DEBUG
-    char const * start = p;
-#endif
-
-    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
-
-    OUStringBuffer buf( 64 );
-    assert( 'N' == *p );
-    ++p; // skip N
-
-    while ('E' != *p)
-    {
-        // read chars count
-        long n = (*p++ - '0');
-        while ('0' <= *p && '9' >= *p)
-        {
-            n *= 10;
-            n += (*p++ - '0');
-        }
-        buf.appendAscii( p, n );
-        p += n;
-        if ('E' != *p)
-            buf.append( '.' );
-    }
-
-#if defined BRIDGES_DEBUG
-    OUString ret( buf.makeStringAndClear() );
-    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
-    return ret;
-#else
-    return buf.makeStringAndClear();
-#endif
-}
-
-class RTTI
-{
-    typedef std::unordered_map< OUString, type_info * > t_rtti_map;
-
-    Mutex m_mutex;
-    t_rtti_map m_rttis;
-    t_rtti_map m_generatedRttis;
-
-    void * m_hApp;
-
-public:
-    RTTI();
-    ~RTTI();
-
-    type_info * getRTTI( typelib_CompoundTypeDescription * );
-};
-
-RTTI::RTTI()
-    : m_hApp( dlopen( 0, RTLD_LAZY ) )
-{
-}
-
-RTTI::~RTTI()
-{
-    dlclose( m_hApp );
-}
-
-
-type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr )
-{
-    type_info * rtti;
-
-    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
-
-    MutexGuard guard( m_mutex );
-    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
-    if (iFind == m_rttis.end())
-    {
-        // RTTI symbol
-        OStringBuffer buf( 64 );
-        buf.append( "_ZTIN" );
-        sal_Int32 index = 0;
-        do
-        {
-            OUString token( unoName.getToken( 0, '.', index ) );
-            buf.append( token.getLength() );
-            OString c_token( OUStringToOString( token, 
RTL_TEXTENCODING_ASCII_US ) );
-            buf.append( c_token );
-        }
-        while (index >= 0);
-        buf.append( 'E' );
-
-        OString symName( buf.makeStringAndClear() );
-        rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
-
-        if (rtti)
-        {
-            pair< t_rtti_map::iterator, bool > insertion(
-                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
-            assert(insertion.second && "### inserting new rtti failed?!");
-        }
-        else
-        {
-            // try to lookup the symbol in the generated rtti map
-            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) 
);
-            if (iFind == m_generatedRttis.end())
-            {
-                // we must generate it !
-                // symbol and rtti-name is nearly identical,
-                // the symbol is prefixed with _ZTI
-                char const * rttiName = symName.getStr() +4;
-#if defined BRIDGES_DEBUG
-                fprintf( stderr,"generated rtti for %s\n", rttiName );
-#endif
-                if (pTypeDescr->pBaseTypeDescription)
-                {
-                    // ensure availability of base
-                    type_info * base_rtti = getRTTI(
-                        (typelib_CompoundTypeDescription 
*)pTypeDescr->pBaseTypeDescription );
-                    rtti = new __si_class_type_info(
-                        strdup( rttiName ), (__class_type_info *)base_rtti );
-                }
-                else
-                {
-                    // this class has no base class
-                    rtti = new __class_type_info( strdup( rttiName ) );
-                }
-
-                pair< t_rtti_map::iterator, bool > insertion(
-                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, 
rtti ) ) );
-                assert(insertion.second && "### inserting new generated rtti 
failed?!");
-            }
-            else // taking already generated rtti
-            {
-                rtti = iFind->second;
-            }
-        }
-    }
-    else
-    {
-        rtti = iFind->second;
-    }
-
-    return rtti;
-}
-
-
-static void deleteException( void * pExc )
-{
-    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
-    typelib_TypeDescription * pTD = 0;
-    OUString unoName( toUNOname( header->exceptionType->name() ) );
-    ::typelib_typedescription_getByName( &pTD, unoName.pData );
-    assert(pTD && "### unknown exception type! leaving out destruction => 
leaking!!!");
-    if (pTD)
-    {
-        ::uno_destructData( pExc, pTD, cpp_release );
-        ::typelib_typedescription_release( pTD );
-    }
-}
-
-void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
-{
-#if defined BRIDGES_DEBUG
-    OString cstr(
-        OUStringToOString(
-            OUString::unacquired( &pUnoExc->pType->pTypeName ),
-            RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> uno exception occurred: %s\n", cstr.getStr() );
-#endif
-    void * pCppExc;
-    type_info * rtti;
-
-    {
-    // construct cpp exception object
-    typelib_TypeDescription * pTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
-    assert(pTypeDescr);
-    if (! pTypeDescr)
-    {
-        throw RuntimeException(
-            OUString("cannot get typedescription for type ") +
-            OUString::unacquired( &pUnoExc->pType->pTypeName ) );
-    }
-
-    pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
-    ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
-
-    // destruct uno exception
-    ::uno_any_destruct( pUnoExc, 0 );
-    // avoiding locked counts
-    static RTTI rtti_data;
-    rtti = 
(type_info*)rtti_data.getRTTI((typelib_CompoundTypeDescription*)pTypeDescr);
-    TYPELIB_DANGER_RELEASE( pTypeDescr );
-    assert(rtti && "### no rtti for throwing exception!");
-    if (! rtti)
-    {
-        throw RuntimeException(
-            OUString("no rtti for type ") +
-            OUString::unacquired( &pUnoExc->pType->pTypeName ) );
-    }
-    }
-
-    __cxa_throw( pCppExc, rtti, deleteException );
-}
-
-void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno)
-{
-    __cxa_exception * header = __cxa_get_globals()->caughtExceptions;
-    if (! header)
-    {
-        RuntimeException aRE( "no exception header!" );
-        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, 
rType.getTypeLibType(), pCpp2Uno );
-        SAL_WARN("bridges", aRE.Message);
-        return;
-    }
-
-    std::type_info *exceptionType = __cxa_current_exception_type();
-
-    typelib_TypeDescription * pExcTypeDescr = 0;
-    OUString unoName( toUNOname( exceptionType->name() ) );
-#if defined BRIDGES_DEBUG
-    OString cstr_unoName( OUStringToOString( unoName, 
RTL_TEXTENCODING_ASCII_US ) );
-    fprintf( stderr, "> c++ exception occurred: %s\n", cstr_unoName.getStr() );
-#endif
-    typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
-    if (0 == pExcTypeDescr)
-    {
-        RuntimeException aRE( OUString("exception type not found: ") + unoName 
);
-        Type const & rType = cppu::UnoType<decltype(aRE)>::get();
-        uno_type_any_constructAndConvert( pUnoExc, &aRE, 
rType.getTypeLibType(), pCpp2Uno );
-        SAL_WARN("bridges", aRE.Message);
-    }
-    else
-    {
-        // construct uno exception any
-        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, 
pExcTypeDescr, pCpp2Uno );
-        typelib_typedescription_release( pExcTypeDescr );
-    }
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx 
b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
deleted file mode 100644
index 675a909d0c4b..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#pragma once
-
-#include "uno/mapping.h"
-#include <typeinfo>
-#include <exception>
-#include <cstddef>
-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__));
-
-struct __cxa_exception
-{
-    std::type_info *exceptionType;
-    void (*exceptionDestructor)(void *);
-
-    void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
-    std::terminate_handler terminateHandler;
-
-    __cxa_exception *nextException;
-
-    int handlerCount;
-
-    int handlerSwitchValue;
-    const unsigned char *actionRecord;
-    const unsigned char *languageSpecificData;
-    void *catchTemp;
-    void *adjustedPtr;
-
-    _Unwind_Exception unwindHeader;
-};
-
-extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) 
__attribute__((noreturn));
-
-struct __cxa_eh_globals
-{
-    __cxa_exception *caughtExceptions;
-    unsigned int uncaughtExceptions;
-};
-extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
-extern "C" std::type_info *__cxa_current_exception_type() throw();
-
-void raiseException(
-    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
-
-void fillUnoException(uno_Any *, uno_Mapping * pCpp2Uno);
-
-inline char* adjustPointer( char* pIn, typelib_TypeDescription* pType )
-{
-    switch( pType->nSize )
-    {
-        case 1: return pIn + 3;
-        case 2: return pIn + 2;
-        case 3: return pIn + 1;
-            // Huh ? perhaps a char[3] ? Though that would be a pointer
-            // well, we have it anyway for symmetry
-    }
-    return pIn;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
deleted file mode 100644
index cdac6d3cda61..000000000000
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ /dev/null
@@ -1,604 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sal/config.h>
-
-#include <exception>
-#include <malloc.h>
-#include <typeinfo>
-
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/genfunc.hxx>
-#include <o3tl/runtimetooustring.hxx>
-#include <uno/data.h>
-
-#include "bridge.hxx"
-#include "types.hxx"
-#include "unointerfaceproxy.hxx"
-#include "vtables.hxx"
-
-#include "share.hxx"
-
-#include <sal/alloca.h>
-
-using namespace com::sun::star::uno;
-
-
-namespace
-{
-// The call instruction within the asm section of callVirtualMethod may throw
-// exceptions.  So that the compiler handles this correctly, it is important
-// that (a) callVirtualMethod might call dummy_can_throw_anything (although 
this
-// never happens at runtime), which in turn can throw exceptions, and (b)
-// callVirtualMethod is not inlined at its call site (so that any exceptions 
are
-// caught which are thrown from the instruction calling callVirtualMethod):
-
-void callVirtualMethod( void * pAdjustedThisPtr,
-                        sal_Int32 nVtableIndex,
-                        void * pRegisterReturn,
-                        typelib_TypeClass eReturnType,
-                        sal_Int32 * pStackLongs,
-                        sal_Int32 nStackLongs ) __attribute__((noinline));
-
-void callVirtualMethod( void * pAdjustedThisPtr,
-                        sal_Int32 nVtableIndex,
-                        void * pRegisterReturn,
-                        typelib_TypeClass eReturnType,
-                        sal_Int32 * pStackLongs,
-                        sal_Int32 nStackLongs )
-{
-    // parameter list is mixed list of * and values
-    // reference parameters are pointers
-
-    assert( pStackLongs && pAdjustedThisPtr);
-    static_assert( (sizeof(void *) == 4) &&
-                 (sizeof(sal_Int32) == 4), "### unexpected size of int!" );
-    assert(nStackLongs && pStackLongs && "### no stack in callVirtualMethod 
!");
-
-    // never called
-    if (! pAdjustedThisPtr) 
CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
-
-    long o0, o1; // for register returns
-    double f0d;
-    float f0f;
-    volatile long long saveReg[7];
-
-    __asm__ (
-        // save registers
-        "std %%l0, [%4]\n\t"
-        "mov %4, %%l0\n\t"
-        "mov %%l0, %%l1\n\t"
-        "add %%l0, 8, %%l0\n\t"
-        "std %%l2, [%%l0]\n\t"
-        "add %%l0, 8, %%l0\n\t"
-        "std %%l4, [%%l0]\n\t"
-        "add %%l0, 8, %%l0\n\t"
-        "std %%o0, [%%l0]\n\t"
-        "add %%l0, 8, %%l0\n\t"
-        "std %%o2, [%%l0]\n\t"
-        "add %%l0, 8, %%l0\n\t"
-        "std %%o4, [%%l0]\n\t"
-        "add %%l0, 8, %%l0\n\t"
-        "std %%l6, [%%l0]\n\t"
-        "mov %%l1, %%l7\n\t"
-
-        // increase our own stackframe if necessary
-        "mov %%sp, %%l3\n\t"        // save stack ptr for readjustment
-
-        "subcc %%i5, 7, %%l0\n\t"
-        "ble .LmoveOn\n\t"
-        "nop\n\t"
-
-        "sll %%l0, 2, %%l0\n\t"
-        "add %%l0, 96, %%l0\n\t"
-        "mov %%sp, %%l1\n\t"        // old stack ptr
-        "sub %%sp, %%l0, %%l0\n\t"  // future stack ptr
-        "andcc %%l0, 7, %%g0\n\t"   // align stack to 8
-        "be .LisAligned\n\t"
-        "nop\n\t"
-        "sub %%l0, 4, %%l0\n"
-    ".LisAligned:\n\t"
-        "mov %%l0, %%o5\n\t"            // save newly computed stack ptr
-        "add %%g0, 16, %%o4\n"
-
-        // now copy longs down to save register window
-        // and local variables
-    ".LcopyDown:\n\t"
-        "ld [%%l1], %%l2\n\t"
-        "st %%l2,[%%l0]\n\t"
-        "add %%l0, 4, %%l0\n\t"
-        "add %%l1, 4, %%l1\n\t"
-        "subcc %%o4, 1, %%o4\n\t"
-        "bne .LcopyDown\n\t"
-
-        "mov %%o5, %%sp\n\t"        // move new stack ptr (hopefully) 
atomically
-        // while register window is valid in both spaces
-        // (scheduling might hit in copyDown loop)
-
-        "sub %%i5, 7, %%l0\n\t"     // copy parameters past the sixth to stack
-        "add %%i4, 28, %%l1\n\t"
-        "add %%sp, 92, %%l2\n"
-    ".LcopyLong:\n\t"
-        "ld [%%l1], %%o0\n\t"
-        "st %%o0, [%%l2]\n\t"
-        "add %%l1, 4, %%l1\n\t"
-        "add %%l2, 4, %%l2\n\t"
-        "subcc %%l0, 1, %%l0\n\t"
-        "bne .LcopyLong\n\t"
-        "nop\n"
-
-    ".LmoveOn:\n\t"
-        "mov %%i5, %%l0\n\t"        // prepare out registers
-        "mov %%i4, %%l1\n\t"
-
-        "ld [%%l1], %%o0\n\t"       // prepare complex return ptr
-        "st %%o0, [%%sp+64]\n\t"
-        "sub %%l0, 1, %%l0\n\t"
-        "add %%l1, 4, %%l1\n\t"
-
-        "ld [%%l1], %%o0\n\t"
-        "subcc %%l0, 1, %%l0\n\t"
-        "be .LdoCall\n\t"
-        "nop\n\t"
-
-        "add %%l1, 4, %%l1\n\t"
-        "ld [%%l1], %%o1\n\t"
-        "subcc %%l0, 1, %%l0\n\t"
-        "be .LdoCall\n\t"
-        "nop\n\t"
-
-        "add %%l1, 4, %%l1\n\t"
-        "ld [%%l1], %%o2\n\t"
-        "subcc %%l0, 1, %%l0\n\t"
-        "be .LdoCall\n\t"
-        "nop\n\t"
-
-        "add %%l1, 4, %%l1\n\t"
-        "ld [%%l1], %%o3\n\t"
-        "subcc %%l0, 1, %%l0\n\t"
-        "be .LdoCall\n\t"
-        "nop\n\t"
-
-        "add %%l1, 4, %%l1\n\t"
-        "ld [%%l1], %%o4\n\t"
-        "subcc %%l0, 1, %%l0\n\t"
-        "be .LdoCall\n\t"
-        "nop\n\t"
-
-        "add %%l1, 4, %%l1\n\t"
-        "ld [%%l1], %%o5\n"
-
-    ".LdoCall:\n\t"
-        "ld [%%i0], %%l0\n\t"       // get vtable ptr
-
-"sll %%i1, 2, %%l6\n\t"
-//        "add %%l6, 8, %%l6\n\t"
-        "add %%l6, %%l0, %%l0\n\t"
-//      // vtable has 8byte wide entries,
-//      // upper half contains 2 half words, of which the first
-//      // is the this ptr patch !
-//      // first entry is (or __tf)
-
-//      "ldsh [%%l0], %%l6\n\t"     // load this ptr patch
-//      "add %%l6, %%o0, %%o0\n\t"  // patch this ptr
-
-//      "add %%l0, 4, %%l0\n\t"     // get virtual function ptr
-        "ld [%%l0], %%l0\n\t"
-
-        "ld [%%i4], %%l2\n\t"
-        "subcc %%l2, %%g0, %%l2\n\t"
-        "bne .LcomplexCall\n\t"
-        "nop\n\t"
-        "call %%l0\n\t"
-        "nop\n\t"
-        "ba .LcallReturned\n\t"
-        "nop\n"
-    ".LcomplexCall:\n\t"
-        "call %%l0\n\t"
-        "nop\n\t"
-        "unimp\n"
-
-    ".LcallReturned:\n\t"
-        "mov %%l3, %%sp\n\t"        // readjust stack so that our locals are 
where they belong
-        "st %%o0, %0\n\t"           // save possible return registers into our 
locals
-        "st %%o1, %1\n\t"
-        "std %%f0, %2\n\t"
-        "st %%f0, %3\n\t"
-
-        // restore registers
-        "ldd [%%l7], %%l0\n\t"
-        "add %%l7, 8, %%l7\n\t"
-        "ldd [%%l7], %%l2\n\t"
-        "add %%l7, 8, %%l7\n\t"
-        "ldd [%%l7], %%l4\n\t"
-        "add %%l7, 8, %%l7\n\t"
-        "ldd [%%l7], %%o0\n\t"
-        "add %%l7, 8, %%l7\n\t"
-        "ldd [%%l7], %%o2\n\t"
-        "add %%l7, 8, %%l7\n\t"
-        "ldd [%%l7], %%o4\n\t"
-        "add %%l7, 8, %%l7\n\t"
-        "ldd [%%l7], %%l6\n\t"
-        :
-        "=m"(o0),
-        "=m"(o1),
-        "=m"(f0d),
-        "=m"(f0f),
-        :
-        "r"(&saveReg[0])
-        : "memory"
-        );
-    switch( eReturnType )
-    {
-        case typelib_TypeClass_HYPER:
-        case typelib_TypeClass_UNSIGNED_HYPER:
-            ((long*)pRegisterReturn)[1] = o1;
-        case typelib_TypeClass_LONG:
-        case typelib_TypeClass_UNSIGNED_LONG:
-        case typelib_TypeClass_ENUM:
-            ((long*)pRegisterReturn)[0] = o0;
-            break;
-        case typelib_TypeClass_CHAR:
-        case typelib_TypeClass_SHORT:
-        case typelib_TypeClass_UNSIGNED_SHORT:
-            *(unsigned short*)pRegisterReturn = (unsigned short)o0;
-            break;
-        case typelib_TypeClass_BOOLEAN:
-        case typelib_TypeClass_BYTE:
-            *(unsigned char*)pRegisterReturn = (unsigned char)o0;
-            break;
-        case typelib_TypeClass_FLOAT:
-            *(float*)pRegisterReturn = f0f;
-            break;
-        case typelib_TypeClass_DOUBLE:
-            *(double*)pRegisterReturn = f0d;
-            break;
-    }
-}
-
-static void cpp_call(
-    bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
-    bridges::cpp_uno::shared::VtableSlot aVtableSlot,
-    typelib_TypeDescriptionReference * pReturnTypeRef,
-    sal_Int32 nParams, typelib_MethodParameter * pParams,
-    void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
-{
-      // max space for: complex ret ptr, this, values|ptr ...
-      char * pCppStack  =
-          (char *)alloca( (nParams+2) * sizeof(sal_Int64) );
-      char * pCppStackStart = pCppStack;
-
-    // return
-    typelib_TypeDescription * pReturnTypeDescr = 0;
-    TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
-    assert(pReturnTypeDescr);
-
-    void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
-    if (pReturnTypeDescr)
-    {
-        if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-        {
-            pCppReturn = pUnoReturn; // direct way for simple types
-            *(void**)pCppStack = NULL;
-        }
-        else
-        {
-            // complex return via ptr
-            pCppReturn = *(void **)pCppStack = 
(bridges::cpp_uno::shared::relatesToInterfaceType(pReturnTypeDescr )
-                                                ? alloca( 
pReturnTypeDescr->nSize )
-                                                : pUnoReturn); // direct way
-        }
-        pCppStack += sizeof(void*);
-    }
-    // push this
-    void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI())
-             + aVtableSlot.offset;
-             *(void**)pCppStack = pAdjustedThisPtr;
-    pCppStack += sizeof( void* );
-
-    // stack space
-    static_assert(sizeof(void *) == sizeof(sal_Int32), "### unexpected size!");
-    // args
-    void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
-    // indices of values this have to be converted (interface conversion 
cpp<=>uno)
-    sal_Int32 * pTempIndices = (sal_Int32 *)(pCppArgs + nParams);
-    // type descriptions for reconversions
-    typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription 
**)(pCppArgs + (2 * nParams));
-
-    sal_Int32 nTempIndices   = 0;
-
-    for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
-    {
-        const typelib_MethodParameter & rParam = pParams[nPos];
-        typelib_TypeDescription * pParamTypeDescr = 0;
-        TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
-        if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( 
pParamTypeDescr ))
-        {
-            pCppArgs[ nPos ] = 
CPPU_CURRENT_NAMESPACE::adjustPointer(pCppStack, pParamTypeDescr );
-
-            switch (pParamTypeDescr->eTypeClass)
-            {
-            case typelib_TypeClass_HYPER:
-            case typelib_TypeClass_UNSIGNED_HYPER:
-            case typelib_TypeClass_DOUBLE:
-                        static_assert(sizeof (double) == sizeof (sal_Int64), 
"boo");
-                          *reinterpret_cast< sal_Int32 * >(pCppStack) =

... etc. - the rest is truncated

Reply via email to