From: Andy Polyakov <appro@openssl.org>
Date: Mon, 4 Jul 2011 13:00:24 +0000 (+0000)
Subject: sha1-x86_64.pl: nasm 2.07 screws up labels if AVX path is compiled.
X-Git-Tag: OpenSSL-fips-2_0-rc1~270
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=169a274a41ed7eed96b3e2740ab54865a8cabe68;p=oweals%2Fopenssl.git

sha1-x86_64.pl: nasm 2.07 screws up labels if AVX path is compiled.
---

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);