From 72d9cba7cb78ddc9c8ec3f27a9367c407f7d0915 Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Wed, 30 Sep 2015 10:38:38 -0700 Subject: [PATCH] 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 Reviewed-by: Adam Langley --- crypto/aes/asm/aesv8-armx.pl | 2 +- crypto/bn/asm/armv4-mont.pl | 2 +- crypto/sha/asm/sha256-armv4.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl index d770fa3f8..4aa699e1c 100644 --- a/crypto/aes/asm/aesv8-armx.pl +++ b/crypto/aes/asm/aesv8-armx.pl @@ -71,8 +71,8 @@ my ($zero,$rcon,$mask,$in0,$in1,$tmp,$key)= $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 c464a5b49..d9487c7e0 100644 --- a/crypto/bn/asm/armv4-mont.pl +++ b/crypto/bn/asm/armv4-mont.pl @@ -85,8 +85,8 @@ $code=<<___; .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 b293f844a..490c74f23 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -214,10 +214,10 @@ K256: .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