From 450d9804806a676485b8697cc2989777e3dc0cc8 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Wed, 16 Jun 2021 17:29:52 +1000
Subject: [PATCH] bn: Update .align pseudo-ops to match convention

64-bit alignment at the beginning of functions, 32-bit alignment for
loop targets.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15798)
---
 crypto/bn/asm/ppc64-mont-fixed.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/bn/asm/ppc64-mont-fixed.pl b/crypto/bn/asm/ppc64-mont-fixed.pl
index ba78c968a7..b96f60d5aa 100755
--- a/crypto/bn/asm/ppc64-mont-fixed.pl
+++ b/crypto/bn/asm/ppc64-mont-fixed.pl
@@ -186,6 +186,7 @@ sub mul_mont_fixed($)
 	$self->add_code(<<___);
 
 .globl	.${fname}
+.align	5
 .${fname}:
 	mr	$rp,r3
 
@@ -226,6 +227,7 @@ ___
 	mtctr		$num
 	b		$label->{"enter"}
 
+.align	4
 $label->{"outer"}:
 	ldx		$bpi,$bp,$i
 
@@ -247,6 +249,7 @@ ___
 ___
 
 	$self->add_code(<<___);
+.align	4
 $label->{"enter"}:
 	mulld		$bpi,$tp[0],$n0
 
@@ -561,7 +564,6 @@ my $code;
 $code.=<<___;
 .machine "any"
 .text
-.align	5
 ___
 
 my $mont;