diff options
| -rwxr-xr-x | crypto/chacha/asm/chacha-armv8.pl | 1 | ||||
| -rwxr-xr-x | crypto/poly1305/asm/poly1305-armv8.pl | 6 | ||||
| -rw-r--r-- | crypto/sha/asm/sha1-armv8.pl | 4 | ||||
| -rw-r--r-- | crypto/sha/asm/sha512-armv8.pl | 7 |
4 files changed, 8 insertions, 10 deletions
diff --git a/crypto/chacha/asm/chacha-armv8.pl b/crypto/chacha/asm/chacha-armv8.pl index 41503f03f0..dcdc4a04e3 100755 --- a/crypto/chacha/asm/chacha-armv8.pl +++ b/crypto/chacha/asm/chacha-armv8.pl @@ -135,6 +135,7 @@ $code.=<<___; #ifndef __KERNEL__ # include "arm_arch.h" .extern OPENSSL_armcap_P +.hidden OPENSSL_armcap_P #endif .text diff --git a/crypto/poly1305/asm/poly1305-armv8.pl b/crypto/poly1305/asm/poly1305-armv8.pl index d2d31fcc27..d2d875ad6c 100755 --- a/crypto/poly1305/asm/poly1305-armv8.pl +++ b/crypto/poly1305/asm/poly1305-armv8.pl @@ -61,10 +61,14 @@ $code.=<<___; // forward "declarations" are required for Apple .extern OPENSSL_armcap_P +.hidden OPENSSL_armcap_P +.globl poly1305_init +.hidden poly1305_init .globl poly1305_blocks +.hidden poly1305_blocks .globl poly1305_emit +.hidden poly1305_emit -.globl poly1305_init .type poly1305_init,%function .align 5 poly1305_init: diff --git a/crypto/sha/asm/sha1-armv8.pl b/crypto/sha/asm/sha1-armv8.pl index 97ffac1fb9..cdea8845af 100644 --- a/crypto/sha/asm/sha1-armv8.pl +++ b/crypto/sha/asm/sha1-armv8.pl @@ -178,6 +178,7 @@ $code.=<<___; #ifndef __KERNEL__ # include "arm_arch.h" .extern OPENSSL_armcap_P +.hidden OPENSSL_armcap_P #endif .text @@ -323,9 +324,6 @@ $code.=<<___; .long 0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6 //K_60_79 .asciz "SHA1 block transform for ARMv8, CRYPTOGAMS by <appro\@openssl.org>" .align 2 -#if !defined(__KERNELL__) && !defined(_WIN64) -.comm OPENSSL_armcap_P,4,4 -#endif ___ }}} diff --git a/crypto/sha/asm/sha512-armv8.pl b/crypto/sha/asm/sha512-armv8.pl index 9c15496eb0..6bcff0b7d3 100644 --- a/crypto/sha/asm/sha512-armv8.pl +++ b/crypto/sha/asm/sha512-armv8.pl @@ -193,6 +193,7 @@ $code.=<<___; #ifndef __KERNEL__ # include "arm_arch.h" .extern OPENSSL_armcap_P +.hidden OPENSSL_armcap_P #endif .text @@ -829,12 +830,6 @@ $code.=<<___; ___ } -$code.=<<___; -#if !defined(__KERNEL__) && !defined(_WIN64) -.comm OPENSSL_armcap_P,4,4 -#endif -___ - { my %opcode = ( "sha256h" => 0x5e004000, "sha256h2" => 0x5e005000, "sha256su0" => 0x5e282800, "sha256su1" => 0x5e006000 ); |