diff options
| author | Matthias Klose <matthias.klose@canonical.com> | 2011-12-19 10:51:43 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-19 11:11:54 +0100 |
| commit | 468fe685e3c58c84bce6d9a48b931dcc21682679 (patch) | |
| tree | 09657b773caf92a96c429875ed4035ce5035c0b0 /bridges | |
| parent | 2889909e1e7ab5d69391bb6c0a0b37b48adac9ef (diff) | |
fix armhf build in bridges
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 5b02678b8fbf..9502b871f500 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 |