From 0a4b370d3f06ff68c0555060255874eb61477d3f Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 22 May 2019 05:46:06 -0400 Subject: [PATCH] Use CRYPTOGAMS_armcaps It looks like CRYPTOGAMS_armcap was used in some places, and it broke Autotools --- sha1_armv4.S | 4 ++-- sha256_armv4.S | 12 ++++++------ sha512_armv4.S | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sha1_armv4.S b/sha1_armv4.S index 84c7bd17..27312183 100644 --- a/sha1_armv4.S +++ b/sha1_armv4.S @@ -89,7 +89,7 @@ extern unsigned int CRYPTOGAMS_armcaps; sha1_block_data_order: #if __ARM_MAX_ARCH__>=7 .Lsha1_block: - ldr r12,.LCRYPTOGAMS_armcap + ldr r12,.LCRYPTOGAMS_armcaps # if !defined(_WIN32) adr r3,.Lsha1_block ldr r12,[r3,r12] @ CRYPTOGAMS_armcaps @@ -558,7 +558,7 @@ sha1_block_data_order: .LK_40_59:.word 0x8f1bbcdc .LK_60_79:.word 0xca62c1d6 #if __ARM_MAX_ARCH__>=7 -.LCRYPTOGAMS_armcap: +.LCRYPTOGAMS_armcaps: # ifdef _WIN32 .word CRYPTOGAMS_armcaps # else diff --git a/sha256_armv4.S b/sha256_armv4.S index ea13552c..905941c3 100644 --- a/sha256_armv4.S +++ b/sha256_armv4.S @@ -104,11 +104,11 @@ K256: .size K256,.-K256 .word 0 @ terminator #if __ARM_MAX_ARCH__>=7 -.LCRYPTOGAMS_armcap: +.LCRYPTOGAMS_armcaps: # ifdef _WIN32 -.word CRYPTOGAMS_armcap +.word CRYPTOGAMS_armcaps # else -.word CRYPTOGAMS_armcap-.Lsha256_block_data_order +.word CRYPTOGAMS_armcaps-.Lsha256_block_data_order # endif #endif .align 5 @@ -123,9 +123,9 @@ sha256_block_data_order: adr r3,.Lsha256_block_data_order #endif #if __ARM_MAX_ARCH__>=7 - ldr r12,.LCRYPTOGAMS_armcap + ldr r12,.LCRYPTOGAMS_armcaps # if !defined(_WIN32) - ldr r12,[r3,r12] @ CRYPTOGAMS_armcap + ldr r12,[r3,r12] @ CRYPTOGAMS_armcaps # endif # if defined(__APPLE__) || defined(_WIN32) ldr r12,[r12] @@ -2688,5 +2688,5 @@ sha256_block_data_order_neon: #endif #if __ARM_MAX_ARCH__>=7 -.comm CRYPTOGAMS_armcap,4,4 +.comm CRYPTOGAMS_armcaps,4,4 #endif diff --git a/sha512_armv4.S b/sha512_armv4.S index 50ad738d..9f57760e 100644 --- a/sha512_armv4.S +++ b/sha512_armv4.S @@ -138,11 +138,11 @@ K512: WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817) .size K512,.-K512 #if __ARM_MAX_ARCH__>=7 -.LCRYPTOGAMS_armcap: +.LCRYPTOGAMS_armcaps: # ifdef _WIN32 -.word CRYPTOGAMS_armcap +.word CRYPTOGAMS_armcaps # else -.word CRYPTOGAMS_armcap-.Lsha512_block_data_order +.word CRYPTOGAMS_armcaps-.Lsha512_block_data_order # endif .skip 32-4 #else @@ -159,9 +159,9 @@ sha512_block_data_order: adr r3,.Lsha512_block_data_order #endif #if __ARM_MAX_ARCH__>=7 - ldr r12,.LCRYPTOGAMS_armcap + ldr r12,.LCRYPTOGAMS_armcaps # if !defined(_WIN32) - ldr r12,[r3,r12] @ CRYPTOGAMS_armcap + ldr r12,[r3,r12] @ CRYPTOGAMS_armcaps # endif # if defined(__APPLE__) || defined(_WIN32) ldr r12,[r12] @@ -1877,5 +1877,5 @@ sha512_block_data_order_neon: #endif #if __ARM_MAX_ARCH__>=7 -.comm CRYPTOGAMS_armcap,4,4 +.comm CRYPTOGAMS_armcaps,4,4 #endif