The branch master has been updated
via 967ef73013becef2aec3439f8c45204b24121018 (commit)
from 068489a27f74c5f5a779aef4618e68e46db746d4 (commit)
- Log -----------------------------------------------------------------
commit 967ef73013becef2aec3439f8c45204b24121018
Author: H.J. Lu <[email protected]>
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 <[email protected]>
Reviewed-by: Shane Lontis <[email protected]>
Reviewed-by: Bernd Edlinger <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/10872)
-----------------------------------------------------------------------
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 7c0f1a4cb7..9572f77378 100755
--- a/crypto/rc4/asm/rc4-x86_64.pl
+++ b/crypto/rc4/asm/rc4-x86_64.pl
@@ -140,11 +140,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
@@ -529,6 +530,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
@@ -541,6 +543,7 @@ RC4_options:
add \$12,%rax
.Ldone:
ret
+.cfi_endproc
.align 64
.Lopts:
.asciz "rc4(8x,int)"
