diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-06-24 08:37:05 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-06-27 22:55:22 +0200 |
| commit | 52f856526c46ee80ef4c8c37844f084423a3eff7 (patch) | |
| tree | d0025173940c6d8bc3470c7627860a810c073fb4 /crypto/modes | |
| parent | 912f08dd5ed4f68fb275f3b2db828349fcffba14 (diff) | |
x86_64 assembly pack: addendum to last clang commit.
(cherry picked from commit 7eb048828008f195fb6edceb8f767622694e7426)
Diffstat (limited to 'crypto/modes')
| -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 1ac6b5b845..84d22de5cf 100644 --- a/crypto/modes/asm/aesni-gcm-x86_64.pl +++ b/crypto/modes/asm/aesni-gcm-x86_64.pl @@ -53,7 +53,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && $avx = ($1>=10) + ($1>=11); } -if (!$avx && `$ENV{CC} -v` =~ /LLVM ([3-9]\.[0-9]+)/) { +if (!$avx && `$ENV{CC} -v 2>&1` =~ /LLVM ([3-9]\.[0-9]+)/) { $avx = ($1>=3.0) + ($1>=3.1); } diff --git a/crypto/modes/asm/ghash-x86_64.pl b/crypto/modes/asm/ghash-x86_64.pl index f88af15995..0810c7ab9a 100644 --- a/crypto/modes/asm/ghash-x86_64.pl +++ b/crypto/modes/asm/ghash-x86_64.pl @@ -102,7 +102,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && $avx = ($1>=10) + ($1>=11); } -if (!$avx && `$ENV{CC} -v` =~ /LLVM ([3-9]\.[0-9]+)/) { +if (!$avx && `$ENV{CC} -v 2>&1` =~ /LLVM ([3-9]\.[0-9]+)/) { $avx = ($1>=3.0) + ($1>=3.1); } |