Fix aarch64 static linking into shared libraries (see issue #10842 and pull request...

Cherry-pick of https://github.com/openssl/openssl/pull/13056 for branch 1.1.1. Tested against
the release 1.1.1h

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13218)

diff --git a/crypto/chacha/asm/chacha-armv8.pl b/crypto/chacha/asm/chacha-armv8.pl
index 22655747295e24b2d0111d82f0fae63171881160..84c98014803bce351794063d9463aa7597f476f0 100755 (executable)
--- a/crypto/chacha/asm/chacha-armv8.pl
+++ b/crypto/chacha/asm/chacha-armv8.pl
@@ -125,6 +125,7 @@ $code.=<<___;
 .text
 
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
 
 .align 5
 .Lsigma:

diff --git a/crypto/poly1305/asm/poly1305-armv8.pl b/crypto/poly1305/asm/poly1305-armv8.pl
index 9bfee2759579b0fc649d43bdc0da76de728c68a8..d07494bd180576d91ac9495e89df7d58115a728a 100755 (executable)
--- a/crypto/poly1305/asm/poly1305-armv8.pl
+++ b/crypto/poly1305/asm/poly1305-armv8.pl
@@ -57,10 +57,14 @@ $code.=<<___;
 
 // forward "declarations" are required for Apple
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
+.globl poly1305_init
+.hidden        poly1305_init
 .globl poly1305_blocks
+.hidden        poly1305_blocks
 .globl poly1305_emit
+.hidden        poly1305_emit
 
-.globl poly1305_init
 .type  poly1305_init,%function
 .align 5
 poly1305_init:

diff --git a/crypto/sha/asm/sha1-armv8.pl b/crypto/sha/asm/sha1-armv8.pl
index aa44feb9c7c53b8b51be89c385c998f0add3c7ca..557cabc018e05f584a52c7b16cfa0854d8a217b9 100644 (file)
--- a/crypto/sha/asm/sha1-armv8.pl
+++ b/crypto/sha/asm/sha1-armv8.pl
@@ -176,6 +176,7 @@ $code.=<<___;
 .text
 
 .extern        OPENSSL_armcap_P
+.hidden OPENSSL_armcap_P
 .globl sha1_block_data_order
 .type  sha1_block_data_order,%function
 .align 6
@@ -329,7 +330,6 @@ $code.=<<___;
 #endif
 .asciz "SHA1 block transform for ARMv8, CRYPTOGAMS by <appro\@openssl.org>"
 .align 2
-.comm  OPENSSL_armcap_P,4,4
 ___
 }}}
 

diff --git a/crypto/sha/asm/sha512-armv8.pl b/crypto/sha/asm/sha512-armv8.pl
index 07dcba42dcf4c3184d21bb43f90d936bdca8357f..3188c905ea2de21d87ba491500f87e2f66c36a51 100644 (file)
--- a/crypto/sha/asm/sha512-armv8.pl
+++ b/crypto/sha/asm/sha512-armv8.pl
@@ -193,6 +193,7 @@ $code.=<<___;
 .text
 
 .extern        OPENSSL_armcap_P
+.hidden        OPENSSL_armcap_P
 .globl $func
 .type  $func,%function
 .align 6
@@ -840,12 +841,6 @@ $code.=<<___;
 ___
 }
 
-$code.=<<___;
-#ifndef        __KERNEL__
-.comm  OPENSSL_armcap_P,4,4
-#endif
-___
-
 {   my  %opcode = (
        "sha256h"       => 0x5e004000,  "sha256h2"      => 0x5e005000,
        "sha256su0"     => 0x5e282800,  "sha256su1"     => 0x5e006000   );