From 99cfb6724bd7243e82492a2163bffd4a26d54c28 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 23 Sep 2012 11:14:52 +0200 Subject: Revert "add forgotten asm file to build" This reverts commit 492f9139c1033b3f069880bff8e7f2857cbca111. --- bridges/Library_gcc3_linux_arm.mk | 4 -- bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S | 52 +++++++++++++++++++++++ bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s | 52 ----------------------- 3 files changed, 52 insertions(+), 56 deletions(-) create mode 100644 bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S delete mode 100644 bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s diff --git a/bridges/Library_gcc3_linux_arm.mk b/bridges/Library_gcc3_linux_arm.mk index 95cc915cf92b..81c29d729b5f 100644 --- a/bridges/Library_gcc3_linux_arm.mk +++ b/bridges/Library_gcc3_linux_arm.mk @@ -45,10 +45,6 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_asmobjects,gcc3_uno,\ - bridges/source/cpp_uno/gcc3_linux_arm/armhelper \ -)) - $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/shared/bridge \ bridges/source/cpp_uno/shared/component \ diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S new file mode 100644 index 000000000000..27148dc0278c --- /dev/null +++ b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.S @@ -0,0 +1,52 @@ +@ ARM support code for OpenOffice C++/UNO bridging +@ +@ Written by Peter Naulls +@ Modified by Caolan McNamara +@ Fixed by Michael Casadevall + +#ifdef __ARM_EABI__ +# define UNWIND +#else +# define UNWIND @ +#endif + +@ If the VFP ABI variant (armhf in Debian/Ubuntu) is used, an additional extra 64 bytes +@ are taken up on the stack (the equivalent of the 8 double precision VFP registers) + +#ifdef __ARM_PCS_VFP +# define PAD 80 +# define DISCARDED 84 +#else +# define PAD 16 +# define DISCARDED 20 +#endif + + .file "armhelper.s" + .text + .align 4 + .global privateSnippetExecutor + .type privateSnippetExecutor, %function +privateSnippetExecutor: + UNWIND .fnstart @ start of unwinder entry + + 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 +#ifdef __ARM_PCS_VFP + vpush {d0-d7} @ floating point parameter on stack +#endif + UNWIND .pad #PAD @ throw this data away on exception + @ (see cppuno.cxx:codeSnippet()) + stmfd sp!, {r4,lr} @ save return address + @ (r4 pushed to preserve stack alignment) + UNWIND .save {r4,lr} @ restore these regs on exception + + bl cpp_vtable_call(PLT) + + add sp, sp, #4 @ no need to restore r4 (we didn't touch it) + ldr pc, [sp], #DISCARDED @ return, discarding function arguments + + UNWIND .fnend @ end of unwinder entry + + .size privateSnippetExecutor, . - privateSnippetExecutor + .section .note.GNU-stack,"",%progbits diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s b/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s deleted file mode 100644 index 27148dc0278c..000000000000 --- a/bridges/source/cpp_uno/gcc3_linux_arm/armhelper.s +++ /dev/null @@ -1,52 +0,0 @@ -@ ARM support code for OpenOffice C++/UNO bridging -@ -@ Written by Peter Naulls -@ Modified by Caolan McNamara -@ Fixed by Michael Casadevall - -#ifdef __ARM_EABI__ -# define UNWIND -#else -# define UNWIND @ -#endif - -@ If the VFP ABI variant (armhf in Debian/Ubuntu) is used, an additional extra 64 bytes -@ are taken up on the stack (the equivalent of the 8 double precision VFP registers) - -#ifdef __ARM_PCS_VFP -# define PAD 80 -# define DISCARDED 84 -#else -# define PAD 16 -# define DISCARDED 20 -#endif - - .file "armhelper.s" - .text - .align 4 - .global privateSnippetExecutor - .type privateSnippetExecutor, %function -privateSnippetExecutor: - UNWIND .fnstart @ start of unwinder entry - - 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 -#ifdef __ARM_PCS_VFP - vpush {d0-d7} @ floating point parameter on stack -#endif - UNWIND .pad #PAD @ throw this data away on exception - @ (see cppuno.cxx:codeSnippet()) - stmfd sp!, {r4,lr} @ save return address - @ (r4 pushed to preserve stack alignment) - UNWIND .save {r4,lr} @ restore these regs on exception - - bl cpp_vtable_call(PLT) - - add sp, sp, #4 @ no need to restore r4 (we didn't touch it) - ldr pc, [sp], #DISCARDED @ return, discarding function arguments - - UNWIND .fnend @ end of unwinder entry - - .size privateSnippetExecutor, . - privateSnippetExecutor - .section .note.GNU-stack,"",%progbits -- cgit