From 3dfae9e2e6416ce2605b1db75e139f1185841a43 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Fri, 17 Feb 2012 11:23:37 +0100
Subject: fix armel/armv4t build

---
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 ++++
 1 file changed, 4 insertions(+)

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"
-- 
cgit