mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure there's only one copy of OPENSSL_armcap_P in libcrypto.a

Browse Source 
Change-Id: Ia94e528a2d55934435de6a2949784c52eb38d82f

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20621)
This commit is contained in:
Tom Cosgrove 2023-03-27 22:05:13 +01:00 committed by Tomas Mraz
parent c3637cafd3
commit 7b508cd1e1
9 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/armcap.c
View File

@ -25,9 +25,7 @@
#endif
#include "arm_arch.h"
#ifdef __aarch64__
unsigned int OPENSSL_armcap_P = 0;
#endif
unsigned int OPENSSL_arm_midr = 0;
unsigned int OPENSSL_armv8_rsa_neonized = 0;

3
crypto/armv4cpuid.pl
View File

@ -292,8 +292,7 @@ atomic_add_spinlock:
.word 0
#endif
.comm OPENSSL_armcap_P,4,4
.hidden OPENSSL_armcap_P
.extern OPENSSL_armcap_P
___
print $code;

2
crypto/bn/asm/armv4-gf2m.pl
View File

@ -325,7 +325,7 @@ $code.=<<___;
.align 5
#if __ARM_MAX_ARCH__>=7
.comm OPENSSL_armcap_P,4,4
.extern OPENSSL_armcap_P
#endif
___

2
crypto/bn/asm/armv4-mont.pl
View File

@ -749,7 +749,7 @@ $code.=<<___;
.asciz "Montgomery multiplication for ARMv4/NEON, CRYPTOGAMS by <appro\@openssl.org>"
.align 2
#if __ARM_MAX_ARCH__>=7
.comm OPENSSL_armcap_P,4,4
.extern OPENSSL_armcap_P
#endif
___

2
crypto/chacha/asm/chacha-armv4.pl
View File

@ -1154,7 +1154,7 @@ $code.=<<___;
add sp,sp,#4*(16+3)
ldmia sp!,{r4-r11,pc}
.size ChaCha20_neon,.-ChaCha20_neon
.comm OPENSSL_armcap_P,4,4
.extern OPENSSL_armcap_P
#endif
___
}}}

2
crypto/poly1305/asm/poly1305-armv4.pl
View File

@ -1239,7 +1239,7 @@ $code.=<<___;
.asciz "Poly1305 for ARMv4/NEON, CRYPTOGAMS by <appro\@openssl.org>"
.align 2
#if __ARM_MAX_ARCH__>=7
.comm OPENSSL_armcap_P,4,4
.extern OPENSSL_armcap_P
#endif
___

2
crypto/sha/asm/sha1-armv4-large.pl
View File

@ -707,7 +707,7 @@ ___
}}}
$code.=<<___;
#if __ARM_MAX_ARCH__>=7
.comm OPENSSL_armcap_P,4,4
.extern OPENSSL_armcap_P
#endif
___

2
crypto/sha/asm/sha256-armv4.pl
View File

@ -693,7 +693,7 @@ $code.=<<___;
.asciz "SHA256 block transform for ARMv4/NEON/ARMv8, CRYPTOGAMS by <appro\@openssl.org>"
.align 2
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
.comm OPENSSL_armcap_P,4,4
.extern OPENSSL_armcap_P
#endif
___

2
crypto/sha/asm/sha512-armv4.pl
View File

@ -660,7 +660,7 @@ $code.=<<___;
.asciz "SHA512 block transform for ARMv4/NEON, CRYPTOGAMS by <appro\@openssl.org>"
.align 2
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
.comm OPENSSL_armcap_P,4,4
.extern OPENSSL_armcap_P
#endif
___