The branch OpenSSL_1_1_1-stable has been updated
via d741debb320bf54e8575d35603a44d4eb40fa1f9 (commit)
from b11aa831cfe09befe3fb3229ca46a4a59352de34 (commit)
- Log -----------------------------------------------------------------
commit d741debb320bf54e8575d35603a44d4eb40fa1f9
Author: Romain Geissler <[email protected]>
Date: Fri Oct 2 00:07:32 2020 +0000
Fix aarch64 static linking into shared libraries (see issue #10842 and pull
request #11464)
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 <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/13218)
-----------------------------------------------------------------------
Summary of changes:
crypto/chacha/asm/chacha-armv8.pl | 1 +
crypto/poly1305/asm/poly1305-armv8.pl | 6 +++++-
crypto/sha/asm/sha1-armv8.pl | 2 +-
crypto/sha/asm/sha512-armv8.pl | 7 +------
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/crypto/chacha/asm/chacha-armv8.pl
b/crypto/chacha/asm/chacha-armv8.pl
index 2265574729..84c9801480 100755
--- 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 9bfee27595..d07494bd18 100755
--- 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 aa44feb9c7..557cabc018 100644
--- 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 07dcba42dc..3188c905ea 100644
--- 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 );
