Mark OPENSSL_armcap_P .hidden in arm asm

Fixes #25601
Fixes #22414

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22181)

(cherry picked from commit e131868678085f29adf90db8bd8058e9f2c8c6b0)

diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl
index 04b342551c260cd5deefc2116830245aeeeef786..9b933c70c4d8ab423c664ba14f0ade4780f31f95 100644 (file)
--- a/crypto/armv4cpuid.pl
+++ b/crypto/armv4cpuid.pl
@@ -293,6 +293,7 @@ atomic_add_spinlock:
 #endif
 
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
 ___
 
 print $code;

diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl
index 17af0e07741a4661ef5972685c1eede7a749095f..5733a0174660ae5f9805149cb14753ee126af442 100644 (file)
--- a/crypto/bn/asm/armv4-gf2m.pl
+++ b/crypto/bn/asm/armv4-gf2m.pl
@@ -326,6 +326,7 @@ $code.=<<___;
 
 #if __ARM_MAX_ARCH__>=7
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
 #endif
 ___
 

diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl
index d85da9240679915313444223e7f3fa028203137e..6e839d845ca895598ccd1c3dba11bc3235b7bc4d 100644 (file)
--- a/crypto/bn/asm/armv4-mont.pl
+++ b/crypto/bn/asm/armv4-mont.pl
@@ -750,6 +750,7 @@ $code.=<<___;
 .align 2
 #if __ARM_MAX_ARCH__>=7
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
 #endif
 ___
 

diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl
index ac32d5bda76f18b1fb986011033b34a0b76d683a..bb48b6eeb99e711fc304488d74fdaaf55a22863d 100755 (executable)
--- a/crypto/chacha/asm/chacha-armv4.pl
+++ b/crypto/chacha/asm/chacha-armv4.pl
@@ -1155,6 +1155,7 @@ $code.=<<___;
        ldmia           sp!,{r4-r11,pc}
 .size  ChaCha20_neon,.-ChaCha20_neon
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
 #endif
 ___
 }}}

diff --git a/crypto/poly1305/asm/poly1305-armv4.pl b/crypto/poly1305/asm/poly1305-armv4.pl
index b98beefa184ee124931e563f42930089b1b44df5..673ea62ec388ed7dba51c2a48312ba10c374a094 100755 (executable)
--- a/crypto/poly1305/asm/poly1305-armv4.pl
+++ b/crypto/poly1305/asm/poly1305-armv4.pl
@@ -1240,6 +1240,7 @@ $code.=<<___;
 .align 2
 #if    __ARM_MAX_ARCH__>=7
 .extern   OPENSSL_armcap_P
+.hidden   OPENSSL_armcap_P
 #endif
 ___
 

diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl
index 2832c5b5302e2859a6e9cfe2efa373c177d4bfc2..b3a8ec69414526d5f88e42be505bec648ce1025c 100644 (file)
--- a/crypto/sha/asm/sha1-armv4-large.pl
+++ b/crypto/sha/asm/sha1-armv4-large.pl
@@ -708,6 +708,7 @@ ___
 $code.=<<___;
 #if __ARM_MAX_ARCH__>=7
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
 #endif
 ___
 

diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index 8bac84b1a855f2cb6f4c5c73ad7a2a628b37174f..feb1f26109a90cde1b5d3495c8a712b5a5bcbee9 100644 (file)
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -694,6 +694,7 @@ $code.=<<___;
 .align 2
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .extern   OPENSSL_armcap_P
+.hidden   OPENSSL_armcap_P
 #endif
 ___
 

diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
index c8b81106719f0678341a7f9a8fcb579dd05567f6..9aa310ffd05fffddced039f58eccf5ad966fb595 100644 (file)
--- a/crypto/sha/asm/sha512-armv4.pl
+++ b/crypto/sha/asm/sha512-armv4.pl
@@ -661,6 +661,7 @@ $code.=<<___;
 .align 2
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
 #endif
 ___