From b8e2d6327a71240bfe94eba8469c49c3c049ef6b Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Tue, 7 Nov 2017 16:18:35 -0500 Subject: [PATCH] es/asm/{aes-armv4|bsaes-armv7}.pl: make it work with binutils-2.29. It's not clear if it's a feature or bug, but binutils-2.29[.1] interprets 'adr' instruction with Thumb2 code reference differently, in a way that affects calculation of addresses of constants' tables. (Imported from upstream's b82acc3c1a7f304c9df31841753a0fa76b5b3cda.) Change-Id: Ia0f5233a9fcfaf18b9d1164bf1c88217c0cbb60d Reviewed-on: https://boringssl-review.googlesource.com/22724 Commit-Queue: Steven Valdez Reviewed-by: Steven Valdez CQ-Verified: CQ bot account: commit-bot@chromium.org --- crypto/fipsmodule/aes/asm/aes-armv4.pl | 6 +++--- crypto/fipsmodule/aes/asm/bsaes-armv7.pl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crypto/fipsmodule/aes/asm/aes-armv4.pl b/crypto/fipsmodule/aes/asm/aes-armv4.pl index 06f009c4f..c34d3dce6 100644 --- a/crypto/fipsmodule/aes/asm/aes-armv4.pl +++ b/crypto/fipsmodule/aes/asm/aes-armv4.pl @@ -200,7 +200,7 @@ asm_AES_encrypt: #ifndef __thumb2__ sub r3,pc,#8 @ asm_AES_encrypt #else - adr r3,asm_AES_encrypt + adr r3,. #endif stmdb sp!,{r1,r4-r12,lr} #ifdef __APPLE__ @@ -450,7 +450,7 @@ _armv4_AES_set_encrypt_key: #ifndef __thumb2__ sub r3,pc,#8 @ asm_AES_set_encrypt_key #else - adr r3,asm_AES_set_encrypt_key + adr r3,. #endif teq r0,#0 #ifdef __thumb2__ @@ -976,7 +976,7 @@ asm_AES_decrypt: #ifndef __thumb2__ sub r3,pc,#8 @ asm_AES_decrypt #else - adr r3,asm_AES_decrypt + adr r3,. #endif stmdb sp!,{r1,r4-r12,lr} #ifdef __APPLE__ diff --git a/crypto/fipsmodule/aes/asm/bsaes-armv7.pl b/crypto/fipsmodule/aes/asm/bsaes-armv7.pl index 895a26961..1ff890aa1 100644 --- a/crypto/fipsmodule/aes/asm/bsaes-armv7.pl +++ b/crypto/fipsmodule/aes/asm/bsaes-armv7.pl @@ -744,7 +744,7 @@ $code.=<<___; .type _bsaes_decrypt8,%function .align 4 _bsaes_decrypt8: - adr $const,_bsaes_decrypt8 + adr $const,. vldmia $key!, {@XMM[9]} @ round 0 key #ifdef __APPLE__ adr $const,.LM0ISR @@ -843,7 +843,7 @@ _bsaes_const: .type _bsaes_encrypt8,%function .align 4 _bsaes_encrypt8: - adr $const,_bsaes_encrypt8 + adr $const,. vldmia $key!, {@XMM[9]} @ round 0 key #ifdef __APPLE__ adr $const,.LM0SR @@ -951,7 +951,7 @@ $code.=<<___; .type _bsaes_key_convert,%function .align 4 _bsaes_key_convert: - adr $const,_bsaes_key_convert + adr $const,. vld1.8 {@XMM[7]}, [$inp]! @ load round 0 key #ifdef __APPLE__ adr $const,.LM0