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 /crypto/bn | |
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)
Diffstat (limited to 'crypto/bn')
-rw-r--r-- | crypto/bn/asm/armv4-gf2m.pl | 2 | ||||
-rw-r--r-- | crypto/bn/asm/armv4-mont.pl | 2 |
2 files changed, 2 insertions, 2 deletions
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 ___ |