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

x86_64 assembly pack: refine clang detection.

parent 7c206db9

crypto/aes/asm/aesni-mb-x86_64.pl

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && 
	$avx = ($1>=10) + ($1>=11);

}



if (!$avx && `$ENV{CC} -v 2>&1` =~ /LLVM ([3-9]\.[0-9]+)/) {

	$avx = ($1>=3.0) + ($1>=3.1);

if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {

	$avx = ($2>=3.0) + ($2>3.0);

}



open OUT,"| \"$^X\" $xlate $flavour $output";

crypto/aes/asm/aesni-sha1-x86_64.pl

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ $avx=1 if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && 
$avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&

	   `ml64 2>&1` =~ /Version ([0-9]+)\./ &&

	   $1>=10);

$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /LLVM ([3-9]\.[0-9]+)/ && $1>=3.0);

$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);



$shaext=1;	### set to zero if compiling for 1.0.1

crypto/aes/asm/aesni-sha256-x86_64.pl

+2 −2
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && 
	$avx = ($1>=10) + ($1>=11);

}



if (!$avx && `$ENV{CC} -v 2>&1` =~ /LLVM ([3-9]\.[0-9]+)/) {

	$avx = ($1>=3.0) + ($1>=3.1);

if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {

	$avx = ($2>=3.0) + ($2>3.0);

}



$shaext=$avx;	### set to zero if compiling for 1.0.1

crypto/bn/asm/rsaz-avx2.pl

+4 −3
Original line number Diff line number Diff line
@@ -93,9 +93,10 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && 
	$addx = ($1>=11);

}



if (!$avx && `$ENV{CC} -v 2>&1` =~ /LLVM ([3-9]\.[0-9]+)/) {

	$avx = ($1>=3.0) + ($1>=3.1);

	$addx = 0;

if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {

	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10

	$avx = ($ver>=3.0) + ($ver>=3.01);

	$addx = ($ver>=3.03);

}



open OUT,"| $^X $xlate $flavour $output";

crypto/bn/asm/rsaz-x86_64.pl

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && 
	$addx = ($1>=11);

}



if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {

	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10

	$addx = ($ver>=3.03);

}



($out, $inp, $mod) = ("%rdi", "%rsi", "%rbp");	# common internal API

{

my ($out,$inp,$mod,$n0,$times) = ("%rdi","%rsi","%rdx","%rcx","%r8d");