From: Adam Langley <agl@chromium.org>
Date: Thu, 9 Feb 2017 20:02:08 +0000 (-0800)
Subject: Fix copy-pasteism in CFI directives.
X-Git-Tag: OpenSSL_1_1_1-pre1~2440
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=3f55ec6792dde6359a915f12aa0c792212bd954f

Fix copy-pasteism in CFI directives.

I don't think this actually affects anything since the cfi_restore
directives aren't strictly needed anyway. (The old values are still in
memory so either will do.)

CLA: trivial

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2582)
---

diff --git a/crypto/bn/asm/x86_64-mont.pl b/crypto/bn/asm/x86_64-mont.pl
index cf3daa2bb5..a4da3de7fa 100755
--- a/crypto/bn/asm/x86_64-mont.pl
+++ b/crypto/bn/asm/x86_64-mont.pl
@@ -1381,15 +1381,15 @@ $code.=<<___;
 	mov	-48(%rsi),%r15
 .cfi_restore	%r15
 	mov	-40(%rsi),%r14
-.cfi_restore	%r15
+.cfi_restore	%r14
 	mov	-32(%rsi),%r13
-.cfi_restore	%r15
+.cfi_restore	%r13
 	mov	-24(%rsi),%r12
-.cfi_restore	%r15
+.cfi_restore	%r12
 	mov	-16(%rsi),%rbp
-.cfi_restore	%r15
+.cfi_restore	%rbp
 	mov	-8(%rsi),%rbx
-.cfi_restore	%r15
+.cfi_restore	%rbx
 	lea	(%rsi),%rsp
 .cfi_def_cfa_register	%rsp
 .Lmulx4x_epilogue:
diff --git a/crypto/bn/asm/x86_64-mont5.pl b/crypto/bn/asm/x86_64-mont5.pl
index 1bf994286d..7ed22326bd 100755
--- a/crypto/bn/asm/x86_64-mont5.pl
+++ b/crypto/bn/asm/x86_64-mont5.pl
@@ -446,15 +446,15 @@ $code.=<<___;
 	mov	-48(%rsi),%r15
 .cfi_restore	%r15
 	mov	-40(%rsi),%r14
-.cfi_restore	%r15
+.cfi_restore	%r14
 	mov	-32(%rsi),%r13
-.cfi_restore	%r15
+.cfi_restore	%r13
 	mov	-24(%rsi),%r12
-.cfi_restore	%r15
+.cfi_restore	%r12
 	mov	-16(%rsi),%rbp
-.cfi_restore	%r15
+.cfi_restore	%rbp
 	mov	-8(%rsi),%rbx
-.cfi_restore	%r15
+.cfi_restore	%rbx
 	lea	(%rsi),%rsp
 .cfi_def_cfa_register	%rsp
 .Lmul_epilogue: