diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-09-21 18:06:12 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-09-22 10:48:54 +0200 |
| commit | a4d0699a7a18320d2c0770e52532e0f7dcafcb9a (patch) | |
| tree | 00352b419800b3dda4cdeb667285c22ebc997581 /bridges | |
| parent | 238cfa9efa21f08514703ea6cc181ce02d8feb12 (diff) | |
iOS, updated helper.s to do 64 bit
Removed __arm reference
Change-Id: I194d79ccb5ba2117e0f468080813bf8de1ada84a
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios/helper.s | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/bridges/source/cpp_uno/gcc3_ios/helper.s b/bridges/source/cpp_uno/gcc3_ios/helper.s index 7461cbccc4e7..148b53ee2423 100644 --- a/bridges/source/cpp_uno/gcc3_ios/helper.s +++ b/bridges/source/cpp_uno/gcc3_ios/helper.s @@ -19,30 +19,7 @@ #include "codesnippets.S" -#if defined(__arm) -// ARM support code for LibreOffice C++/UNO bridging -// -// Written by Peter Naulls <peter@chocky.org> -// Modified by Caolan McNamara <caolanm@redhat.com> -// Fixed by Michael Casadevall <mcasadevall@kubuntu.org> -// Modified for iOS by Tor Lillqvist <tml@iki.fi> - - .text - .align 4 - -_privateSnippetExecutor: - stmfd sp!, {r0-r3} // follow other parameters on stack - mov r0, ip // r0 points to functionoffset/vtable - mov r1, sp // r1 points to this and params - // (see cpp2uno.cxx:codeSnippet()) - stmfd sp!, {r4, lr} // save return address - // (r4 pushed to preserve stack alignment) - bl _cpp_vtable_call - - add sp, sp, #4 // no need to restore r4 (we didn't touch it) - ldr pc, [sp], #20 // return, discarding function arguments - -#elif defined(__arm64) +#ifdef(__arm64) .text .align 4 |