diff options
| author | Andy Polyakov <appro@openssl.org> | 2013-12-28 12:17:08 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2013-12-28 12:18:11 +0100 |
| commit | d7d7e7b038d2386f6b1832b035f8641949f3eb04 (patch) | |
| tree | 7e9268b9b4a598810ee6aabf27d7e3cc9bb19c54 | |
| parent | 80b6d97585511931d7e5d1cbf24bd19f34d88bda (diff) | |
ARM assembly pack: make it work with older toolchain.
(cherry picked from commit 2218c296b4981af6f2639bbd7eabfb89437fe776)
| -rw-r--r-- | crypto/bn/Makefile | 3 | ||||
| -rw-r--r-- | crypto/sha/asm/sha256-armv4.pl | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile index d3e408cbce..af23cef92a 100644 --- a/crypto/bn/Makefile +++ b/crypto/bn/Makefile @@ -140,9 +140,10 @@ alpha-mont.s: asm/alpha-mont.pl $(CC) -E $$preproc > $@ && rm $$preproc) # GNU make "catch all" -%-mont.s: asm/%-mont.pl; $(PERL) $< $(PERLASM_SCHEME) $@ +%-mont.S: asm/%-mont.pl; $(PERL) $< $(PERLASM_SCHEME) $@ %-gf2m.S: asm/%-gf2m.pl; $(PERL) $< $(PERLASM_SCHEME) $@ +armv4-mont.o: armv4-mont.S armv4-gf2m.o: armv4-gf2m.S files: diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl index 2a0a98947e..672e571ed5 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -104,10 +104,10 @@ $code.=<<___; eor $t2,$a,$b @ a^b, b^c in next round ldr $t4,[sp,#`($i+15)%16`*4] @ from future BODY_16_xx #endif - eor $t0,$a,ror#$Sigma0[1] + eor $t0,$t0,$a,ror#$Sigma0[1] and $t3,$t3,$t2 @ (b^c)&=(a^b) add $d,$d,$h @ d+=h - eor $t0,$a,ror#$Sigma0[2] @ Sigma0(a) + eor $t0,$t0,$a,ror#$Sigma0[2] @ Sigma0(a) eor $t3,$t3,$b @ Maj(a,b,c) add $h,$h,$t0 @ h+=Sigma0(a) @ add $h,$h,$t3 @ h+=Maj(a,b,c) |