diff options
| -rw-r--r-- | crypto/bn/asm/x86_64-gf2m.pl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/bn/asm/x86_64-gf2m.pl b/crypto/bn/asm/x86_64-gf2m.pl index c08dcd0..226c66c 100644 --- a/crypto/bn/asm/x86_64-gf2m.pl +++ b/crypto/bn/asm/x86_64-gf2m.pl @@ -31,12 +31,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or die "can't locate x86_64-xlate.pl"; -<<<<<<< HEAD open OUT,"| \"$^X\" $xlate $flavour $output"; *STDOUT=*OUT; -======= -open STDOUT,"| \"$^X\" $xlate $flavour $output"; ->>>>>>> ecbc968bbf2ed3b1d1fb9cb3576a53c7ae52a0b4 ($lo,$hi)=("%rax","%rdx"); $a=$lo; ($i0,$i1)=("%rsi","%rdi"); |