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/chacha | |
| 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/chacha')
| -rwxr-xr-x | crypto/chacha/asm/chacha-armv4.pl | 2 |
1 files changed, 1 insertions, 1 deletions
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 ___ }}} |