projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02a73e2
)
sha1-x86_64.pl: nasm 2.07 screws up labels if AVX path is compiled.
author
Andy Polyakov
<appro@openssl.org>
Mon, 4 Jul 2011 13:00:24 +0000
(13:00 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Mon, 4 Jul 2011 13:00:24 +0000
(13:00 +0000)
crypto/sha/asm/sha1-x86_64.pl
patch
|
blob
|
history
diff --git
a/crypto/sha/asm/sha1-x86_64.pl
b/crypto/sha/asm/sha1-x86_64.pl
index afcfb87a785971d94944ec7e4fd92d595ea058c4..f27c1e3fb031b6a34ea12e59a32ad4778d9c16fb 100755
(executable)
--- 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.0
3
);
+ $1>=2.0
9
);
$avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
`ml64 2>&1` =~ /Version ([0-9]+)\./ &&
$1>=10);