bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx | 4 ++-- external/nss/ExternalProject_nss.mk | 2 ++ external/nss/nss-ios.patch | 11 +++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit 142d527a6be9d21631253477cf06c03f54657ef9 Author: Tor Lillqvist <[email protected]> Date: Wed Aug 13 20:07:27 2014 +0300 Make NSS build also as 64-bit ARM code for iOS Change-Id: I03cda6ca1886a3cfad87cc438282eeea8c2a5299 diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 3bf851b..9bff2c5 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -61,6 +61,8 @@ else # OS!=WNT $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter IOS,$(OS)),\ + $(if $(filter arm64,$(CC)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ $(if $(filter-out 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \ diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch index 8e883f9..0601573 100644 --- a/external/nss/nss-ios.patch +++ b/external/nss/nss-ios.patch @@ -77,6 +77,17 @@ endif MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend +--- a/a/nspr/pr/include/md/_darwin.h ++++ a/a/nspr/pr/include/md/_darwin.h +@@ -26,6 +26,8 @@ + #define _PR_SI_ARCHITECTURE "ppc" + #elif defined(__arm__) + #define _PR_SI_ARCHITECTURE "arm" ++#elif defined(__arm64__) ++#define _PR_SI_ARCHITECTURE "arm64" + #else + #error "Unknown CPU architecture" + #endif --- a/a/nspr/pr/src/Makefile.in +++ a/a/nspr/pr/src/Makefile.in @@ -180,7 +180,7 @@ commit 1f14417bb0418adcdb267632f064ccde151792af Author: Tor Lillqvist <[email protected]> Date: Wed Aug 13 20:05:52 2014 +0300 Clearly we should be moving 64 bit values here Change-Id: Ide34abab9417b849ea58aafab386e13e67d240be diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx index 788b98e..6639814 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx @@ -253,7 +253,7 @@ static void cpp_call( // push this void * pAdjustedThisPtr = reinterpret_cast< void ** >(pThis->getCppI()) + aVtableSlot.offset; - INSERT_INT32( &pAdjustedThisPtr, nGPR, pGPR, pStack ); + INSERT_INT64( &pAdjustedThisPtr, nGPR, pGPR, pStack ); // stack space // args @@ -339,7 +339,7 @@ static void cpp_call( // no longer needed TYPELIB_DANGER_RELEASE( pParamTypeDescr ); } - INSERT_INT32( &(pCppArgs[nPos]), nGPR, pGPR, pStack ); + INSERT_INT64( &(pCppArgs[nPos]), nGPR, pGPR, pStack ); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
