summaryrefslogtreecommitdiffstats
path: root/crypto/poly1305
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-06-16 16:24:55 +0200
committerAndy Polyakov <appro@openssl.org>2018-06-18 19:59:07 +0200
commit27635a4ecb1bc4852ccf456a9374a68931dc330f (patch)
treeb97e790f5cadb69493ffd7127d7e021e5ac4504d /crypto/poly1305
parentsha/asm/sha{1|256}-586.pl: harmonize clang version detection. (diff)
downloadopenssl-27635a4ecb1bc4852ccf456a9374a68931dc330f.tar.xz
openssl-27635a4ecb1bc4852ccf456a9374a68931dc330f.zip
{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)
Diffstat (limited to 'crypto/poly1305')
-rwxr-xr-xcrypto/poly1305/asm/poly1305-x86.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/poly1305/asm/poly1305-x86.pl b/crypto/poly1305/asm/poly1305-x86.pl
index ec1efd93bf..3020d8e81d 100755
--- a/crypto/poly1305/asm/poly1305-x86.pl
+++ b/crypto/poly1305/asm/poly1305-x86.pl
@@ -71,7 +71,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);
}
}