diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-06-16 16:23:34 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-06-18 20:04:42 +0200 |
| commit | 8b4e971f66779193281d6a3bf8ff7535e6ff13b4 (patch) | |
| tree | 572e8785cfa20af6c191d528cce60ee0fec132b9 /crypto | |
| parent | 7c17124650fead2effa32dc6c95c8c155c5615f9 (diff) | |
sha/asm/sha{1|256}-586.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 b55e21b357902959ae8ec0255952402f5ccaa515)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/sha/asm/sha1-586.pl | 2 | ||||
| -rw-r--r-- | crypto/sha/asm/sha256-586.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/sha/asm/sha1-586.pl b/crypto/sha/asm/sha1-586.pl index e0b5d83b62..e29c33a9e3 100644 --- a/crypto/sha/asm/sha1-586.pl +++ b/crypto/sha/asm/sha1-586.pl @@ -131,7 +131,7 @@ $ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32" && `ml 2>&1` =~ /Version ([0-9]+)\./ && $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]+)/ && +$ymm=1 if ($xmm && !$ymm && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0); # first version supporting AVX $shaext=$xmm; ### set to zero if compiling for 1.0.1 diff --git a/crypto/sha/asm/sha256-586.pl b/crypto/sha/asm/sha256-586.pl index e907714381..1c3fb00636 100644 --- a/crypto/sha/asm/sha256-586.pl +++ b/crypto/sha/asm/sha256-586.pl @@ -83,7 +83,7 @@ if ($xmm && !$avx && $ARGV[0] eq "win32" && $avx = ($1>=10) + ($1>=11); } -if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) { +if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) { $avx = ($2>=3.0) + ($2>3.0); } |