summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2012-02-17 11:23:37 +0100
committerRene Engelhard <rene@debian.org>2012-02-17 11:23:55 +0100
commit3dfae9e2e6416ce2605b1db75e139f1185841a43 (patch)
treea45dbe043cbb9de6e5bbf8944d12d5b034da9de2 /bridges
parent77d120691d0bf8636f86e34a8d4926c260d73f68 (diff)
fix armel/armv4t build
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 97eff5143da6..8e69ebeef351 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"