Support arm64e
Credits to: https://github.com/x2on/OpenSSL-for-iPhone/pull/182
This commit is contained in:
parent
1ffd32e815
commit
7e774ecb47
|
@ -31,12 +31,12 @@ DEFAULTVERSION="1.1.1d"
|
||||||
#DEFAULTARCHS="ios_x86_64 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64"
|
#DEFAULTARCHS="ios_x86_64 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64"
|
||||||
#DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64"
|
#DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64"
|
||||||
DEFAULTARCHS="ios_x86_64 ios_arm64 tv_x86_64 tv_arm64 mac_x86_64 watchos_armv7k watchos_arm64_32 watchos_i386"
|
DEFAULTARCHS="ios_x86_64 ios_arm64 tv_x86_64 tv_arm64 mac_x86_64 watchos_armv7k watchos_arm64_32 watchos_i386"
|
||||||
DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64 watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-i386"
|
DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64 watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-i386"
|
||||||
|
|
||||||
# Minimum iOS/tvOS SDK version to build for
|
# Minimum iOS/tvOS SDK version to build for
|
||||||
MACOS_MIN_SDK_VERSION="10.11"
|
IOS_MIN_SDK_VERSION="12.0"
|
||||||
IOS_MIN_SDK_VERSION="11.0"
|
TVOS_MIN_SDK_VERSION="12.0"
|
||||||
TVOS_MIN_SDK_VERSION="11.0"
|
MACOS_MIN_SDK_VERSION="10.15"
|
||||||
WATCHOS_MIN_SDK_VERSION="4.0"
|
WATCHOS_MIN_SDK_VERSION="4.0"
|
||||||
|
|
||||||
# Init optional env variables (use available variable or default to empty string)
|
# Init optional env variables (use available variable or default to empty string)
|
||||||
|
@ -569,6 +569,9 @@ if [ ${#OPENSSLCONF_ALL[@]} -gt 1 ]; then
|
||||||
*_ios_arm64.h)
|
*_ios_arm64.h)
|
||||||
DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64"
|
DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64"
|
||||||
;;
|
;;
|
||||||
|
*_ios_arm64e.h)
|
||||||
|
DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64E"
|
||||||
|
;;
|
||||||
*_ios_armv7s.h)
|
*_ios_armv7s.h)
|
||||||
DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM && defined(__ARM_ARCH_7S__)"
|
DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARM && defined(__ARM_ARCH_7S__)"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -92,6 +92,16 @@ my %targets = ();
|
||||||
sys_id => "iOS",
|
sys_id => "iOS",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
## Apple iOS (arm64e)
|
||||||
|
# Based on 10-main.conf: ios64-cross
|
||||||
|
"ios64-cross-arm64e" => {
|
||||||
|
inherit_from => [ "darwin-common", "ios-cross-base", asm("aarch64_asm") ],
|
||||||
|
cflags => add("-arch arm64e"),
|
||||||
|
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
|
||||||
|
perlasm_scheme => "ios64",
|
||||||
|
sys_id => "iOS",
|
||||||
|
},
|
||||||
|
|
||||||
## Apple iOS (armv7s)
|
## Apple iOS (armv7s)
|
||||||
# Based on 10-main.conf: ios-cross
|
# Based on 10-main.conf: ios-cross
|
||||||
"ios-cross-armv7s" => {
|
"ios-cross-armv7s" => {
|
||||||
|
|
Loading…
Reference in New Issue