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/rc4 | |
| 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/rc4')
| -rw-r--r-- | crypto/rc4/asm/rc4-md5-x86_64.pl | 3 | ||||
| -rwxr-xr-x | crypto/rc4/asm/rc4-x86_64.pl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crypto/rc4/asm/rc4-md5-x86_64.pl b/crypto/rc4/asm/rc4-md5-x86_64.pl index 87e737c546..272fa91e1a 100644 --- a/crypto/rc4/asm/rc4-md5-x86_64.pl +++ b/crypto/rc4/asm/rc4-md5-x86_64.pl @@ -51,7 +51,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; my $dir=$1; my $xlate; ( $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; my ($dat,$in0,$out,$ctx,$inp,$len, $func,$nargs); diff --git a/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl index 28bb3624ad..75750dbf33 100755 --- a/crypto/rc4/asm/rc4-x86_64.pl +++ b/crypto/rc4/asm/rc4-x86_64.pl @@ -112,7 +112,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; $dat="%rdi"; # arg1 $len="%rsi"; # arg2 |