Commit 0f5e8323 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu

crypto: arm/sha512-neon - avoid ADRL pseudo instruction

The ADRL pseudo instruction is not an architectural construct, but a
convenience macro that was supported by the ARM proprietary assembler
and adopted by binutils GAS as well, but only when assembling in 32-bit
ARM mode. Therefore, it can only be used in assembler code that is known
to assemble in ARM mode only, but as it turns out, the Clang assembler
does not implement ADRL at all, and so it is better to get rid of it
entirely.

So replace the ADRL instruction with a ADR instruction that refers to
a nearer symbol, and apply the delta explicitly using an additional
instruction.
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Tested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 54781938
...@@ -212,7 +212,6 @@ $code=<<___; ...@@ -212,7 +212,6 @@ $code=<<___;
#else #else
.syntax unified .syntax unified
# ifdef __thumb2__ # ifdef __thumb2__
# define adrl adr
.thumb .thumb
# else # else
.code 32 .code 32
...@@ -602,7 +601,8 @@ sha512_block_data_order_neon: ...@@ -602,7 +601,8 @@ sha512_block_data_order_neon:
dmb @ errata #451034 on early Cortex A8 dmb @ errata #451034 on early Cortex A8
add $len,$inp,$len,lsl#7 @ len to point at the end of inp add $len,$inp,$len,lsl#7 @ len to point at the end of inp
VFP_ABI_PUSH VFP_ABI_PUSH
adrl $Ktbl,K512 adr $Ktbl,.Lsha512_block_data_order
sub $Ktbl,$Ktbl,.Lsha512_block_data_order-K512
vldmia $ctx,{$A-$H} @ load context vldmia $ctx,{$A-$H} @ load context
.Loop_neon: .Loop_neon:
___ ___
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
#else #else
.syntax unified .syntax unified
# ifdef __thumb2__ # ifdef __thumb2__
# define adrl adr
.thumb .thumb
# else # else
.code 32 .code 32
...@@ -543,7 +542,8 @@ sha512_block_data_order_neon: ...@@ -543,7 +542,8 @@ sha512_block_data_order_neon:
dmb @ errata #451034 on early Cortex A8 dmb @ errata #451034 on early Cortex A8
add r2,r1,r2,lsl#7 @ len to point at the end of inp add r2,r1,r2,lsl#7 @ len to point at the end of inp
VFP_ABI_PUSH VFP_ABI_PUSH
adrl r3,K512 adr r3,.Lsha512_block_data_order
sub r3,r3,.Lsha512_block_data_order-K512
vldmia r0,{d16-d23} @ load context vldmia r0,{d16-d23} @ load context
.Loop_neon: .Loop_neon:
vshr.u64 d24,d20,#14 @ 0 vshr.u64 d24,d20,#14 @ 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment