[openssl] OpenSSL_1_1_1-stable update

[bernd.edlinger at hotmail.de]

The branch OpenSSL_1_1_1-stable has been updated
       via  d6116a9850f83f02af263ffa850d5510edff516c (commit)
      from  609d24bbd79c4999df9d8c2b3551977cec9b17ce (commit)


- Log -----------------------------------------------------------------
commit d6116a9850f83f02af263ffa850d5510edff516c
Author: H.J. Lu <hongjiu.lu at intel.com>
Date:   Thu Jan 16 13:37:14 2020 -0800

    Fix unwind info in crypto/rc4/asm/rc4-x86_64.pl
    
    Move .cfi_startproc to the right place for RC4.  Add missing
    .cfi_startproc and .cfi_endproc to RC4_options.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/10872)
    
    (cherry picked from commit 967ef73013becef2aec3439f8c45204b24121018)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rc4/asm/rc4-x86_64.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl
index 17f635dfdd..32d842c59f 100755
--- a/crypto/rc4/asm/rc4-x86_64.pl
+++ b/crypto/rc4/asm/rc4-x86_64.pl
@@ -138,11 +138,12 @@ $code=<<___;
 .globl	RC4
 .type	RC4,\@function,4
 .align	16
-RC4:	or	$len,$len
+RC4:
+.cfi_startproc
+	or	$len,$len
 	jne	.Lentry
 	ret
 .Lentry:
-.cfi_startproc
 	push	%rbx
 .cfi_push	%rbx
 	push	%r12
@@ -527,6 +528,7 @@ RC4_set_key:
 .type	RC4_options,\@abi-omnipotent
 .align	16
 RC4_options:
+.cfi_startproc
 	lea	.Lopts(%rip),%rax
 	mov	OPENSSL_ia32cap_P(%rip),%edx
 	bt	\$20,%edx
@@ -539,6 +541,7 @@ RC4_options:
 	add	\$12,%rax
 .Ldone:
 	ret
+.cfi_endproc
 .align	64
 .Lopts:
 .asciz	"rc4(8x,int)"