diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-02 09:59:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-02 10:00:22 +0300 |
| commit | dba1bb24ccca95bcdfd4dfae5053867af9d18bab (patch) | |
| tree | 720e8e348142f007719c07c14d911c088b1a2382 /bridges | |
| parent | 0f3ad8ce369136c5904e3906a26a764b643d4844 (diff) | |
Add dummy arm64 code to just get it to compile for now
Change-Id: I9898c0757a2dd495c73bd4b485dd8489f4a2b08e
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx | 2 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx index cdf0e19d66d5..78a0d3e83aea 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef __arm +#if defined(__arm) || defined(__arm64) // For iOS devices (ARM). Basically a copy of n // ../gcc3_linux_arm/cpp2uno.cxx with some cleanups and necessary diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx index 892dc8c689db..cef2ecf740a3 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef __arm +#if defined(__arm) || defined(__arm64) #include <com/sun/star/uno/RuntimeException.hpp> @@ -175,6 +175,8 @@ void callVirtualMethod( sal_uInt32 nGPR, double *pFPR) { +#ifdef __arm + // never called if (! pThis) CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something @@ -225,6 +227,21 @@ void callVirtualMethod( : "r0", "r1", "r2", "r3", "r4", "r5"); MapReturn(r0, r1, pReturnType, (sal_uInt32*)pRegisterReturn); + +#else + abort(); // arm64 code not yet implemented + + (void) pThis; + (void) nVtableIndex; + (void) pRegisterReturn; + (void) pReturnType; + (void) pStack; + (void) nStack; + (void) pGPR; + (void) nGPR; + (void) pFPR; +#endif + } } |