Alpha assembler fixed from HEAD.

PR: 2577

diff --git a/crypto/alphacpuid.pl b/crypto/alphacpuid.pl
index c9474ff497521ed7e42c149ce73d80ba969b5c7f..4b3cbb9827d25c40b432b34e08f8f6a7d3c64627 100644 (file)
--- a/crypto/alphacpuid.pl
+++ b/crypto/alphacpuid.pl
@@ -99,19 +99,19 @@ OPENSSL_cleanse:
        beq     $0,.Laligned
 
 .Little:
        beq     $0,.Laligned
 
 .Little:

+       subq    $0,8,$0

        ldq_u   $1,0($16)
        mov     $16,$2
 .Lalign:
        mskbl   $1,$16,$1
        lda     $16,1($16)
        subq    $17,1,$17
        ldq_u   $1,0($16)
        mov     $16,$2
 .Lalign:
        mskbl   $1,$16,$1
        lda     $16,1($16)
        subq    $17,1,$17

-       subq    $0,1,$0
+       addq    $0,1,$0

        beq     $17,.Lout
        bne     $0,.Lalign
 .Lout: stq_u   $1,0($2)
        beq     $17,.Ldone
        bic     $17,7,$at
        beq     $17,.Lout
        bne     $0,.Lalign
 .Lout: stq_u   $1,0($2)
        beq     $17,.Ldone
        bic     $17,7,$at

-       mov     $17,$0

        beq     $at,.Little
 
 .Laligned:
        beq     $at,.Little
 
 .Laligned:


@@ -120,9 +120,7 @@ OPENSSL_cleanse:
        lda     $16,8($16)
        bic     $17,7,$at
        bne     $at,.Laligned
        lda     $16,8($16)
        bic     $17,7,$at
        bne     $at,.Laligned

-       beq     $17,.Ldone
-       mov     $17,$0
-       br      .Little
+       bne     $17,.Little

 .Ldone: ret    ($26)
 .end   OPENSSL_cleanse
 ___
 .Ldone: ret    ($26)
 .end   OPENSSL_cleanse
 ___

diff --git a/crypto/bn/asm/alpha-mont.pl b/crypto/bn/asm/alpha-mont.pl
index c63458e94f8b8a35bbc606e3d7b61b4836b2aa19..03596e2014d4035d02440316cc1cf025f726d772 100644 (file)
--- a/crypto/bn/asm/alpha-mont.pl
+++ b/crypto/bn/asm/alpha-mont.pl
@@ -41,7 +41,7 @@ $j="s4";
 $m1="s5";
 
 $code=<<___;
 $m1="s5";
 
 $code=<<___;

-#indef __linux__
+#ifdef __linux__

 #include <asm/regdef.h>
 #else
 #include <asm.h>
 #include <asm/regdef.h>
 #else
 #include <asm.h>