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

{aes-armv4|bsaes-armv7|sha256-armv4}.pl: make it work with binutils-2.29 



It's not clear if it's a feature or bug, but binutils-2.29[.1]
interprets 'adr' instruction with Thumb2 code reference differently,
in a way that affects calculation of addresses of constants' tables.

Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: default avatarKurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/4673)
parent 565a53f3

crypto/aes/asm/aes-armv4.pl

+3 −3
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ AES_encrypt: 
#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ AES_encrypt

#else

	adr	r3,AES_encrypt

	adr	r3,.

#endif

	stmdb   sp!,{r1,r4-r12,lr}

	mov	$rounds,r0		@ inp
@@ -430,7 +430,7 @@ _armv4_AES_set_encrypt_key: 
#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ AES_set_encrypt_key

#else

	adr	r3,private_AES_set_encrypt_key

	adr	r3,.

#endif

	teq	r0,#0

#if __ARM_ARCH__>=7
@@ -952,7 +952,7 @@ AES_decrypt: 
#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ AES_decrypt

#else

	adr	r3,AES_decrypt

	adr	r3,.

#endif

	stmdb   sp!,{r1,r4-r12,lr}

	mov	$rounds,r0		@ inp

crypto/aes/asm/bsaes-armv7.pl

+3 −3
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ $code.=<<___; 
.type	_bsaes_decrypt8,%function

.align	4

_bsaes_decrypt8:

	adr	$const,_bsaes_decrypt8

	adr	$const,.

	vldmia	$key!, {@XMM[9]}		@ round 0 key

	add	$const,$const,#.LM0ISR-_bsaes_decrypt8
@@ -819,7 +819,7 @@ _bsaes_const: 
.type	_bsaes_encrypt8,%function

.align	4

_bsaes_encrypt8:

	adr	$const,_bsaes_encrypt8

	adr	$const,.

	vldmia	$key!, {@XMM[9]}		@ round 0 key

	sub	$const,$const,#_bsaes_encrypt8-.LM0SR
@@ -923,7 +923,7 @@ $code.=<<___; 
.type	_bsaes_key_convert,%function

.align	4

_bsaes_key_convert:

	adr	$const,_bsaes_key_convert

	adr	$const,.

	vld1.8	{@XMM[7]},  [$inp]!		@ load round 0 key

	sub	$const,$const,#_bsaes_key_convert-.LM0

	vld1.8	{@XMM[15]}, [$inp]!		@ load round 1 key

crypto/sha/asm/sha256-armv4.pl

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ sha256_block_data_order: 
#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ sha256_block_data_order

#else

	adr	r3,sha256_block_data_order

	adr	r3,.

#endif

#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)

	ldr	r12,.LOPENSSL_armcap