Improve macro naming

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-03-14 16:03:57 +00:00
parent 023c8853ac
commit db6ab247fc
3 changed files with 7 additions and 7 deletions

View File

@ -36,7 +36,7 @@
* for older compilers. * for older compilers.
*/ */
#define __ARM_FEATURE_AES 1 #define __ARM_FEATURE_AES 1
#define MBEDTLS_NEED_TARGET_OPTIONS #define MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG
#endif #endif
#include <string.h> #include <string.h>
@ -48,7 +48,7 @@
#if defined(MBEDTLS_HAVE_ARM64) #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 defined(__clang__)
# if __clang_major__ < 4 # if __clang_major__ < 4
# error "A more recent Clang is required for MBEDTLS_AESCE_C" # error "A more recent Clang is required for MBEDTLS_AESCE_C"
@ -65,7 +65,7 @@
# else # else
# error "Only GCC and Clang supported for MBEDTLS_AESCE_C" # error "Only GCC and Clang supported for MBEDTLS_AESCE_C"
# endif # endif
#endif /* !__ARM_FEATURE_AES || MBEDTLS_NEED_TARGET_OPTIONS */ #endif /* !__ARM_FEATURE_AES || MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG */
#include <arm_neon.h> #include <arm_neon.h>

View File

@ -41,7 +41,7 @@
* for older compilers. * for older compilers.
*/ */
#define __ARM_FEATURE_SHA2 1 #define __ARM_FEATURE_SHA2 1
#define MBEDTLS_NEED_TARGET_OPTIONS #define MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG
#endif #endif
#include "common.h" #include "common.h"
@ -60,7 +60,7 @@
# if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \ # if defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \
defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY) defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY)
/* *INDENT-OFF* */ /* *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 defined(__clang__)
# if __clang_major__ < 4 # if __clang_major__ < 4
# error "A more recent Clang is required for MBEDTLS_SHA256_USE_A64_CRYPTO_*" # error "A more recent Clang is required for MBEDTLS_SHA256_USE_A64_CRYPTO_*"

View File

@ -35,7 +35,7 @@
* at the top of this file, before any includes. * at the top of this file, before any includes.
*/ */
#define __ARM_FEATURE_SHA512 1 #define __ARM_FEATURE_SHA512 1
#define MBEDTLS_NEED_TARGET_OPTIONS #define MBEDTLS_ENABLE_ARM_SHA3_EXTENSIONS_COMPILER_FLAG
#endif #endif
#include "common.h" #include "common.h"
@ -74,7 +74,7 @@
* Clang == 13.0.0 same as clang 12 (only seen on macOS) * Clang == 13.0.0 same as clang 12 (only seen on macOS)
* Clang >= 13.0.1 has __ARM_FEATURE_SHA512 and intrinsics * 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__ */ /* Test Clang first, as it defines __GNUC__ */
# if defined(__clang__) # if defined(__clang__)
# if __clang_major__ < 7 # if __clang_major__ < 7