diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-12-14 13:38:04 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-12-15 17:57:50 +0100 |
| commit | 1ea01427c5195dafa4f00202237c5b7a389f034b (patch) | |
| tree | 0ef1be659d0f5468a60b7b983e77ff38e090e351 /crypto/poly1305 | |
| parent | perlasm/x86_64-xlate.pl: add support for AVX512 OPMASK-ing. (diff) | |
| download | openssl-1ea01427c5195dafa4f00202237c5b7a389f034b.tar.xz openssl-1ea01427c5195dafa4f00202237c5b7a389f034b.zip | |
poly1305/asm/poly1305-x86_64.pl: allow nasm to assemble AVX512 code.
chacha/asm/chacha-x86_64.pl: refine nasm version detection logic.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/poly1305')
| -rwxr-xr-x | crypto/poly1305/asm/poly1305-x86_64.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl index 2c9982cc68..baf3c75d51 100755 --- a/crypto/poly1305/asm/poly1305-x86_64.pl +++ b/crypto/poly1305/asm/poly1305-x86_64.pl @@ -66,8 +66,9 @@ if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` } if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && - `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) { - $avx = ($1>=2.09) + ($1>=2.10); + `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) { + $avx = ($1>=2.09) + ($1>=2.10) + ($1>=2.12); + $avx += 1 if ($1==2.11 && $2>=8); } if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && |