bridges/source/cpp_uno/gcc3_ios/helper.s | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-)
New commits: commit a4d0699a7a18320d2c0770e52532e0f7dcafcb9a Author: jan Iversen <j...@libreoffice.org> Date: Thu Sep 21 18:06:12 2017 +0200 iOS, updated helper.s to do 64 bit Removed __arm reference Change-Id: I194d79ccb5ba2117e0f468080813bf8de1ada84a 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 <pe...@chocky.org> -// Modified by Caolan McNamara <caol...@redhat.com> -// Fixed by Michael Casadevall <mcasadev...@kubuntu.org> -// Modified for iOS by Tor Lillqvist <t...@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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits