From db6ab247fc63b1ea40ba8ccce90abb136ffb1c3a Mon Sep 17 00:00:00 2001
From: Dave Rodgman <dave.rodgman@arm.com>
Date: Tue, 14 Mar 2023 16:03:57 +0000
Subject: [PATCH] Improve macro naming

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
---
 library/aesce.c  | 6 +++---
 library/sha256.c | 4 ++--
 library/sha512.c | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/aesce.c b/library/aesce.c
index 7ccfbba087..acfac23432 100644
--- a/library/aesce.c
+++ b/library/aesce.c
@@ -36,7 +36,7 @@
  * for older compilers.
  */
 #define __ARM_FEATURE_AES    1
-#define MBEDTLS_NEED_TARGET_OPTIONS
+#define MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG
 #endif
 
 #include <string.h>
@@ -48,7 +48,7 @@
 
 #if defined(MBEDTLS_HAVE_ARM64)
 
-#if !defined(__ARM_FEATURE_AES) || defined(MBEDTLS_NEED_TARGET_OPTIONS)
+#if !defined(__ARM_FEATURE_AES) || defined(MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG)
 #   if defined(__clang__)
 #       if __clang_major__ < 4
 #           error "A more recent Clang is required for MBEDTLS_AESCE_C"
@@ -65,7 +65,7 @@
 #   else
 #       error "Only GCC and Clang supported for MBEDTLS_AESCE_C"
 #   endif
-#endif /* !__ARM_FEATURE_AES || MBEDTLS_NEED_TARGET_OPTIONS */
+#endif /* !__ARM_FEATURE_AES || MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG */
 
 #include <arm_neon.h>
 
diff --git a/library/sha256.c b/library/sha256.c
index 29645b06ea..08822f4413 100644
--- a/library/sha256.c
+++ b/library/sha256.c
@@ -41,7 +41,7 @@
  * for older compilers.
  */
 #define __ARM_FEATURE_SHA2   1
-#define MBEDTLS_NEED_TARGET_OPTIONS
+#define MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG
 #endif
 
 #include "common.h"
@@ -60,7 +60,7 @@
 #  if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \
     defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY)
 /* *INDENT-OFF* */
-#    if !defined(__ARM_FEATURE_CRYPTO) || defined(MBEDTLS_NEED_TARGET_OPTIONS)
+#    if !defined(__ARM_FEATURE_CRYPTO) || defined(MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG)
 #      if defined(__clang__)
 #        if __clang_major__ < 4
 #          error "A more recent Clang is required for MBEDTLS_SHA256_USE_A64_CRYPTO_*"
diff --git a/library/sha512.c b/library/sha512.c
index 3e2be08088..67acfee481 100644
--- a/library/sha512.c
+++ b/library/sha512.c
@@ -35,7 +35,7 @@
  * at the top of this file, before any includes.
  */
 #define __ARM_FEATURE_SHA512 1
-#define MBEDTLS_NEED_TARGET_OPTIONS
+#define MBEDTLS_ENABLE_ARM_SHA3_EXTENSIONS_COMPILER_FLAG
 #endif
 
 #include "common.h"
@@ -74,7 +74,7 @@
  * Clang == 13.0.0 same as clang 12 (only seen on macOS)
  * Clang >= 13.0.1 has __ARM_FEATURE_SHA512 and intrinsics
  */
-#    if !defined(__ARM_FEATURE_SHA512) || defined(MBEDTLS_NEED_TARGET_OPTIONS)
+#    if !defined(__ARM_FEATURE_SHA512) || defined(MBEDTLS_ENABLE_ARM_SHA3_EXTENSIONS_COMPILER_FLAG)
        /* Test Clang first, as it defines __GNUC__ */
 #      if defined(__clang__)
 #        if __clang_major__ < 7