From 2c08ba67f301bacc8281e0e8bce9758b74f70427 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: May 17 2012 13:40:45 +0000
Subject: 0001-Simplify-code-and-use-proper-register-names-for-linu.patch is merged to 3.5.X

(cherry picked from commit b628e1b3ab58769899e157dadc957b8b46de4b3a)

---

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
deleted file mode 100644
index 9e8665a..0000000
--- a/0001-Simplify-code-and-use-proper-register-names-for-linu.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4e679ee2501a0babcdce498732d68428d46481e3 Mon Sep 17 00:00:00 2001
-From: Jani Monoses <jani@ubuntu.com>
-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
-