From 580e06fb07682983231b7bb8bcf7c447fee27896 Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Fri, 28 Apr 2023 17:42:40 +0800 Subject: [PATCH] fix armclang compile fail `__ARM_FEATURE_AES` is not defined with `armclang < 6.10`. And it raise error on `target("crypto,aes") Signed-off-by: Jerry Yu --- library/aesce.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/aesce.c b/library/aesce.c index babd9a64ba..b46a0e4d39 100644 --- a/library/aesce.c +++ b/library/aesce.c @@ -68,7 +68,8 @@ #include -#if !defined(__ARM_FEATURE_AES) || defined(MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG) +#if !(defined(__ARM_FEATURE_CRYPTO) || defined(__ARM_FEATURE_AES)) || \ + defined(MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG) # if defined(__clang__) # pragma clang attribute push (__attribute__((target("crypto,aes"))), apply_to=function) # define MBEDTLS_POP_TARGET_PRAGMA @@ -79,7 +80,8 @@ # elif defined(_MSC_VER) # error "Required feature(__ARM_FEATURE_AES) is not enabled." # endif -#endif /* !__ARM_FEATURE_AES || MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG */ +#endif /* !(__ARM_FEATURE_CRYPTO || __ARM_FEATURE_AES) || + MBEDTLS_ENABLE_ARM_CRYPTO_EXTENSIONS_COMPILER_FLAG */ #if defined(__linux__) #include