[Libreoffice-commits] .: Branch 'libreoffice-3-5' - bridges/source

[Bjoern Michaelsen]

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

New commits:
commit 468fe685e3c58c84bce6d9a48b931dcc21682679
Author: Matthias Klose <matthias.kl...@canonical.com>
Date:   Mon Dec 19 10:51:43 2011 +0100

    fix armhf build in bridges
    
    Signed-off-by: Bjoern Michaelsen <bjoern.michael...@canonical.com>
    Signed-off-by: Caolán McNamara <caol...@redhat.com>

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 5b02678..9502b87 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, 
typelib_TypeDescriptionReference *
             pRegisterReturn[0] = r0;
             break;
         case typelib_TypeClass_FLOAT:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
             pRegisterReturn[0] = r0;
 #else
             *(float*)pRegisterReturn = fret;
 #endif
         break;
         case typelib_TypeClass_DOUBLE:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__))
             pRegisterReturn[1] = r1;
             pRegisterReturn[0] = r0;
 #else

_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits