[Libreoffice-commits] core.git: 2 commits - bridges/inc bridges/source

[jan Iversen]

 bridges/inc/vtablefactory.hxx               |    2 +-
 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx |    5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 5facd232c181e3bd47f1140245bd32a5efb2b21b
Author: jan Iversen <jani at libreoffice.org>
Date:   Sun Mar 11 17:19:05 2018 +0100

    iOS, removed unneeded #ifdef arm64
    
    Change-Id: Ie568c461ae834b33b9220c4b9fb42ec66b5e7ce0

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 0ca1401ba960..17ed29f60789 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef __arm64
-
 // For iOS devices (64-bit ARM). Originally a copy of
 // ../gcc3_linux_arm/cpp2uno.cxx.
 
@@ -555,7 +553,6 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     return code;
 }
 
-#endif
 
 
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
commit 6ec77e28f131a03cd6209ef3de5bd8afb2442086
Author: jan Iversen <jani at libreoffice.org>
Date:   Sun Mar 11 13:05:57 2018 +0100

    iOS, revert bed135e02bf7db2ef8c29747bbf79f26da71e9ca
    
    using USE_DOUBLE_MMAP worked well on the device, but caused
    problems with the simulator, that depends on the GCC3_MAC* implementation.
    
    Change-Id: Ifbc1d48b3642567029c5271054a545eaacaf18ed

diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index 04e3addc3149..70c87c385952 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -31,7 +31,7 @@
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
     || defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \
-    || defined(HAIKU)  || defined(IOS)
+    || defined(HAIKU)
 #define USE_DOUBLE_MMAP
 #endif
 
diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 8008d3a2193e..0ca1401ba960 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -512,13 +512,11 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
     Slot ** slots,
     unsigned char * code,
-    sal_PtrDiff writetoexecdiff,
     typelib_InterfaceTypeDescription const * type,
     sal_Int32 functionOffset,
     sal_Int32 functionCount,
     sal_Int32 vtableOffset)
 {
-    (void)writetoexecdiff;
     (*slots) -= functionCount;
     Slot * s = *slots;
     for (sal_Int32 i = 0; i < type->nMembers; ++i)