diff options
| author | Andy Polyakov <appro@openssl.org> | 2017-11-03 23:30:01 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-11-05 16:56:32 +0100 |
| commit | b82acc3c1a7f304c9df31841753a0fa76b5b3cda (patch) | |
| tree | 2f5205c139a7f98424048da6d09a74e94ad39721 /crypto/aes | |
| parent | Conditionalize fuzz tests on feature macros (diff) | |
| download | openssl-b82acc3c1a7f304c9df31841753a0fa76b5b3cda.tar.xz openssl-b82acc3c1a7f304c9df31841753a0fa76b5b3cda.zip | |
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: Tim Hudson <tjh@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/4669)
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/asm/aes-armv4.pl | 6 | ||||
| -rw-r--r-- | crypto/aes/asm/bsaes-armv7.pl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl index 16d79aae53..c6474b8aad 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -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__ diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl index cc34859a0d..0c5e762ac2 100644 --- a/crypto/aes/asm/bsaes-armv7.pl +++ b/crypto/aes/asm/bsaes-armv7.pl @@ -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 |