mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-02 07:20:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression issue for clang workaround.

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2023-02-22 11:01:07 +08:00
parent ba4ec24c79
commit 4d786a732b
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/sha256.c
View File

@ -29,24 +29,17 @@
* The intrinsic declaration are guarded with ACLE predefined macros in clang, * The intrinsic declaration are guarded with ACLE predefined macros in clang,
* and those macros are only enabled with command line. Define the macros can * and those macros are only enabled with command line. Define the macros can
* enable those declaration and avoid compile error on it. * enable those declaration and avoid compile error on it.
*
* `arm_neon.h` might be included in any head files. On the top of this file, we
* can guarantee this workaround always work.
*/ */
#define __ARM_FEATURE_CRYPTO 1 #define __ARM_FEATURE_CRYPTO 1
#pragma clang attribute push (__attribute__((target("crypto"))), apply_to=function) #define NEED_TARGET_OPTIONS
#define MBEDTLS_POP_TARGET_PRAGMA
#endif /* __aarch64__ && __clang__ && #endif /* __aarch64__ && __clang__ &&
!__ARM_FEATURE_CRYPTO && __clang_major__ < 18 && __clang_major__ > 3 */ !__ARM_FEATURE_CRYPTO && __clang_major__ < 18 && __clang_major__ > 3 */
#include "common.h" #include "common.h"
#if defined(MBEDTLS_POP_TARGET_PRAGMA) && \
!(defined(MBEDTLS_SHA256_USE_A64_CRYPTO_IF_PRESENT) || \
defined(MBEDTLS_SHA256_USE_A64_CRYPTO_ONLY))
#if defined(__clang__)
#pragma clang attribute pop
#endif
#undef MBEDTLS_POP_TARGET_PRAGMA
#endif
#if defined(MBEDTLS_SHA256_C) || defined(MBEDTLS_SHA224_C) #if defined(MBEDTLS_SHA256_C) || defined(MBEDTLS_SHA224_C)
#include "mbedtls/sha256.h" #include "mbedtls/sha256.h"
@ -61,7 +54,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) # if !defined(__ARM_FEATURE_CRYPTO) || defined(NEED_TARGET_OPTIONS)
# 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_*"

8
library/sha512.c
View File

@ -30,10 +30,12 @@
* The intrinsic declaration are guarded with ACLE predefined macros in clang, * The intrinsic declaration are guarded with ACLE predefined macros in clang,
* and those macros are only enabled with command line. Define the macros can * and those macros are only enabled with command line. Define the macros can
* enable those declaration and avoid compile error on it. * enable those declaration and avoid compile error on it.
*
* `arm_neon.h` might be included in any head files. On the top of this file, we
* can guarantee this workaround always work.
*/ */
#define __ARM_FEATURE_SHA512 1 #define __ARM_FEATURE_SHA512 1
#pragma clang attribute push (__attribute__((target("crypto"))), apply_to=function) #define NEED_TARGET_OPTIONS
#define MBEDTLS_POP_TARGET_PRAGMA
#endif /* __aarch64__ && __clang__ && #endif /* __aarch64__ && __clang__ &&
!__ARM_FEATURE_SHA512 && __clang_major__ < 18 && !__ARM_FEATURE_SHA512 && __clang_major__ < 18 &&
__clang_major__ >= 13 && __clang_minor__ > 0 && __clang_major__ >= 13 && __clang_minor__ > 0 &&
@ -84,7 +86,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) # if !defined(__ARM_FEATURE_SHA512) || defined(NEED_TARGET_OPTIONS)
/* 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