[Libreoffice-commits] .: 3 commits - bridges/source icu/makefile.mk

[Libreoffice Gerrit user]

 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx |    9 ++++++---
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx |    6 ++++++
 icu/makefile.mk                                 |    1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit bb4d6a0d89b47d7f6b07507b839e69f780abcf37
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Sep 12 15:46:26 2012 +0300

    Make it compile for iOS device, no idea whether it works
    
    Change-Id: I56fdc4894347d9cce4d3b932d3b8740fcb4ef8b7

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
index 9e6fba0..f53bddd 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
@@ -462,7 +462,8 @@ sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
     sal_Int32 slotCount)
 {
 #ifdef __arm
-    ???
+    // ???
+    return (slotCount + 2) * sizeof (Slot);
 #else
     return (slotCount + 2) * sizeof (Slot);
 #endif
@@ -491,6 +492,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
         OSL_ASSERT(member != 0);
         switch (member->eTypeClass) {
         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+        {
 #ifdef __arm
             typelib_InterfaceAttributeTypeDescription *pAttrTD =
                 reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( member );
@@ -520,8 +522,9 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
                                         );
             }
             break;
-
+        }
         case typelib_TypeClass_INTERFACE_METHOD:
+        {
 #ifdef __arm
             typelib_InterfaceMethodTypeDescription *pMethodTD =
                 reinterpret_cast<
@@ -537,7 +540,7 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 #endif
                                     );
             break;
-
+        }
         default:
             OSL_ASSERT(false);
             break;
commit 21774213d4f3985e28f78949cb96f00a0acf58a9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Sep 12 15:44:41 2012 +0300

    WaE: -Wuninitialized
    
    Change-Id: Iba1849abfc9c12c38466fc4294d319a06f413b55

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
index b5a5943..2d920df 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
@@ -134,7 +134,10 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
             pRegisterReturn[0] = r0;
 #else
             register float fret asm("s0");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wuninitialized"
             *(float*)pRegisterReturn = fret;
+#pragma GCC diagnostic pop
 #endif
         break;
         case typelib_TypeClass_DOUBLE:
@@ -143,7 +146,10 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
             pRegisterReturn[0] = r0;
 #else
             register double dret asm("d0");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wuninitialized"
             *(double*)pRegisterReturn = dret;
+#pragma GCC diagnostic pop
 #endif
             break;
         case typelib_TypeClass_STRUCT:
commit fa57e53c2de5afb997a096a5df9a30f4abceb7ae
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Sep 12 13:44:10 2012 +0300

    Put -DUCONFIG_NO_FILE_IO also in CXXFLAGS for iOS
    
    Change-Id: I345a86a3d17bd85c8dd4e9d9f5f855c46bdba0e2

diff --git a/icu/makefile.mk b/icu/makefile.mk
index aaace59..df2d20b 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -124,6 +124,7 @@ LDFLAGSADD += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
 .IF "$(OS)"=="IOS"
 # Let's try this...
 icu_CFLAGS+=-DUCONFIG_NO_FILE_IO
+icu_CXXFLAGS+=-DUCONFIG_NO_FILE_IO
 .ENDIF
 
 .IF "$(OS)"=="ANDROID"