Commit ffa76736 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Platform update from HEAD.

parent cbed6cfc

Configure

+3 −7
Original line number Diff line number Diff line
@@ -577,14 +577,9 @@ my %table=( 
"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",

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

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



##### iOS setup

"darwin-iphoneos-armv7-cross","llvm-gcc:-O3 -arch armv7 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -miphoneos-version-min=4.0 -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",

"darwin-iphoneos-armv6-cross","llvm-gcc:-O3 -arch armv6 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -miphoneos-version-min=4.0 -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",

"darwin-iphoneos-cross","llvm-gcc:-O3 -arch armv7 -arch armv6 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -miphoneos-version-min=4.0 -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",

"darwin-iphonesimulator-cross","llvm-gcc:-O3 -arch i386 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -miphoneos-version-min=4.0 -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",

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



##### A/UX

"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
@@ -913,6 +908,7 @@ EOF 
				}

			elsif (/^-[^-]/ or /^\+/)

				{

				$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;

				$flags.=$_." ";

				}

			elsif (/^--prefix=(.*)$/)

TABLE

+33 −0
Original line number Diff line number Diff line
@@ -3465,6 +3465,39 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** iphoneos-cross

$cc           = llvm-gcc

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

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = iOS

$lflags       = -Wl,-search_paths_first%

$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR

$cpuid_obj    = 

$bn_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     = 



*** irix-cc

$cc           = cc

$cflags       = -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN

config

+23 −12
Original line number Diff line number Diff line
@@ -277,9 +277,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in 
	    Power*)

		echo "ppc-apple-darwin${VERSION}"

		;;

            x86_64)

		echo "x86_64-apple-darwin${VERSION}"

		;;

	    *)

		echo "i686-apple-darwin${VERSION}"

		;;
@@ -541,7 +538,7 @@ case "$GUESSOS" in 
  ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;

  ppc-apple-darwin*)

	ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null`

	if [ "$ISA64" = "1" ]; then

	if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then

	    echo "WARNING! If you wish to build 64-bit library, then you have to"

	    echo "         invoke './Configure darwin64-ppc-cc' *manually*."

	    if [ "$TEST" = "false" -a -t 1 ]; then
@@ -549,12 +546,14 @@ case "$GUESSOS" in 
	      (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1

	    fi

	fi

	OUT="darwin-ppc-cc" ;;

  x86_64-*-darwin*) OUT="darwin-x86_64-cc" ;;

  i386-whatever-darwin) OUT="darwin-i386-cc" ;;

	if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then

	    OUT="darwin64-ppc-cc"

	else

	    OUT="darwin-ppc-cc"

	fi ;;

  i?86-apple-darwin*)

	ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`

	if [ "$ISA64" = "1" ]; then

	if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then

	    echo "WARNING! If you wish to build 64-bit library, then you have to"

	    echo "         invoke './Configure darwin64-x86_64-cc' *manually*."

	    if [ "$TEST" = "false" -a -t 1 ]; then
@@ -562,7 +561,17 @@ case "$GUESSOS" in 
	      (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1

	    fi

	fi

	OUT="darwin-i386-cc" ;;

	if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then

	    OUT="darwin64-x86_64-cc"

	else

	    OUT="darwin-i386-cc"

	fi ;;

  armv6+7-*-iphoneos)

	options="$options -arch%20armv6 -arch%20armv7"

	OUT="iphoneos-cross" ;;

  *-*-iphoneos)

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

	OUT="iphoneos-cross" ;;

  alpha-*-linux2)

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

	case ${ISA:-generic} in
@@ -669,7 +678,7 @@ case "$GUESSOS" in 
  sun4[uv]*-*-solaris2)

	OUT="solaris-sparcv9-$CC"

	ISA64=`(isalist) 2>/dev/null | grep sparcv9`

	if [ "$ISA64" != "" ]; then

	if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then

	    if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then

		echo "WARNING! If you wish to build 64-bit library, then you have to"

		echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."
@@ -699,13 +708,16 @@ case "$GUESSOS" in 
		fi

	    fi

	fi

	if [ "$ISA64" != "" -a "$KERNEL_BITS" = "64" ]; then

	    OUT="solaris64-sparcv9-$CC"

	fi

	;;

  sun4m-*-solaris2)	OUT="solaris-sparcv8-$CC" ;;

  sun4d-*-solaris2)	OUT="solaris-sparcv8-$CC" ;;

  sun4*-*-solaris2)	OUT="solaris-sparcv7-$CC" ;;

  *86*-*-solaris2)

	ISA64=`(isalist) 2>/dev/null | grep amd64`

	if [ "$ISA64" != "" ]; then

	if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then

	    OUT="solaris64-x86_64-$CC"

	else

	    OUT="solaris-x86-$CC"
@@ -830,7 +842,6 @@ case "$GUESSOS" in 
  *-*-qnx6) OUT="QNX6" ;;

  x86-*-android|i?86-*-android) OUT="android-x86" ;;

  armv[7-9]*-*-android) OUT="android-armv7" ;;

  darwin-whatever-*) OUT=`echo $GUESSOS | sed -e 's/-whatever//'`;;

  *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;

esac

fips/fips_canister.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ const void *FIPS_text_end(void); 
				  defined(__mips__)|| defined(__mips)))	|| \

	(defined(__linux)     && ((defined(__PPC__) && !defined(__PPC64__)) || \

				  defined(__arm__) || defined(__arm)))	|| \

	(defined(__APPLE__) /* verified on all MacOS X & iOS flavors */)|| \

	(defined(_WIN32)      && defined(_MSC_VER))

#  define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE

# endif

fips/fips_premain.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#if defined(__unix) || defined(__unix__) || defined(__vxworks) || defined(__ANDROID__)

#if defined(__unix) || defined(__unix__) || defined(__vxworks) || defined(__ANDROID__) || defined(__APPLE__)

#include <unistd.h>

#endif