From f233f3973631c664e0953f04f88a58234390c088 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 19 Dec 2011 10:51:43 +0100 Subject: fix armhf build in bridges MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bjoern Michaelsen Signed-off-by: Caolán McNamara --- bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bridges') 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 -- cgit