Commit 8efce5ba authored by Patrick Steuer's avatar Patrick Steuer Committed by Andy Polyakov
Browse files

s390x assembly pack: define OPENSSL_s390xcap_P in s390xcap.c 



Remove all .comm definitions from the asm modules.

Signed-off-by: default avatarPatrick Steuer <patrick.steuer@de.ibm.com>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4563)
parent e8643838

crypto/aes/asm/aes-s390x.pl

+0 −1
Original line number Original line Diff line number Diff line
@@ -2219,7 +2219,6 @@ ___ 
}

}

$code.=<<___;

$code.=<<___;

.string	"AES for s390x, CRYPTOGAMS by <appro\@openssl.org>"

.string	"AES for s390x, CRYPTOGAMS by <appro\@openssl.org>"

.comm	OPENSSL_s390xcap_P,80,8

___

___





$code =~ s/\`([^\`]*)\`/eval $1/gem;

$code =~ s/\`([^\`]*)\`/eval $1/gem;

crypto/s390xcap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <setjmp.h>

#include <setjmp.h>

#include <signal.h>

#include <signal.h>





extern unsigned long OPENSSL_s390xcap_P[];

unsigned long long OPENSSL_s390xcap_P[10];





static sigjmp_buf ill_jmp;

static sigjmp_buf ill_jmp;

static void ill_handler(int sig)

static void ill_handler(int sig)

crypto/s390xcpuid.S

+0 −2
Original line number Original line Diff line number Diff line
@@ -176,5 +176,3 @@ OPENSSL_instrument_bus2: 




.section	.init

.section	.init

	brasl	%r14,OPENSSL_cpuid_setup
 
	brasl	%r14,OPENSSL_cpuid_setup
 


.comm	OPENSSL_s390xcap_P,80,8

crypto/sha/asm/sha1-s390x.pl

+0 −1
Original line number Original line Diff line number Diff line
@@ -239,7 +239,6 @@ $code.=<<___; 
	br	%r14

	br	%r14

.size	sha1_block_data_order,.-sha1_block_data_order

.size	sha1_block_data_order,.-sha1_block_data_order

.string	"SHA1 block transform for s390x, CRYPTOGAMS by <appro\@openssl.org>"

.string	"SHA1 block transform for s390x, CRYPTOGAMS by <appro\@openssl.org>"

.comm	OPENSSL_s390xcap_P,80,8

___

___





$code =~ s/\`([^\`]*)\`/eval $1/gem;

$code =~ s/\`([^\`]*)\`/eval $1/gem;

crypto/sha/asm/sha512-s390x.pl

+0 −1
Original line number Original line Diff line number Diff line
@@ -312,7 +312,6 @@ $code.=<<___; 
	br	%r14

	br	%r14

.size	$Func,.-$Func

.size	$Func,.-$Func

.string	"SHA${label} block transform for s390x, CRYPTOGAMS by <appro\@openssl.org>"

.string	"SHA${label} block transform for s390x, CRYPTOGAMS by <appro\@openssl.org>"

.comm	OPENSSL_s390xcap_P,80,8

___

___





$code =~ s/\`([^\`]*)\`/eval $1/gem;

$code =~ s/\`([^\`]*)\`/eval $1/gem;