Commit a3762a92 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

modes/asm/ghash-x86_64.pl: refine GNU assembler version detection. 



Even though AVX support was added in GAS 2.19 vpclmulqdq was apparently
added in 2.20.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit d3cdab17)
parent 5361af81

crypto/modes/asm/aesni-gcm-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ die "can't locate x86_64-xlate.pl"; 


if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`

		=~ /GNU assembler version ([2-9]\.[0-9]+)/) {

	$avx = ($1>=2.19) + ($1>=2.22);

	$avx = ($1>=2.20) + ($1>=2.22);

}



if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&

crypto/modes/asm/ghash-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ die "can't locate x86_64-xlate.pl"; 


if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`

		=~ /GNU assembler version ([2-9]\.[0-9]+)/) {

	$avx = ($1>=2.19) + ($1>=2.22);

	$avx = ($1>=2.20) + ($1>=2.22);

}



if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&