diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-24 11:12:30 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-24 11:12:30 +0200 |
| commit | eb7891f0af9b787202e91e903b612eb2467ca870 (patch) | |
| tree | dd2ad0eac533dca54f6ae2231430052bf8860a9d /main/openssl/crypto/sha/asm/sha512-armv4.pl | |
| parent | 830aec478ff774bf8beeb321f5f67a08a133e95f (diff) | |
Update OpenSSL to aosp/master
--HG--
extra : amend_source : 1d737bc919a18f072b1038b548a2cbad4cf76e22
Diffstat (limited to 'main/openssl/crypto/sha/asm/sha512-armv4.pl')
| -rw-r--r-- | main/openssl/crypto/sha/asm/sha512-armv4.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/openssl/crypto/sha/asm/sha512-armv4.pl b/main/openssl/crypto/sha/asm/sha512-armv4.pl index 7faf37b1..71aa9356 100644 --- a/main/openssl/crypto/sha/asm/sha512-armv4.pl +++ b/main/openssl/crypto/sha/asm/sha512-armv4.pl @@ -565,7 +565,7 @@ $code.=<<___; bne .Loop_neon vldmia sp!,{d8-d15} @ epilogue - bx lr + ret @ bx lr #endif ___ } @@ -578,5 +578,6 @@ ___ $code =~ s/\`([^\`]*)\`/eval $1/gem; $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm; # make it possible to compile with -march=armv4 +$code =~ s/\bret\b/bx lr/gm; print $code; close STDOUT; # enforce flush |