diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2019-05-22 19:00:08 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2019-05-22 19:00:08 -0400 |
| commit | 7eaa5837e092b25d977040fe2bc8284034fa269a (patch) | |
| tree | 77d169f08e37ab1083ab661b74996be28f9686c5 /sha512_armv4.S | |
| parent | ce5d5d5c0fdc3d6fc69884f9125661c1c9ebe492 (diff) | |
| download | cryptopp-git-7eaa5837e092b25d977040fe2bc8284034fa269a.tar.gz | |
Fix "unexpected reloc type 0x03" for ARM shared object (GH #846)
Diffstat (limited to 'sha512_armv4.S')
| -rw-r--r-- | sha512_armv4.S | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sha512_armv4.S b/sha512_armv4.S index 9259fd9d..9d07a9bf 100644 --- a/sha512_armv4.S +++ b/sha512_armv4.S @@ -64,10 +64,6 @@ # endif # endif -# ifndef __ASSEMBLER__ -extern unsigned int CRYPTOGAMS_armcaps; -# endif - # define ARMV7_NEON (1<<0) @ JW, MAY 2019: End defines from taken from arm_arch.h @@ -138,12 +134,6 @@ K512: WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817) .size K512,.-K512 #if __ARM_MAX_ARCH__>=7 -.LCRYPTOGAMS_armcap_loc: -# ifdef _WIN32 -.word CRYPTOGAMS_armcaps -# else -.word CRYPTOGAMS_armcaps-.Lsha512_block_data_order -# endif .skip 32-4 #else .skip 32 @@ -154,18 +144,13 @@ K512: sha512_block_data_order: .Lsha512_block_data_order: #if __ARM_ARCH__<7 && !defined(__thumb2__) + mov r12,r3 sub r3,pc,#8 @ sha512_block_data_order #else + mov r12,r3 adr r3,.Lsha512_block_data_order #endif #if __ARM_MAX_ARCH__>=7 - ldr r12,.LCRYPTOGAMS_armcap_loc -# if !defined(_WIN32) - ldr r12,[r3,r12] @ CRYPTOGAMS_armcaps -# endif -# if defined(__APPLE__) || defined(_WIN32) - ldr r12,[r12] -# endif tst r12,#ARMV7_NEON bne .LNEON #endif @@ -1875,7 +1860,3 @@ sha512_block_data_order_neon: bx lr @ .word 0xe12fff1e .size sha512_block_data_order_neon,.-sha512_block_data_order_neon #endif - -#if __ARM_MAX_ARCH__>=7 -.comm CRYPTOGAMS_armcaps,4,4 -#endif |