diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-06-16 16:24:55 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-06-18 20:01:48 +0200 |
| commit | 1d5e1085bdef69a360cb01f10fc03e5ffbc9feaf (patch) | |
| tree | a7154b53b8adbbd366c07e62e453ecd9ea79860e | |
| parent | 0e41c2a309509599478e5bdffd877e4d4f635308 (diff) | |
{chacha|poly1305}/asm/*-x64.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 27635a4ecb1bc4852ccf456a9374a68931dc330f)
| -rwxr-xr-x | crypto/chacha/asm/chacha-x86.pl | 2 | ||||
| -rwxr-xr-x | crypto/poly1305/asm/poly1305-x86.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl index 61b328612b..db2b43bd55 100755 --- a/crypto/chacha/asm/chacha-x86.pl +++ b/crypto/chacha/asm/chacha-x86.pl @@ -61,7 +61,7 @@ $ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32" && $1>=10); # first version supporting AVX $ymm=1 if ($xmm && !$ymm && - `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && + `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0); # first version supporting AVX $a="eax"; diff --git a/crypto/poly1305/asm/poly1305-x86.pl b/crypto/poly1305/asm/poly1305-x86.pl index ab24dfcfad..8b30fda615 100755 --- a/crypto/poly1305/asm/poly1305-x86.pl +++ b/crypto/poly1305/asm/poly1305-x86.pl @@ -70,7 +70,7 @@ if ($sse2) { $avx = ($1>=2.09) + ($1>=2.10); } - 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]+)/) { $avx = ($2>=3.0) + ($2>3.0); } } |