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

Remove inconsistency in ARM support. 


This facilitates "universal" builds, ones that target multiple
architectures, e.g. ARMv5 through ARMv7. See commentary in
Configure for details.

Reviewed-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 9e557ab2

Configure

+28 −2
Original line number Diff line number Diff line
@@ -350,8 +350,34 @@ my %table=( 
# throw in -D[BL]_ENDIAN, whichever appropriate...

"linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# It's believed that majority of ARM toolchains predefine appropriate -march.

# If you compiler does not, do complement config command line with one!



#######################################################################

# Note that -march is not among compiler options in below linux-armv4

# target line. Not specifying one is intentional to give you choice to:

#

# a) rely on your compiler default by not specifying one;

# b) specify your target platform explicitly for optimal performance,

#    e.g. -march=armv6 or -march=armv7-a;

# c) build "universal" binary that targets *range* of platforms by

#    specifying minimum and maximum supported architecture;

#

# As for c) option. It actually makes no sense to specify maximum to be

# less than ARMv7, because it's the least requirement for run-time

# switch between platform-specific code paths. And without run-time

# switch performance would be equivalent to one for minimum. Secondly,

# there are some natural limitations that you'd have to accept and

# respect. Most notably you can *not* build "universal" binary for

# big-endian platform. This is because ARMv7 processor always picks

# instructions in little-endian order. Another similar limitation is

# that -mthumb can't "cross" -march=armv6t2 boundary, because that's

# where it became Thumb-2. Well, this limitation is a bit artificial,

# because it's not really impossible, but it's deemed too tricky to

# support. And of course you have to be sure that your binutils are

# actually up to the task of handling maximum target platform. With all

# this in mind here is an example of how to configure "universal" build:

#

#       ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8

#

"linux-armv4",	"gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-aarch64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

# Configure script adds minimally required -march for assembly support,

crypto/aes/asm/aesv8-armx.pl

+5 −3
Original line number Diff line number Diff line
@@ -35,11 +35,13 @@ $prefix="aes_v8"; 
$code=<<___;

#include "arm_arch.h"



#if __ARM_ARCH__>=7

#if __ARM_MAX_ARCH__>=7

.text

___

$code.=".arch	armv8-a+crypto\n"			if ($flavour =~ /64/);

$code.=".fpu	neon\n.code	32\n"	if ($flavour !~ /64/);

$code.=".arch	armv7-a\n.fpu	neon\n.code	32\n"	if ($flavour !~ /64/);

		#^^^^^^ this is done to simplify adoption by not depending

		#	on latest binutils.



# Assembler mnemonics are an eclectic mix of 32- and 64-bit syntax,

# NEON is mostly 32-bit mnemonics, integer - mostly 64. Goal is to

crypto/aes/asm/bsaes-armv7.pl

+5 −3
Original line number Diff line number Diff line
@@ -702,13 +702,17 @@ $code.=<<___; 
# define BSAES_ASM_EXTENDED_KEY

# define XTS_CHAIN_TWEAK

# define __ARM_ARCH__ __LINUX_ARM_ARCH__

# define __ARM_MAX_ARCH__ __LINUX_ARM_ARCH__

#endif



#ifdef __thumb__

# define adrl adr

#endif



#if __ARM_ARCH__>=7

#if __ARM_MAX_ARCH__>=7

.arch	armv7-a

.fpu	neon



.text

.syntax	unified 	@ ARMv7-capable assembler is expected to handle this

#ifdef __thumb2__
@@ -717,8 +721,6 @@ $code.=<<___; 
.code   32

#endif



.fpu	neon



.type	_bsaes_decrypt8,%function

.align	4

_bsaes_decrypt8:

crypto/arm_arch.h

+12 −0
Original line number Diff line number Diff line
@@ -48,6 +48,18 @@ 
# endif

#endif



#if !defined(__ARM_MAX_ARCH__)

# define __ARM_MAX_ARCH__ __ARM_ARCH__

#endif



#if __ARM_MAX_ARCH__<__ARM_ARCH__

# error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__"

#elif __ARM_MAX_ARCH__!=__ARM_ARCH__

# if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__)

#  error "can't build universal big-endian binary"

# endif

#endif



#if !__ASSEMBLER__

extern unsigned int OPENSSL_armcap_P;

#endif

crypto/armcap.c

+6 −1
Original line number Diff line number Diff line
@@ -7,8 +7,12 @@ 


#include "arm_arch.h"



unsigned int OPENSSL_armcap_P;

unsigned int OPENSSL_armcap_P=0;



#if __ARM_MAX_ARCH__<7

void OPENSSL_cpuid_setup(void) {}

unsigned long OPENSSL_rdtsc(void) { return 0; }

#else

static sigset_t all_masked;



static sigjmp_buf ill_jmp;
@@ -155,3 +159,4 @@ void OPENSSL_cpuid_setup(void) 
	sigaction (SIGILL,&ill_oact,NULL);

	sigprocmask(SIG_SETMASK,&oset,NULL);

	}

#endif