From: Paul Elliott <paul.elliott@arm.com>
Date: Mon, 15 Dec 2025 13:05:00 +0000 (+0000)
Subject: Fix error in PAC/BTI AArch64 build
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87d135619f42bb0e5becd47e4e53bd4764b1faea;p=thirdparty%2Fopenssl.git

Fix error in PAC/BTI AArch64 build

Clang format removes a space here, which creates a compiler error when
building for PAC/BTI. Fix this and Turn off clang format for this line

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/29399)
---

diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index f44d6f59674..e871d4afae9 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -184,7 +184,9 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
 #endif
 
 #if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0
-.pushsection.note.gnu.property, "a";
+/* clang-format off */
+.pushsection .note.gnu.property, "a";
+/* clang-format on */
 .balign 8;
 .long 4;
 .long 0x10;