summaryrefslogtreecommitdiffstats
path: root/crypto/bn/asm/armv4-gf2m.pl
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2014-06-06 21:27:18 +0200
committerAndy Polyakov <appro@openssl.org>2014-06-06 21:27:18 +0200
commit5dcf70a1c57c2019bfad640fe14fd4a73212860a (patch)
tree0033ec72c6c8080843ceda81aa0a3b37be5f8342 /crypto/bn/asm/armv4-gf2m.pl
parentcd91fd7c32428c0deb503f19b8061e0980476876 (diff)
ARM assembly pack: get ARMv7 instruction endianness right.
Pointer out and suggested by: Ard Biesheuvel.
Diffstat (limited to 'crypto/bn/asm/armv4-gf2m.pl')
-rw-r--r--crypto/bn/asm/armv4-gf2m.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl
index c66495040c..b781afbf89 100644
--- a/crypto/bn/asm/armv4-gf2m.pl
+++ b/crypto/bn/asm/armv4-gf2m.pl
@@ -202,7 +202,7 @@ bn_GF2m_mul_2x2:
veor $r, $r, $t2
vst1.32 {$r}, [r0]
- bx lr
+ ret @ bx lr
.align 4
.Lialu:
#endif
@@ -273,6 +273,7 @@ foreach (split("\n",$code)) {
s/\`([^\`]*)\`/eval $1/geo;
s/\bq([0-9]+)#(lo|hi)/sprintf "d%d",2*$1+($2 eq "hi")/geo or
+ s/\bret\b/bx lr/go or
s/\bbx\s+lr\b/.word\t0xe12fff1e/go; # make it possible to compile with -march=armv4
print $_,"\n";