summaryrefslogtreecommitdiffstats
path: root/crypto/chacha/asm
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/chacha/asm
parentb55e21b357902959ae8ec0255952402f5ccaa515 (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)
Diffstat (limited to 'crypto/chacha/asm')
-rwxr-xr-xcrypto/chacha/asm/chacha-x86.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl
index e177a22242..8508346e85 100755
--- a/crypto/chacha/asm/chacha-x86.pl
+++ b/crypto/chacha/asm/chacha-x86.pl
@@ -62,7 +62,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";