diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-11-21 11:32:05 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-11-23 16:00:06 +0100 |
| commit | 76eba0d94bb418325be6409b272eac5e2bd4a0a9 (patch) | |
| tree | ff6d0f6606226865e075d4806575e49401a71816 /crypto/modes/asm | |
| parent | Makefile.org: add LC_ALL=C to unify error [and other] messages. (diff) | |
| download | openssl-76eba0d94bb418325be6409b272eac5e2bd4a0a9.tar.xz openssl-76eba0d94bb418325be6409b272eac5e2bd4a0a9.zip | |
x86_64 assembly pack: tune clang version detection.
RT#4142
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/modes/asm')
| -rw-r--r-- | crypto/modes/asm/aesni-gcm-x86_64.pl | 2 | ||||
| -rw-r--r-- | crypto/modes/asm/ghash-x86_64.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/modes/asm/aesni-gcm-x86_64.pl b/crypto/modes/asm/aesni-gcm-x86_64.pl index 608c3f7805..378c0d1685 100644 --- a/crypto/modes/asm/aesni-gcm-x86_64.pl +++ b/crypto/modes/asm/aesni-gcm-x86_64.pl @@ -57,7 +57,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && $avx = ($1>=10) + ($1>=11); } -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); } diff --git a/crypto/modes/asm/ghash-x86_64.pl b/crypto/modes/asm/ghash-x86_64.pl index a63c923429..1e1dae2ae6 100644 --- a/crypto/modes/asm/ghash-x86_64.pl +++ b/crypto/modes/asm/ghash-x86_64.pl @@ -106,7 +106,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && $avx = ($1>=10) + ($1>=11); } -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); } |