Kaydet (Commit) dba1bb24 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Add dummy arm64 code to just get it to compile for now

Change-Id: I9898c0757a2dd495c73bd4b485dd8489f4a2b08e
üst 0f3ad8ce
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 // For iOS devices (ARM). Basically a copy of n
// ../gcc3_linux_arm/cpp2uno.cxx with some cleanups and necessary // ../gcc3_linux_arm/cpp2uno.cxx with some cleanups and necessary
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <com/sun/star/uno/RuntimeException.hpp>
...@@ -175,6 +175,8 @@ void callVirtualMethod( ...@@ -175,6 +175,8 @@ void callVirtualMethod(
sal_uInt32 nGPR, sal_uInt32 nGPR,
double *pFPR) double *pFPR)
{ {
#ifdef __arm
// never called // never called
if (! pThis) if (! pThis)
CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
...@@ -225,6 +227,21 @@ void callVirtualMethod( ...@@ -225,6 +227,21 @@ void callVirtualMethod(
: "r0", "r1", "r2", "r3", "r4", "r5"); : "r0", "r1", "r2", "r3", "r4", "r5");
MapReturn(r0, r1, pReturnType, (sal_uInt32*)pRegisterReturn); 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
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment