diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2020-08-26 14:00:56 -0400 |
|---|---|---|
| committer | Benjamin Kaduk <bkaduk@akamai.com> | 2020-08-27 20:27:26 -0700 |
| commit | cd84d8832d274357a5ba5433640d7ef76691b1ac (patch) | |
| tree | e8d3b1c729ca6e6e7e637d1c5f4e0ca9200cf2c0 /crypto/chacha/asm/chacha-x86.pl | |
| parent | 4516bf7422223a47f98931c1315985bd9dc303af (diff) | |
Ignore vendor name in Clang version number.
For example, FreeBSD prepends "FreeBSD" to version string, e.g.,
FreeBSD clang version 11.0.0 (git@github.com:llvm/llvm-project.git llvmorg-11.0.0-rc2-0-g414f32a9e86)
Target: x86_64-unknown-freebsd13.0
Thread model: posix
InstalledDir: /usr/bin
This prevented us from properly detecting AVX support, etc.
CLA: trivial
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/12725)
Diffstat (limited to 'crypto/chacha/asm/chacha-x86.pl')
| -rwxr-xr-x | crypto/chacha/asm/chacha-x86.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl index d88e88975b..d0e83d88ce 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|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/ && + `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/ && $2>=3.0); # first version supporting AVX $a="eax"; |