]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Add some missing cfi frame info in aesni-gcm-x86_64.S
authorAttila Fülöp <attila@fueloep.org>
Fri, 30 Oct 2020 22:23:18 +0000 (23:23 +0100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 30 Oct 2020 23:06:00 +0000 (16:06 -0700)
While preparing #9749 some .cfi_{start,end}proc directives
were missed. Add the missing ones.

See upstream https://github.com/openssl/openssl/commit/275a048f

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Attila Fülöp <attila@fueloep.org>
Closes #11101

module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S

index ed9f660fce5b39249c18596de540aabc9c05bd5c..4e05255728f707455738b658ac15de34836ba1ea 100644 (file)
@@ -55,6 +55,7 @@
 .type  _aesni_ctr32_ghash_6x,@function
 .align 32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
        vmovdqu 32(%r11),%xmm2
        subq    $6,%rdx
        vpxor   %xmm4,%xmm4,%xmm4
@@ -363,12 +364,14 @@ _aesni_ctr32_ghash_6x:
        vpxor   %xmm4,%xmm8,%xmm8
 
        .byte   0xf3,0xc3
+.cfi_endproc
 .size  _aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 #endif /* ifdef HAVE_MOVBE */
 
 .type  _aesni_ctr32_ghash_no_movbe_6x,@function
 .align 32
 _aesni_ctr32_ghash_no_movbe_6x:
+.cfi_startproc
        vmovdqu 32(%r11),%xmm2
        subq    $6,%rdx
        vpxor   %xmm4,%xmm4,%xmm4
@@ -689,6 +692,7 @@ _aesni_ctr32_ghash_no_movbe_6x:
        vpxor   %xmm4,%xmm8,%xmm8
 
        .byte   0xf3,0xc3
+.cfi_endproc
 .size  _aesni_ctr32_ghash_no_movbe_6x,.-_aesni_ctr32_ghash_no_movbe_6x
 
 .globl aesni_gcm_decrypt
@@ -807,6 +811,7 @@ aesni_gcm_decrypt:
 .type  _aesni_ctr32_6x,@function
 .align 32
 _aesni_ctr32_6x:
+.cfi_startproc
        vmovdqu 0-128(%rcx),%xmm4
        vmovdqu 32(%r11),%xmm2
        leaq    -2(%rbp),%r13   // ICP uses 10,12,14 not 9,11,13 for rounds.
@@ -893,6 +898,7 @@ _aesni_ctr32_6x:
        vpshufb %xmm0,%xmm1,%xmm1
        vpxor   %xmm4,%xmm14,%xmm14
        jmp     .Loop_ctr32
+.cfi_endproc
 .size  _aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl aesni_gcm_encrypt