SPARCv9 assembler pack: refine CPU detection on Linux, fix for "unaligned

[oweals/openssl.git] / crypto / sha / asm / sha1-armv4-large.pl

diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl
index 102cf0372522e3e75822a1a698d6e7bcc2f65e25..88861af64116195bb074691243d6bdcac1354ad8 100644 (file)
--- a/crypto/sha/asm/sha1-armv4-large.pl
+++ b/crypto/sha/asm/sha1-armv4-large.pl
@@ -205,12 +205,12 @@ $code.=<<___;
        b       .L_20_39_or_60_79       @ [+4], spare 300 bytes
 .L_done:
        add     sp,sp,#80*4             @ "deallocate" stack frame
-       ldmia   $ctx,{$K,$t0,$t1,$t2,$Xi}
+       ldmia   $ctx,{$K,$t0,$t1,$t2,$t3}
        add     $a,$K,$a
        add     $b,$t0,$b
        add     $c,$t1,$c,ror#2
        add     $d,$t2,$d,ror#2
-       add     $e,$Xi,$e,ror#2
+       add     $e,$t3,$e,ror#2
        stmia   $ctx,{$a,$b,$c,$d,$e}
        teq     $inp,$len
        bne     .Lloop                  @ [+18], total 1307
@@ -226,6 +226,7 @@ $code.=<<___;
 .LK_60_79:     .word   0xca62c1d6
 .size  sha1_block_data_order,.-sha1_block_data_order
 .asciz "SHA1 block transform for ARMv4, CRYPTOGAMS by <appro\@openssl.org>"
+.align 2
 ___
 
 $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm;   # make it possible to compile with -march=armv4