diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-06-16 16:25:40 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-06-18 20:03:08 +0200 |
| commit | c35608e5422d2718868d88439e22369d4aabb7c6 (patch) | |
| tree | cc95a7ca9e99e6904c51e58bce030de8d00e48e6 | |
| parent | 1d5e1085bdef69a360cb01f10fc03e5ffbc9feaf (diff) | |
ec/asm/ecp_nistz256-avx2.pl: harmonize clang version detection.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6499)
(cherry picked from commit 575045f59fc393abc9d49604d82ccd17c82925fa)
| -rwxr-xr-x | crypto/ec/asm/ecp_nistz256-avx2.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/ec/asm/ecp_nistz256-avx2.pl b/crypto/ec/asm/ecp_nistz256-avx2.pl index 3bdd2cf13f..c5a1f0b79e 100755 --- a/crypto/ec/asm/ecp_nistz256-avx2.pl +++ b/crypto/ec/asm/ecp_nistz256-avx2.pl @@ -67,7 +67,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); |