diff options
author | Rene Engelhard <rene@debian.org> | 2012-02-17 11:23:37 +0100 |
---|---|---|
committer | Rene Engelhard <rene@debian.org> | 2012-02-17 11:23:55 +0100 |
commit | 3dfae9e2e6416ce2605b1db75e139f1185841a43 (patch) | |
tree | a45dbe043cbb9de6e5bbf8944d12d5b034da9de2 /bridges | |
parent | Pass JunitTest jar deps to underlying JavaClassSet (diff) | |
download | core-3dfae9e2e6416ce2605b1db75e139f1185841a43.tar.gz core-3dfae9e2e6416ce2605b1db75e139f1185841a43.zip |
fix armel/armv4t build
Diffstat (limited to 'bridges')
-rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 |
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" |