Consistently use arm_arch.h constants in armcap assembly code.
Most of the assembly uses constants from arm_arch.h, but a few references to ARMV7_NEON don't. Consistently use the macros everywhere. Signed-off-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
parent
359aa38fbe
commit
bdbd3aea59
4 changed files with 4 additions and 4 deletions
|
@ -121,7 +121,7 @@ bn_mul_mont:
|
|||
#ifdef __APPLE__
|
||||
ldr r0,[r0]
|
||||
#endif
|
||||
tst r0,#1 @ NEON available?
|
||||
tst r0,#ARMV7_NEON @ NEON available?
|
||||
ldmia sp, {r0,r2}
|
||||
beq .Lialu
|
||||
add sp,sp,#8
|
||||
|
|
|
@ -214,7 +214,7 @@ ChaCha20_ctr32:
|
|||
# ifdef __APPLE__
|
||||
ldr r4,[r4]
|
||||
# endif
|
||||
tst r4,#1
|
||||
tst r4,#ARMV7_NEON
|
||||
bne .LChaCha20_neon
|
||||
.Lshort:
|
||||
#endif
|
||||
|
|
|
@ -108,7 +108,7 @@ poly1305_init:
|
|||
and r5,r5,r3
|
||||
|
||||
#if __ARM_MAX_ARCH__>=7
|
||||
tst r12,#1 @ check for NEON
|
||||
tst r12,#ARMV7_NEON @ check for NEON
|
||||
# ifdef __APPLE__
|
||||
adr r9,poly1305_blocks_neon
|
||||
adr r11,poly1305_blocks
|
||||
|
|
|
@ -287,7 +287,7 @@ sha512_block_data_order:
|
|||
#ifdef __APPLE__
|
||||
ldr r12,[r12]
|
||||
#endif
|
||||
tst r12,#1
|
||||
tst r12,#ARMV7_NEON
|
||||
bne .LNEON
|
||||
#endif
|
||||
add $len,$inp,$len,lsl#7 @ len to point at the end of inp
|
||||
|
|
Loading…
Reference in a new issue