diff options
| author | Andy Polyakov <appro@openssl.org> | 2017-11-05 17:08:16 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-11-07 20:34:30 +0100 |
| commit | d1d6c69b6fd25e71dbae67fad17b2c7737f6b2dc (patch) | |
| tree | 40ce9fc8dab768166328009a10820b8c408f9838 /crypto/sha | |
| parent | 565a53f35cb7a40b4e551f5c63672020eb4809c8 (diff) | |
{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: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/4673)
Diffstat (limited to 'crypto/sha')
| -rw-r--r-- | crypto/sha/asm/sha256-armv4.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl index 4fee74d832..750216eb42 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -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 |