diff options
| author | Andy Polyakov <appro@openssl.org> | 2017-02-13 18:16:16 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-02-15 23:17:12 +0100 |
| commit | c04b1434e6741cfc6b6c29db2c34b46f5ccd3d99 (patch) | |
| tree | 60bfddf8fb3f3af9b0e5269b94f7dd4ad4a2805f /crypto/aes | |
| parent | c9c1a63d58c7950484347d153a2150b4587e7a53 (diff) | |
ARMv4 assembly pack: harmonize Thumb-ification of iOS build.
Three modules were left behind in a285992763f3961f69a8d86bf7dfff020a08cef9.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2617)
(cherry picked from commit c93f06c12f10c07cea935abd78a07a037e27f155)
Diffstat (limited to 'crypto/aes')
| -rwxr-xr-x | crypto/aes/asm/aesv8-armx.pl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl index 9246dbb437..1782d5b414 100755 --- a/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/aes/asm/aesv8-armx.pl @@ -59,9 +59,12 @@ $code=<<___; .text ___ $code.=".arch armv8-a+crypto\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. +$code.=<<___ if ($flavour !~ /64/); +.arch armv7-a // don't confuse not-so-latest binutils with argv8 :-) +.fpu neon +.code 32 +#undef __thumb2__ +___ # Assembler mnemonics are an eclectic mix of 32- and 64-bit syntax, # NEON is mostly 32-bit mnemonics, integer - mostly 64. Goal is to |