Add some missing cfi frame info in camellia-x86_64.pl

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/10642)

(cherry picked from commit 6b913be708f98b1d971586d38e608218ee6de6fa)

diff --git a/crypto/camellia/asm/cmll-x86_64.pl b/crypto/camellia/asm/cmll-x86_64.pl
index 02c52c3efe47ddf35cbf59cac458abcf269cd73a..ff7bf12f3bdd1366a15b6738a160693f17637d05 100644 (file)
--- a/crypto/camellia/asm/cmll-x86_64.pl
+++ b/crypto/camellia/asm/cmll-x86_64.pl
@@ -125,11 +125,13 @@ $code=<<___;
 .type  Camellia_EncryptBlock,\@abi-omnipotent
 .align 16
 Camellia_EncryptBlock:
+.cfi_startproc
        movl    \$128,%eax
        subl    $arg0d,%eax
        movl    \$3,$arg0d
        adcl    \$0,$arg0d      # keyBitLength==128?3:4
        jmp     .Lenc_rounds
+.cfi_endproc
 .size  Camellia_EncryptBlock,.-Camellia_EncryptBlock
 # V2
 .globl Camellia_EncryptBlock_Rounds
@@ -198,6 +200,7 @@ Camellia_EncryptBlock_Rounds:
 .type  _x86_64_Camellia_encrypt,\@abi-omnipotent
 .align 16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
        xor     0($key),@S[1]
        xor     4($key),@S[0]           # ^=key[0-3]
        xor     8($key),@S[3]
@@ -241,6 +244,7 @@ $code.=<<___;
        mov     $t3,@S[3]
 
        .byte   0xf3,0xc3               # rep ret
+.cfi_endproc
 .size  _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 # V1.x API
@@ -248,11 +252,13 @@ $code.=<<___;
 .type  Camellia_DecryptBlock,\@abi-omnipotent
 .align 16
 Camellia_DecryptBlock:
+.cfi_startproc
        movl    \$128,%eax
        subl    $arg0d,%eax
        movl    \$3,$arg0d
        adcl    \$0,$arg0d      # keyBitLength==128?3:4
        jmp     .Ldec_rounds
+.cfi_endproc
 .size  Camellia_DecryptBlock,.-Camellia_DecryptBlock
 # V2
 .globl Camellia_DecryptBlock_Rounds
@@ -321,6 +327,7 @@ Camellia_DecryptBlock_Rounds:
 .type  _x86_64_Camellia_decrypt,\@abi-omnipotent
 .align 16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
        xor     0($key),@S[1]
        xor     4($key),@S[0]           # ^=key[0-3]
        xor     8($key),@S[3]
@@ -365,6 +372,7 @@ $code.=<<___;
        mov     $t1,@S[3]
 
        .byte   0xf3,0xc3               # rep ret
+.cfi_endproc
 .size  _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 ___