Commit 5e5ece56 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Allow ILP32 compilation in AArch64 assembly pack. 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 11208dcf

crypto/sha/asm/sha1-armv8.pl

+8 −0
Original line number Diff line number Diff line
@@ -171,7 +171,11 @@ $code.=<<___; 
.type	sha1_block_data_order,%function

.align	6

sha1_block_data_order:

#ifdef	__ILP32__

	ldrsw	x16,.LOPENSSL_armcap_P

#else

	ldr	x16,.LOPENSSL_armcap_P

#endif

	adr	x17,.LOPENSSL_armcap_P

	add	x16,x16,x17

	ldr	w16,[x16]
@@ -309,7 +313,11 @@ $code.=<<___; 
.long	0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc	//K_40_59

.long	0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6	//K_60_79

.LOPENSSL_armcap_P:

#ifdef	__ILP32__

.long	OPENSSL_armcap_P-.

#else

.quad	OPENSSL_armcap_P-.

#endif

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

.align	2

.comm	OPENSSL_armcap_P,4,4

crypto/sha/asm/sha512-armv8.pl

+8 −0
Original line number Diff line number Diff line
@@ -169,7 +169,11 @@ $code.=<<___; 
$func:

___

$code.=<<___	if ($SZ==4);

#ifdef	__ILP32__

	ldrsw	x16,.LOPENSSL_armcap_P

#else

	ldr	x16,.LOPENSSL_armcap_P

#endif

	adr	x17,.LOPENSSL_armcap_P

	add	x16,x16,x17

	ldr	w16,[x16]
@@ -311,7 +315,11 @@ $code.=<<___; 
.size	.LK$BITS,.-.LK$BITS

.align	3

.LOPENSSL_armcap_P:

#ifdef	__ILP32__

	.long	OPENSSL_armcap_P-.

#else

	.quad	OPENSSL_armcap_P-.

#endif

.asciz	"SHA$BITS block transform for ARMv8, CRYPTOGAMS by <appro\@openssl.org>"

.align	2

___