fix armhf build in bridges

Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Signed-off-by: Caolán McNamara <caolanm@redhat.com>

fix armhf build in bridges
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Signed-off-by: Caolán McNamara <caolanm@redhat.com>
f233f397 · Matthias Klose · Bjoern Michaelsen · f2a1882b · f233f397
Kaydet (Commit) f233f397 authored Ara 19, 2011 tarafından Matthias Klose Kaydeden (comit) Bjoern Michaelsen Ara 19, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

uno2cpp.cxx bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +2 -2

No files found.
--- 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