Commit 1ea01427 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
parent 526ab896

crypto/chacha/asm/chacha-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

crypto/poly1305/asm/poly1305-x86_64.pl

+3 −2
Original line number Diff line number Diff line
@@ -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/) &&