diff options
| author | Tom Cosgrove <tom.cosgrove@arm.com> | 2023-03-27 22:05:13 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-03-29 12:21:31 +0200 |
| commit | 7b508cd1e18f04d509af4df6c2ab4709c4389d19 (patch) | |
| tree | 7fcfe01a91a62fe816c5a60c9e0e1e13ce5f03b2 | |
| parent | c3637cafd378f2dacc70018499fec4619082051b (diff) | |
Ensure there's only one copy of OPENSSL_armcap_P in libcrypto.a
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)
| -rw-r--r-- | crypto/armcap.c | 2 | ||||
| -rw-r--r-- | crypto/armv4cpuid.pl | 3 | ||||
| -rw-r--r-- | crypto/bn/asm/armv4-gf2m.pl | 2 | ||||
| -rw-r--r-- | crypto/bn/asm/armv4-mont.pl | 2 | ||||
| -rwxr-xr-x | crypto/chacha/asm/chacha-armv4.pl | 2 | ||||
| -rwxr-xr-x | crypto/poly1305/asm/poly1305-armv4.pl | 2 | ||||
| -rw-r--r-- | crypto/sha/asm/sha1-armv4-large.pl | 2 | ||||
| -rw-r--r-- | crypto/sha/asm/sha256-armv4.pl | 2 | ||||
| -rw-r--r-- | crypto/sha/asm/sha512-armv4.pl | 2 |
9 files changed, 8 insertions, 11 deletions
diff --git a/crypto/armcap.c b/crypto/armcap.c index f61579ac04..03bc659bdb 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -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; diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl index 8991fd4afe..78dc90c520 100644 --- a/crypto/armv4cpuid.pl +++ b/crypto/armv4cpuid.pl @@ -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; diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl index d380c89f1f..b0b87ef611 100644 --- a/crypto/bn/asm/armv4-gf2m.pl +++ b/crypto/bn/asm/armv4-gf2m.pl @@ -325,7 +325,7 @@ $code.=<<___; .align 5 #if __ARM_MAX_ARCH__>=7 -.comm OPENSSL_armcap_P,4,4 +.extern OPENSSL_armcap_P #endif ___ diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl index c26df751a5..ab69c2186b 100644 --- a/crypto/bn/asm/armv4-mont.pl +++ b/crypto/bn/asm/armv4-mont.pl @@ -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 ___ diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl index 0aa13519eb..3fdecf2d28 100755 --- a/crypto/chacha/asm/chacha-armv4.pl +++ b/crypto/chacha/asm/chacha-armv4.pl @@ -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 ___ }}} diff --git a/crypto/poly1305/asm/poly1305-armv4.pl b/crypto/poly1305/asm/poly1305-armv4.pl index 041bfd46e6..7cc681838d 100755 --- a/crypto/poly1305/asm/poly1305-armv4.pl +++ b/crypto/poly1305/asm/poly1305-armv4.pl @@ -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 ___ diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl index 6a2e12bf17..ec7195a070 100644 --- a/crypto/sha/asm/sha1-armv4-large.pl +++ b/crypto/sha/asm/sha1-armv4-large.pl @@ -707,7 +707,7 @@ ___ }}} $code.=<<___; #if __ARM_MAX_ARCH__>=7 -.comm OPENSSL_armcap_P,4,4 +.extern OPENSSL_armcap_P #endif ___ diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl index e8af05c298..0ac72bda63 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -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 ___ diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl index 1751c671e6..5579cda6e9 100644 --- a/crypto/sha/asm/sha512-armv4.pl +++ b/crypto/sha/asm/sha512-armv4.pl @@ -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 ___ |