Commit 658fa754 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu

crypto: arm/aes - avoid reserved 'tt' mnemonic in asm code

The ARMv8-M architecture introduces 'tt' and 'ttt' instructions,
which means we can no longer use 'tt' as a register alias on recent
versions of binutils for ARM. So replace the alias with 'ttab'.

Fixes: 81edb426 ("crypto: arm/aes - replace scalar AES cipher")
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0ff1436f
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
rounds .req r1 rounds .req r1
in .req r2 in .req r2
out .req r3 out .req r3
tt .req ip ttab .req ip
t0 .req lr t0 .req lr
t1 .req r2 t1 .req r2
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
.macro __load, out, in, idx .macro __load, out, in, idx
.if __LINUX_ARM_ARCH__ < 7 && \idx > 0 .if __LINUX_ARM_ARCH__ < 7 && \idx > 0
ldr \out, [tt, \in, lsr #(8 * \idx) - 2] ldr \out, [ttab, \in, lsr #(8 * \idx) - 2]
.else .else
ldr \out, [tt, \in, lsl #2] ldr \out, [ttab, \in, lsl #2]
.endif .endif
.endm .endm
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
eor r6, r6, r10 eor r6, r6, r10
eor r7, r7, r11 eor r7, r7, r11
__adrl tt, \ttab __adrl ttab, \ttab
tst rounds, #2 tst rounds, #2
bne 1f bne 1f
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
1: subs rounds, rounds, #4 1: subs rounds, rounds, #4
\round r8, r9, r10, r11, r4, r5, r6, r7 \round r8, r9, r10, r11, r4, r5, r6, r7
__adrl tt, \ltab, ls __adrl ttab, \ltab, ls
\round r4, r5, r6, r7, r8, r9, r10, r11 \round r4, r5, r6, r7, r8, r9, r10, r11
bhi 0b bhi 0b
......
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