diff options
| author | Andy Polyakov <appro@openssl.org> | 2013-01-22 22:11:31 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2013-01-22 22:54:04 +0100 |
| commit | b286a9681120639e1be36afa9244a2aa16a2bd72 (patch) | |
| tree | 633f1ff991ce3ea9d049f2086d30774e6e5dbb93 /crypto/sha | |
| parent | 2a2df2e9f2b1bcd51a4e2f5964da51463fb86f08 (diff) | |
x86_64 assembly pack: make Windows build more robust [from master].
PR: 2963 and a number of others
Diffstat (limited to 'crypto/sha')
| -rwxr-xr-x | crypto/sha/asm/sha1-x86_64.pl | 3 | ||||
| -rwxr-xr-x | crypto/sha/asm/sha512-x86_64.pl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/sha/asm/sha1-x86_64.pl b/crypto/sha/asm/sha1-x86_64.pl index a9aab3a78c..cfdc45cce6 100755 --- a/crypto/sha/asm/sha1-x86_64.pl +++ b/crypto/sha/asm/sha1-x86_64.pl @@ -82,7 +82,8 @@ $avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) && `ml64 2>&1` =~ /Version ([0-9]+)\./ && $1>=10); -open STDOUT,"| \"$^X\" $xlate $flavour $output"; +open OUT,"| \"$^X\" $xlate $flavour $output"; +*STDOUT=*OUT; $ctx="%rdi"; # 1st arg $inp="%rsi"; # 2nd arg diff --git a/crypto/sha/asm/sha512-x86_64.pl b/crypto/sha/asm/sha512-x86_64.pl index d2b194eb86..8d51678557 100755 --- a/crypto/sha/asm/sha512-x86_64.pl +++ b/crypto/sha/asm/sha512-x86_64.pl @@ -51,7 +51,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or die "can't locate x86_64-xlate.pl"; -open STDOUT,"| \"$^X\" $xlate $flavour $output"; +open OUT,"| \"$^X\" $xlate $flavour $output"; +*STDOUT=*OUT; if ($output =~ /512/) { $func="sha512_block_data_order"; |