From 797d24bee9523e5cac14fe82a4dad356d1ec67f9 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 1 Jun 2014 22:29:50 +0200 Subject: [PATCH] sha[1|256]-armv4: harmonize with arm_arch.h. --- crypto/sha/asm/sha1-armv4-large.pl | 4 ++-- crypto/sha/asm/sha256-armv4.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl index c0e3b80f0e..43a1b9fd7f 100644 --- a/crypto/sha/asm/sha1-armv4-large.pl +++ b/crypto/sha/asm/sha1-armv4-large.pl @@ -178,9 +178,9 @@ sha1_block_data_order: sub r3,pc,#8 @ sha1_block_data_order ldr r12,.LOPENSSL_armcap ldr r12,[r3,r12] @ OPENSSL_armcap_P - tst r12,#8 + tst r12,#ARMV8_SHA1 bne .LARMv8 - tst r12,#1 + tst r12,#ARMV7_NEON bne .LNEON #endif stmdb sp!,{r4-r12,lr} diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl index 7980debd14..5e5c54ec18 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -189,9 +189,9 @@ sha256_block_data_order: #if __ARM_ARCH__>=7 ldr r12,.LOPENSSL_armcap ldr r12,[r3,r12] @ OPENSSL_armcap_P - tst r12,#8 + tst r12,#ARMV8_SHA256 bne .LARMv8 - tst r12,#1 + tst r12,#ARMV7_NEON bne .LNEON #endif stmdb sp!,{$ctx,$inp,$len,r4-r11,lr} -- 2.25.1