diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-06-16 16:22:19 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-06-18 19:58:35 +0200 |
| commit | 9e97f61dec312084abe03226e5c962d818c9fc2b (patch) | |
| tree | f56ef5eb305fd51fee7c79c6a080cec1c71080b8 | |
| parent | a47f0a8507e054f8707129bf33455effd7201358 (diff) | |
bn/asm/rsaz-avx2.pl: harmonize clang version detection.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6499)
| -rwxr-xr-x | crypto/bn/asm/rsaz-avx2.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/bn/asm/rsaz-avx2.pl b/crypto/bn/asm/rsaz-avx2.pl index 8c56a91484..154a762d01 100755 --- a/crypto/bn/asm/rsaz-avx2.pl +++ b/crypto/bn/asm/rsaz-avx2.pl @@ -66,7 +66,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && $addx = ($1>=11); } -if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang 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]+)/) { 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); |