From: Shane Lontis <shane.lontis@oracle.com>
Date: Tue, 19 Feb 2019 03:56:33 +0000 (+1000)
Subject: cfi build fixes in x86-64 ghash assembly
X-Git-Tag: OpenSSL_1_1_1c~127
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dbb1340314fcec37662d79720e6566fdd5a232e8;p=oweals%2Fopenssl.git

cfi build fixes in x86-64 ghash assembly

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8281)

(cherry picked from commit 54d00677f305375eee65a0c9edb5f0980c5f020f)
---

diff --git a/crypto/modes/asm/ghash-x86_64.pl b/crypto/modes/asm/ghash-x86_64.pl
index 30158aa076..6b2a51ecd7 100644
--- a/crypto/modes/asm/ghash-x86_64.pl
+++ b/crypto/modes/asm/ghash-x86_64.pl
@@ -1155,6 +1155,7 @@ ___
 } else {
 $code.=<<___;
 	jmp	.L_init_clmul
+.cfi_endproc
 .size	gcm_init_avx,.-gcm_init_avx
 ___
 }
@@ -1594,6 +1595,7 @@ ___
 } else {
 $code.=<<___;
 	jmp	.L_ghash_clmul
+.cfi_endproc
 .size	gcm_ghash_avx,.-gcm_ghash_avx
 ___
 }