From 9a090eaf3397727a6ec93104b2717d191b5f9f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 10 Apr 2012 14:52:40 +0100 Subject: [PATCH] Resolves: rhbz#811226 FTBFS ARM --- ...d-use-proper-register-names-for-linu.patch | 44 +++++++++++++++++++ libreoffice.spec | 7 ++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-Simplify-code-and-use-proper-register-names-for-linu.patch diff --git a/0001-Simplify-code-and-use-proper-register-names-for-linu.patch b/0001-Simplify-code-and-use-proper-register-names-for-linu.patch new file mode 100644 index 0000000..9e8665a --- /dev/null +++ b/0001-Simplify-code-and-use-proper-register-names-for-linu.patch @@ -0,0 +1,44 @@ +From 4e679ee2501a0babcdce498732d68428d46481e3 Mon Sep 17 00:00:00 2001 +From: Jani Monoses +Date: Fri, 3 Feb 2012 22:11:08 +0200 +Subject: [PATCH] Simplify code and use proper register names for linux armhf + +--- + bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 7 ++----- + 1 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +index 9502b87..ac8ca23 100644 +--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx ++++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +@@ -152,11 +152,6 @@ namespace arm + + void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference * pReturnType, sal_uInt32* pRegisterReturn) + { +-#if !defined(__ARM_EABI__) && !defined(__SOFTFP__) +- register float fret asm("f0"); +- register double dret asm("f0"); +-#endif +- + switch( pReturnType->eTypeClass ) + { + case typelib_TypeClass_HYPER: +@@ -176,6 +171,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference * + #if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__)) + pRegisterReturn[0] = r0; + #else ++ register float fret asm("s0"); + *(float*)pRegisterReturn = fret; + #endif + break; +@@ -184,6 +180,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference * + pRegisterReturn[1] = r1; + pRegisterReturn[0] = r0; + #else ++ register double dret asm("d0"); + *(double*)pRegisterReturn = dret; + #endif + break; +-- +1.7.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index 2b0d929..69191f2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 4%{?dist} +Release: 5%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -143,6 +143,7 @@ Patch27: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch Patch28: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch Patch29: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch Patch30: 0001-Introduced-SystemShellExecuteFlags-URIS_ONLY.patch +Patch31: 0001-Simplify-code-and-use-proper-register-names-for-linu.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -997,6 +998,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch28 -p1 -b .do-not-complain-about-soffice-command-line-o.patch %patch29 -p1 -b .fdo48096-torn-off-popups-trigger-keyboard-.patch %patch30 -p1 -b .Introduced-SystemShellExecuteFlags-URIS_ONLY.patch +%patch31 -p1 -b .Simplify-code-and-use-proper-register-names-for-linu.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2284,6 +2286,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Tue Apr 10 2012 Caolán McNamara - 3.5.2.1-5 +- Resolves: rhbz#811226 FTBFS ARM + * Thu Apr 05 2012 Stephan Bergmann - 3.5.2.1-4 - Fix URIS_ONLY flag issue - rebuild for db4