From 1ea01427c5195dafa4f00202237c5b7a389f034b Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 14 Dec 2016 13:38:04 +0100 Subject: 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 --- crypto/chacha/asm/chacha-x86_64.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/chacha') diff --git a/crypto/chacha/asm/chacha-x86_64.pl b/crypto/chacha/asm/chacha-x86_64.pl index 7153d82e12..a32d3dc53b 100755 --- a/crypto/chacha/asm/chacha-x86_64.pl +++ b/crypto/chacha/asm/chacha-x86_64.pl @@ -66,7 +66,7 @@ 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]+)/) { + `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); } -- cgit v1.2.3