summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2011-07-04 13:00:24 +0000
committerAndy Polyakov <appro@openssl.org>2011-07-04 13:00:24 +0000
commit169a274a41ed7eed96b3e2740ab54865a8cabe68 (patch)
treeff4e8ccb88ff76d41a6d1de4f5ad4f1970fcc41b /crypto
parent02a73e2bed57cea55e3defa3ae040f8f166e327e (diff)
sha1-x86_64.pl: nasm 2.07 screws up labels if AVX path is compiled.
Diffstat (limited to 'crypto')
-rwxr-xr-xcrypto/sha/asm/sha1-x86_64.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sha/asm/sha1-x86_64.pl b/crypto/sha/asm/sha1-x86_64.pl
index afcfb87a78..f27c1e3fb0 100755
--- a/crypto/sha/asm/sha1-x86_64.pl
+++ b/crypto/sha/asm/sha1-x86_64.pl
@@ -77,7 +77,7 @@ $avx=1 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
$1>=2.19);
$avx=1 if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
`nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ &&
- $1>=2.03);
+ $1>=2.09);
$avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
`ml64 2>&1` =~ /Version ([0-9]+)\./ &&
$1>=10);