git: 417778192361 - main - aarch64: fix branch target indications in arm64cpuid.pl and keccak1600

From: Andrew Turner <andrew_at_FreeBSD.org>
Date: Mon, 02 Oct 2023 16:13:46 UTC
The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=41777819236110907dd4cff98ef70dfd0629f744

commit 41777819236110907dd4cff98ef70dfd0629f744
Author:     Tom Cosgrove <tom.cosgrove@arm.com>
AuthorDate: 2022-02-07 14:44:56 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2023-10-02 16:12:49 +0000

    aarch64: fix branch target indications in arm64cpuid.pl and keccak1600
    
    Add missing AARCH64_VALID_CALL_TARGET to armv8_rng_probe(). Also add
    these to the functions defined by gen_random(), and note that this Perl
    sub prints the assembler out directly, not going via the $code xlate
    mechanism (and therefore coming before the include of arm_arch.h). So
    fix this too.
    
    In KeccakF1600_int, AARCH64_SIGN_LINK_REGISTER functions as
    AARCH64_VALID_CALL_TARGET on BTI-only builds, so it needs to come before
    the 'adr' line.
    
    Change-Id: If241efe71591c88253a3e36647ced00300c3c1a3
    
    Reviewed-by: Tomas Mraz <tomas@openssl.org>
    Reviewed-by: Paul Dale <pauli@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17653)
    
    Obtained from:  OpenSSL 3a23f01268ec
---
 crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl b/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl
index cf54b62c636a..40f7aa7a695a 100755
--- a/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl
+++ b/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl
@@ -126,8 +126,8 @@ $code.=<<___;
 .type	KeccakF1600_int,%function
 .align	5
 KeccakF1600_int:
-	adr	$C[2],iotas
 	AARCH64_SIGN_LINK_REGISTER
+	adr	$C[2],iotas
 	stp	$C[2],x30,[sp,#16]		// 32 bytes on top are mine
 	b	.Loop
 .align	4