From 85e28b266ecf8ac2bf2ffb9e41ae3a2f2771b756 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Thu, 11 Dec 2025 15:32:18 +0100
Subject: [PATCH] AESCE: fix the build with Clang <<16

As indicated in a comment, with older Clang, we need to define
`__ARM_FEATURE_CRYPTO` before we include `arm_neon.h`, which is done via
`common.h`. 4c44990d65385fd0391ead9d88a2d9f6a7e93df1
accidentally broke this. Fix it, while taking care not to include another
header before `common.h`.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
---
 library/aesce.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/aesce.c b/library/aesce.c
index bd9c483968..2f394feb41 100644
--- a/library/aesce.c
+++ b/library/aesce.c
@@ -5,10 +5,6 @@
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
 
-#include "common.h"
-
-#if defined(MBEDTLS_AESCE_C)
-
 #if defined(__clang__) &&  (__clang_major__ >= 4)
 
 /* Ideally, we would simply use MBEDTLS_ARCH_IS_ARMV8_A in the following #if,
@@ -42,6 +38,10 @@
 
 #endif /* defined(__clang__) &&  (__clang_major__ >= 4) */
 
+#include "common.h"
+
+#if defined(MBEDTLS_AESCE_C)
+
 #include <string.h>
 
 #include "aesce.h"