arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use CRYPTOGAMS_armcaps 

It looks like CRYPTOGAMS_armcap was used in some places, and it broke Autotools
pull/853/head
Jeffrey Walton 2019-05-22 05:46:06 -04:00
parent 13e3a19e94
commit 0a4b370d3f
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sha1_armv4.S
View File

@ -89,7 +89,7 @@ extern unsigned int CRYPTOGAMS_armcaps;
sha1_block_data_order: sha1_block_data_order:
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.Lsha1_block: .Lsha1_block:
ldr r12,.LCRYPTOGAMS_armcap ldr r12,.LCRYPTOGAMS_armcaps
# if !defined(_WIN32) # if !defined(_WIN32)
adr r3,.Lsha1_block adr r3,.Lsha1_block
ldr r12,[r3,r12] @ CRYPTOGAMS_armcaps ldr r12,[r3,r12] @ CRYPTOGAMS_armcaps
@ -558,7 +558,7 @@ sha1_block_data_order:
.LK_40_59:.word 0x8f1bbcdc .LK_40_59:.word 0x8f1bbcdc
.LK_60_79:.word 0xca62c1d6 .LK_60_79:.word 0xca62c1d6
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.LCRYPTOGAMS_armcap: .LCRYPTOGAMS_armcaps:
# ifdef _WIN32 # ifdef _WIN32
.word CRYPTOGAMS_armcaps .word CRYPTOGAMS_armcaps
# else # else

12
sha256_armv4.S
View File

@ -104,11 +104,11 @@ K256:
.size K256,.-K256 .size K256,.-K256
.word 0 @ terminator .word 0 @ terminator
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.LCRYPTOGAMS_armcap: .LCRYPTOGAMS_armcaps:
# ifdef _WIN32 # ifdef _WIN32
.word CRYPTOGAMS_armcap .word CRYPTOGAMS_armcaps
# else # else
.word CRYPTOGAMS_armcap-.Lsha256_block_data_order .word CRYPTOGAMS_armcaps-.Lsha256_block_data_order
# endif # endif
#endif #endif
.align 5 .align 5
@ -123,9 +123,9 @@ sha256_block_data_order:
adr r3,.Lsha256_block_data_order adr r3,.Lsha256_block_data_order
#endif #endif
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
ldr r12,.LCRYPTOGAMS_armcap ldr r12,.LCRYPTOGAMS_armcaps
# if !defined(_WIN32) # if !defined(_WIN32)
ldr r12,[r3,r12] @ CRYPTOGAMS_armcap ldr r12,[r3,r12] @ CRYPTOGAMS_armcaps
# endif # endif
# if defined(__APPLE__) || defined(_WIN32) # if defined(__APPLE__) || defined(_WIN32)
ldr r12,[r12] ldr r12,[r12]
@ -2688,5 +2688,5 @@ sha256_block_data_order_neon:
#endif #endif
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.comm CRYPTOGAMS_armcap,4,4 .comm CRYPTOGAMS_armcaps,4,4
#endif #endif

12
sha512_armv4.S
View File

@ -138,11 +138,11 @@ K512:
WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817) WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817)
.size K512,.-K512 .size K512,.-K512
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.LCRYPTOGAMS_armcap: .LCRYPTOGAMS_armcaps:
# ifdef _WIN32 # ifdef _WIN32
.word CRYPTOGAMS_armcap .word CRYPTOGAMS_armcaps
# else # else
.word CRYPTOGAMS_armcap-.Lsha512_block_data_order .word CRYPTOGAMS_armcaps-.Lsha512_block_data_order
# endif # endif
.skip 32-4 .skip 32-4
#else #else
@ -159,9 +159,9 @@ sha512_block_data_order:
adr r3,.Lsha512_block_data_order adr r3,.Lsha512_block_data_order
#endif #endif
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
ldr r12,.LCRYPTOGAMS_armcap ldr r12,.LCRYPTOGAMS_armcaps
# if !defined(_WIN32) # if !defined(_WIN32)
ldr r12,[r3,r12] @ CRYPTOGAMS_armcap ldr r12,[r3,r12] @ CRYPTOGAMS_armcaps
# endif # endif
# if defined(__APPLE__) || defined(_WIN32) # if defined(__APPLE__) || defined(_WIN32)
ldr r12,[r12] ldr r12,[r12]
@ -1877,5 +1877,5 @@ sha512_block_data_order_neon:
#endif #endif
#if __ARM_MAX_ARCH__>=7 #if __ARM_MAX_ARCH__>=7
.comm CRYPTOGAMS_armcap,4,4 .comm CRYPTOGAMS_armcaps,4,4
#endif #endif