diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-06-16 16:22:19 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-06-18 20:00:58 +0200 |
| commit | 3bce5b05cb31c25ac0a32eaa06f730e67ff32e13 (patch) | |
| tree | fe62d89d4eb7a9bea1742e0de2da96f7593d3284 | |
| parent | f0f0abe7a5c23a00999d69e42362b60e22449c36 (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)
(cherry picked from commit 9e97f61dec312084abe03226e5c962d818c9fc2b)
| -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 46d746b7d0..c9450e791b 100755 --- a/crypto/bn/asm/rsaz-avx2.pl +++ b/crypto/bn/asm/rsaz-avx2.pl @@ -104,7 +104,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); |