s390x assembly pack: improve portability.

[openssl.git] / crypto / chacha / asm / chacha-s390x.pl

diff --git a/crypto/chacha/asm/chacha-s390x.pl b/crypto/chacha/asm/chacha-s390x.pl
index c7a26921fea4c48e67df77b75070405629b421c5..c31526473dba4d59059088733fe16cb5fa7756c4 100755 (executable)
--- a/crypto/chacha/asm/chacha-s390x.pl
+++ b/crypto/chacha/asm/chacha-s390x.pl
@@ -147,7 +147,8 @@ $code.=<<___;
 .type  ChaCha20_ctr32,\@function
 .align 32
 ChaCha20_ctr32:
 .type  ChaCha20_ctr32,\@function
 .align 32
 ChaCha20_ctr32:

-       cl${g}ije       $len,0,.Lno_data        # $len==0?
+       lt${g}r $len,$len                       # $len==0?
+       bzr     %r14

        a${g}hi $len,-64
        l${g}hi %r1,-$frame
        stm${g} %r6,%r15,`6*$SIZE_T`($sp)
        a${g}hi $len,-64
        l${g}hi %r1,-$frame
        stm${g} %r6,%r15,`6*$SIZE_T`($sp)


@@ -279,7 +280,6 @@ $code.=<<___;
        stmg    %r0,%r3,$stdframe+4*12($sp)
 
        lm${g}  %r6,%r15,`$frame+6*$SIZE_T`($sp)
        stmg    %r0,%r3,$stdframe+4*12($sp)
 
        lm${g}  %r6,%r15,`$frame+6*$SIZE_T`($sp)

-.Lno_data:

        br      %r14
 
 .align 16
        br      %r14
 
 .align 16