diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-06-24 08:37:05 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-06-24 08:37:05 +0200 |
| commit | 7eb048828008f195fb6edceb8f767622694e7426 (patch) | |
| tree | ab39968a88362752e1f289d350de904576384528 /crypto/aes | |
| parent | ac171925ab527a55fbb27872ff69af94f7ec995b (diff) | |
x86_64 assembly pack: addendum to last clang commit.
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/asm/aesni-mb-x86_64.pl | 2 | ||||
| -rw-r--r-- | crypto/aes/asm/aesni-sha1-x86_64.pl | 2 | ||||
| -rw-r--r-- | crypto/aes/asm/aesni-sha256-x86_64.pl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/aes/asm/aesni-mb-x86_64.pl b/crypto/aes/asm/aesni-mb-x86_64.pl index d6ee866087..9116697708 100644 --- a/crypto/aes/asm/aesni-mb-x86_64.pl +++ b/crypto/aes/asm/aesni-mb-x86_64.pl @@ -63,7 +63,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/aes/asm/aesni-sha1-x86_64.pl b/crypto/aes/asm/aesni-sha1-x86_64.pl index 92f34618d4..11b249c17d 100644 --- a/crypto/aes/asm/aesni-sha1-x86_64.pl +++ b/crypto/aes/asm/aesni-sha1-x86_64.pl @@ -94,7 +94,7 @@ $avx=1 if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && $avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && `ml64 2>&1` =~ /Version ([0-9]+)\./ && $1>=10); -$avx=1 if (!$avx && `$ENV{CC} -v` =~ /LLVM ([3-9]\.[0-9]+)/ && $1>=3.0); +$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /LLVM ([3-9]\.[0-9]+)/ && $1>=3.0); $shaext=1; ### set to zero if compiling for 1.0.1 diff --git a/crypto/aes/asm/aesni-sha256-x86_64.pl b/crypto/aes/asm/aesni-sha256-x86_64.pl index 96b44f340e..5bc0940e9e 100644 --- a/crypto/aes/asm/aesni-sha256-x86_64.pl +++ b/crypto/aes/asm/aesni-sha256-x86_64.pl @@ -59,7 +59,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); } |