[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Andy Polyakov]

The branch OpenSSL_1_1_0-stable has been updated
       via  8efce5badd2f3bdd2d15e4aacd6b04f6ee69cf60 (commit)
      from  e8643838530c990207bbca0481098f4b430f454a (commit)


- Log -----------------------------------------------------------------
commit 8efce5badd2f3bdd2d15e4aacd6b04f6ee69cf60
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Fri Oct 20 20:51:05 2017 +0200

    s390x assembly pack: define OPENSSL_s390xcap_P in s390xcap.c
    
    Remove all .comm definitions from the asm modules.
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4563)

-----------------------------------------------------------------------

Summary of changes:
 crypto/aes/asm/aes-s390x.pl    | 1 -
 crypto/s390xcap.c              | 2 +-
 crypto/s390xcpuid.S            | 2 --
 crypto/sha/asm/sha1-s390x.pl   | 1 -
 crypto/sha/asm/sha512-s390x.pl | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
index 804986c..fd8a737 100644
--- a/crypto/aes/asm/aes-s390x.pl
+++ b/crypto/aes/asm/aes-s390x.pl
@@ -2219,7 +2219,6 @@ ___
 }
 $code.=<<___;
 .string	"AES for s390x, CRYPTOGAMS by <appro\@openssl.org>"
-.comm	OPENSSL_s390xcap_P,80,8
 ___
 
 $code =~ s/\`([^\`]*)\`/eval $1/gem;
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c
index 675f2ec..272c551 100644
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -13,7 +13,7 @@
 #include <setjmp.h>
 #include <signal.h>
 
-extern unsigned long OPENSSL_s390xcap_P[];
+unsigned long long OPENSSL_s390xcap_P[10];
 
 static sigjmp_buf ill_jmp;
 static void ill_handler(int sig)
diff --git a/crypto/s390xcpuid.S b/crypto/s390xcpuid.S
index 8859e9e..fc141d9 100644
--- a/crypto/s390xcpuid.S
+++ b/crypto/s390xcpuid.S
@@ -176,5 +176,3 @@ OPENSSL_instrument_bus2:
 
 .section	.init
 	brasl	%r14,OPENSSL_cpuid_setup
-
-.comm	OPENSSL_s390xcap_P,80,8
diff --git a/crypto/sha/asm/sha1-s390x.pl b/crypto/sha/asm/sha1-s390x.pl
index f8ab1bb..79df1ff 100644
--- a/crypto/sha/asm/sha1-s390x.pl
+++ b/crypto/sha/asm/sha1-s390x.pl
@@ -239,7 +239,6 @@ $code.=<<___;
 	br	%r14
 .size	sha1_block_data_order,.-sha1_block_data_order
 .string	"SHA1 block transform for s390x, CRYPTOGAMS by <appro\@openssl.org>"
-.comm	OPENSSL_s390xcap_P,80,8
 ___
 
 $code =~ s/\`([^\`]*)\`/eval $1/gem;
diff --git a/crypto/sha/asm/sha512-s390x.pl b/crypto/sha/asm/sha512-s390x.pl
index 0935e53..427d6f8 100644
--- a/crypto/sha/asm/sha512-s390x.pl
+++ b/crypto/sha/asm/sha512-s390x.pl
@@ -312,7 +312,6 @@ $code.=<<___;
 	br	%r14
 .size	$Func,.-$Func
 .string	"SHA${label} block transform for s390x, CRYPTOGAMS by <appro\@openssl.org>"
-.comm	OPENSSL_s390xcap_P,80,8
 ___
 
 $code =~ s/\`([^\`]*)\`/eval $1/gem;