Move .align directives next to their labels for ARM.
2ab24a2d40fd193a25d7c94072596a1180cbb460 added sections to ARM assembly
files. However, in cases where .align directives were not next to the
labels that they were intended to apply to, the section directives would
cause them to be ignored.
Change-Id: I32117f6747ff8545b80c70dd3b8effdc6e6f67e0
Reviewed-on: https://boringssl-review.googlesource.com/6050
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl
index d770fa3..4aa699e 100644
--- a/crypto/aes/asm/aesv8-armx.pl
+++ b/crypto/aes/asm/aesv8-armx.pl
@@ -71,8 +71,8 @@
$code.=<<___;
-.align 5
.pushsection .text.${prefix}_set_encrypt_key,"ax",%progbits
+.align 5
.Lrcon:
.long 0x01,0x01,0x01,0x01
.long 0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d // rotate-n-splat
diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl
index c464a5b..d9487c7 100644
--- a/crypto/bn/asm/armv4-mont.pl
+++ b/crypto/bn/asm/armv4-mont.pl
@@ -85,8 +85,8 @@
.code 32
#if __ARM_MAX_ARCH__>=7
-.align 5
.pushsection .text.bn_mul_mont,"ax",%progbits
+.align 5
.LOPENSSL_armcap:
.word OPENSSL_armcap_P-.Lbn_mul_mont
.popsection
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index b293f84..490c74f 100644
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -214,10 +214,10 @@
.word OPENSSL_armcap_P-.Lsha256_block_data_order
#endif
.popsection
-.align 5
.global sha256_block_data_order
.type sha256_block_data_order,%function
+.align 5
sha256_block_data_order:
.Lsha256_block_data_order:
#if __ARM_ARCH__<7
