[Libreoffice-commits] core.git: external/openssl

[Tor Lillqvist (via logerrit)]

 external/openssl/ExternalProject_openssl.mk |    2 +-
 external/openssl/opensslios.patch           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1c4aa5c2d5625bbf05299639d4898872d2bd53bb
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Sun Jul 5 00:08:46 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sun Jul 5 09:12:17 2020 +0200

    We don't build OpenSSL for iOS but if we did, it would be arm64
    
    Just for completeness. Did not check whether we actually could build
    OpenSSL for iOS. As we have managed without so far there probably is
    no need.
    
    Change-Id: Icd41622e7336e723ccd5a3157e956c43f6f92a76
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98011
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index c35b1b24bd0f..1378ef6ffa14 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -39,7 +39,7 @@ OPENSSL_PLATFORM := \
       )\
     ,\
       $(if $(filter iOS,$(OS)),\
-        ios-armv7\
+        ios-aarch64\
       ,\
         $(if $(filter WNT,$(OS)),\
           $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\
diff --git a/external/openssl/opensslios.patch b/external/openssl/opensslios.patch
index e3e1c218432f..28af92dd473b 100644
--- a/external/openssl/opensslios.patch
+++ b/external/openssl/opensslios.patch
@@ -5,7 +5,7 @@
  "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
  
 +##### iOS in the LibreOffice case
-+"ios-armv7","gcc:-O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:::::",
++"ios-aarch64","clang:-O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${aarch64_asm}:::::",
 +
  ##### A/UX
  "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",