bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 3dfae9e2e6416ce2605b1db75e139f1185841a43
Author: Rene Engelhard <r...@debian.org>
Date: Fri Feb 17 11:23:37 2012 +0100
fix armel/armv4t build
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 97eff51..8e69ebe 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -279,7 +279,11 @@ void callVirtualMethod(
#endif
//Make the call
"ldr r5, %[pmethod]\n\t"
+#ifndef __ARM_ARCH_4T__
"blx r5\n\t"
+#else
+ "mov lr, pc ; bx r5\n\t"
+#endif
//Fill in return values
"mov %[r0], r0\n\t"
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
