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

x86_64 assembly pack: tune clang version detection even further. 



RT#4171

Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
(cherry picked from commit b9749432)
parent 3cd33c42

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 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {

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

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

}

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` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);

$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) 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

+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>=12);

}



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

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

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

}

crypto/bn/asm/rsaz-x86_64.pl

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

}



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

if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) 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);

}

crypto/bn/asm/x86_64-mont.pl

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

}



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

if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) 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);

}