Commit 788715ce authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configure: add ios64 target. 



Reviewed-by: default avatarSteve Marquess <marquess@openssl.org>
(cherry picked from commit b06f7d9a)
parent cfcd27d3

Configure

+16 −1
Original line number Diff line number Diff line
@@ -581,7 +581,22 @@ my %table=( 
"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

# iPhoneOS/iOS

"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",

#

# It takes three prior-set environment variables to make it work:

#

# CROSS_COMPILE=/where/toolchain/is/usr/bin/ [note ending slash]

# CROSS_TOP=/where/SDKs/are

# CROSS_SDK=iPhoneOSx.y.sdk

#

# Exact paths vary with Xcode releases, but for couple of last ones

# they would look like this:

#

# CROSS_COMPILE=`xcode-select --print-path`/Toolchains/XcodeDefault.xctoolchain/usr/bin/

# CROSS_TOP=`xcode-select --print-path`/Platforms/iPhoneOS.platform/Developer

# CROSS_SDK=iPhoneOS7.0.sdk

#

"iphoneos-cross","cc:-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",

"ios64-cross","cc:-O3 -arch arm64 -mios-version-min=7.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR -RC4_CHUNK DES_INT DES_UNROLL -BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",



##### A/UX

"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",

TABLE

+35 −1
Original line number Diff line number Diff line
@@ -3465,8 +3465,42 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** ios64-cross

$cc           = cc

$cflags       = -O3 -arch arm64 -mios-version-min=7.0.0 -isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fno-common

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = iOS

$lflags       = -Wl,-search_paths_first%

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR -RC4_CHUNK DES_INT DES_UNROLL -BF_PTR

$cpuid_obj    = 

$bn_obj       = 

$ec_obj       = 

$des_obj      = 

$aes_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = void

$dso_scheme   = dlfcn

$shared_target= darwin-shared

$shared_cflag = -fPIC -fno-common

$shared_ldflag = -dynamiclib

$shared_extension = .$(SHLIB_MAJOR).$(SHLIB_MINOR).dylib

$ranlib       = 

$arflags      = 

$multilib     = 



*** iphoneos-cross

$cc           = llvm-gcc

$cc           = cc

$cflags       = -O3 -isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fomit-frame-pointer -fno-common

$unistd       = 

$thread_cflag = -D_REENTRANT

config

+2 −0
Original line number Diff line number Diff line
@@ -576,6 +576,8 @@ case "$GUESSOS" in 
  *-*-iphoneos)

	options="$options -arch%20${MACHINE}"

	OUT="iphoneos-cross" ;;

  arm64-*-iphoneos|*-*-ios64)

	OUT="ios64-cross" ;;

  alpha-*-linux2)

        ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`

	case ${ISA:-generic} in