Commit 52f85652 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

x86_64 assembly pack: addendum to last clang commit. 

(cherry picked from commit 7eb04882)
parent 912f08dd

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

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

}



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

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

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

}

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` =~ /LLVM ([3-9]\.[0-9]+)/ && $1>=3.0);

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



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

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

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

}



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

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

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

}

crypto/bn/asm/rsaz-avx2.pl

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

}



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

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

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

}

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

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

}



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

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

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

}