rpms/openoffice.org/devel workspace.s390xport02.patch,1.1,1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25947

Modified Files:
	workspace.s390xport02.patch 
Log Message:
fix vtable offset

workspace.s390xport02.patch:
 basegfx/test/basegfx2d.cxx                          |    9 +++++++--
 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx   |    6 +++---
 bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx |   10 ++++++++--
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx  |    6 +++---
 bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx |   10 +++++-----
 5 files changed, 26 insertions(+), 15 deletions(-)

Index: workspace.s390xport02.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.s390xport02.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.s390xport02.patch	18 Jan 2010 20:10:54 -0000	1.1
+++ workspace.s390xport02.patch	19 Jan 2010 11:34:23 -0000	1.2
@@ -52,3 +52,99 @@ diff -r b9c9dd11b0a1 -r a92f79b9fc30 bri
              break;
      case typelib_TypeClass_FLOAT:
              *reinterpret_cast<float *>( pRegisterReturn ) = f0;
+diff -r 0ce3ce7034ec -r 5e39d90161b3 bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	Mon Jan 18 15:37:42 2010 +0000
++++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx	Tue Jan 19 11:25:34 2010 +0000
+@@ -137,8 +137,8 @@
+     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
+ 
+     MutexGuard guard( m_mutex );
+-    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
+-    if (iFind == m_rttis.end())
++    t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
++    if (iRttiFind == m_rttis.end())
+     {
+         // RTTI symbol
+         OStringBuffer buf( 64 );
+@@ -202,7 +202,7 @@
+     }
+     else
+     {
+-        rtti = iFind->second;
++        rtti = iRttiFind->second;
+     }
+ 
+     return rtti;
+diff -r 0ce3ce7034ec -r 5e39d90161b3 bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	Mon Jan 18 15:37:42 2010 +0000
++++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx	Tue Jan 19 11:25:34 2010 +0000
+@@ -491,7 +491,7 @@
+ long privateSnippetExecutor(long r2, long r3, long r4, long r5, long r6, long firstonstack)
+ {
+     register long r0 asm("r0");
+-    sal_uInt32 nOffsetAndIndex = r0;
++    sal_uInt64 nOffsetAndIndex = r0;
+ 
+     long sp = (long)&firstonstack;
+ 
+diff -r 0ce3ce7034ec -r 5e39d90161b3 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	Mon Jan 18 15:37:42 2010 +0000
++++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	Tue Jan 19 11:25:34 2010 +0000
+@@ -138,8 +138,8 @@
+     OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
+ 
+     MutexGuard guard( m_mutex );
+-    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
+-    if (iFind == m_rttis.end())
++    t_rtti_map::const_iterator iRttiFind( m_rttis.find( unoName ) );
++    if (iRttiFind == m_rttis.end())
+     {
+         // RTTI symbol
+         OStringBuffer buf( 64 );
+@@ -203,7 +203,7 @@
+     }
+     else
+     {
+-        rtti = iFind->second;
++        rtti = iRttiFind->second;
+     }
+ 
+     return rtti;
+diff -r 0ce3ce7034ec -r 5e39d90161b3 bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx
+--- a/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx	Mon Jan 18 15:37:42 2010 +0000
++++ b/bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx	Tue Jan 19 11:25:34 2010 +0000
+@@ -92,7 +92,6 @@
+ 
+ #define INSERT_FLOAT( pSV, nr, pFPR, pDS ) \
+     { \
+-        float tmp = *reinterpret_cast<float *>( pSV ); \
+         if ( nr < s390x::MAX_SSE_REGS ) \
+         { \
+                 pFPR[nr++] = *reinterpret_cast<float *>( pSV ); \
+@@ -423,7 +422,6 @@
+     // is my surrogate
+     bridges::cpp_uno::shared::UnoInterfaceProxy * pThis 
+             = static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy *> (pUnoI);
+-    typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
+     
+     switch (pMemberDescr->eTypeClass)
+     {
+diff -r a92f79b9fc30 -r 0ce3ce7034ec basegfx/test/basegfx2d.cxx
+--- a/basegfx/test/basegfx2d.cxx	Mon Jan 18 11:56:59 2010 +0000
++++ b/basegfx/test/basegfx2d.cxx	Mon Jan 18 15:37:42 2010 +0000
+@@ -489,8 +489,13 @@
+         // depending on float precision and the getContinuity() implemetation using 
+         // fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32
+         // uses more 'S' statements (as it should be for circles)
+-        CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", 
+-                               nCount==67 || nCount==50);
++        CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates",
++#ifdef S390X
++                               nCount==61
++#else
++                               nCount==67 || nCount==50
++#endif
++        );
+ 
+         const B2DPolygon aRect(
+             tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));