diff options
| author | Michael Demeter <michael.demeter@intel.com> | 2014-01-06 16:33:20 -0800 |
|---|---|---|
| committer | Michael Demeter <michael.demeter@intel.com> | 2014-01-06 16:33:20 -0800 |
| commit | 0b88c1d7cf4c147ee9bf9ba3024f6f59a723af77 (patch) | |
| tree | 905ee753cea9b9365f5eba94b96ab1ebe9533eb1 | |
| parent | 9f1edfbdfd8d71e6e2a0639629a981776f1c9e75 (diff) | |
| parent | ecbc968bbf2ed3b1d1fb9cb3576a53c7ae52a0b4 (diff) | |
| download | openssl-0b88c1d7cf4c147ee9bf9ba3024f6f59a723af77.tar.gz openssl-0b88c1d7cf4c147ee9bf9ba3024f6f59a723af77.tar.bz2 openssl-0b88c1d7cf4c147ee9bf9ba3024f6f59a723af77.zip | |
Merge branch 'tizen' of ssh://review.tizen.org/platform/upstream/openssl into tizen
Conflicts:
CHANGES
Makefile
NEWS
README
crypto/bn/asm/x86_64-gf2m.pl
crypto/evp/Makefile
crypto/evp/e_aes_cbc_hmac_sha1.c
crypto/opensslv.h
openssl.spec
packaging/openssl.spec
ssl/s3_cbc.c
ssl/t1_enc.c
Change-Id: Id09ffd68c4ccc805e5797756e312031d12285595
| -rw-r--r-- | crypto/bn/asm/x86_64-gf2m.pl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/bn/asm/x86_64-gf2m.pl b/crypto/bn/asm/x86_64-gf2m.pl index 226c66c..c08dcd0 100644 --- a/crypto/bn/asm/x86_64-gf2m.pl +++ b/crypto/bn/asm/x86_64-gf2m.pl @@ -31,8 +31,12 @@ $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"); |