diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-11-21 11:32:05 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-11-30 13:37:39 +0100 |
| commit | 301a6dcd4590fb2f69d08259577e215b4cc3caa3 (patch) | |
| tree | 872e1928d1feefbbefcf32b051b76b45aedfff04 /crypto/ec | |
| parent | ed02493567390cac6d07447f193fcaac5b219af3 (diff) | |
x86_64 assembly pack: tune clang version detection.
RT#4142
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 76eba0d94bb418325be6409b272eac5e2bd4a0a9)
Resolved conflicts:
crypto/bn/asm/x86_64-mont.pl
crypto/bn/asm/x86_64-mont5.pl
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'crypto/ec')
| -rwxr-xr-x | crypto/ec/asm/ecp_nistz256-x86_64.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/ec/asm/ecp_nistz256-x86_64.pl b/crypto/ec/asm/ecp_nistz256-x86_64.pl index 84379fce1c..648c969be6 100755 --- a/crypto/ec/asm/ecp_nistz256-x86_64.pl +++ b/crypto/ec/asm/ecp_nistz256-x86_64.pl @@ -81,7 +81,7 @@ if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && $addx = ($1>=12); } -if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang 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 $avx = ($ver>=3.0) + ($ver>=3.01); $addx = ($ver>=3.03); |