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

aes/asm/{aes-armv4|bsaes-armv7}.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 avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/4669)
parent 976b0388

crypto/aes/asm/aes-armv4.pl

+3 −3
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ AES_encrypt: 
#ifndef	__thumb2__

	sub	r3,pc,#8		@ AES_encrypt

#else

	adr	r3,AES_encrypt

	adr	r3,.

#endif

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

#ifdef	__APPLE__
@@ -450,7 +450,7 @@ _armv4_AES_set_encrypt_key: 
#ifndef	__thumb2__

	sub	r3,pc,#8		@ AES_set_encrypt_key

#else

	adr	r3,AES_set_encrypt_key

	adr	r3,.

#endif

	teq	r0,#0

#ifdef	__thumb2__
@@ -976,7 +976,7 @@ AES_decrypt: 
#ifndef	__thumb2__

	sub	r3,pc,#8		@ AES_decrypt

#else

	adr	r3,AES_decrypt

	adr	r3,.

#endif

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

#ifdef	__APPLE__

crypto/aes/asm/bsaes-armv7.pl

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

.align	4

_bsaes_decrypt8:

	adr	$const,_bsaes_decrypt8

	adr	$const,.

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

#ifdef	__APPLE__

	adr	$const,.LM0ISR
@@ -839,7 +839,7 @@ _bsaes_const: 
.type	_bsaes_encrypt8,%function

.align	4

_bsaes_encrypt8:

	adr	$const,_bsaes_encrypt8

	adr	$const,.

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

#ifdef	__APPLE__

	adr	$const,.LM0SR
@@ -947,7 +947,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

#ifdef	__APPLE__

	adr	$const,.LM0