55cc4d5ede
more of the mbedtls trying to make macro magic even through they do runtime checks Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2793 Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
diff --git a/library/aesni.h b/library/aesni.h
|
|
index 754c984c79..59e27afd3e 100644
|
|
--- a/library/aesni.h
|
|
+++ b/library/aesni.h
|
|
@@ -35,7 +35,7 @@
|
|
/* GCC-like compilers: currently, we only support intrinsics if the requisite
|
|
* target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2`
|
|
* or `clang -maes -mpclmul`). */
|
|
-#if (defined(__GNUC__) || defined(__clang__)) && defined(__AES__) && defined(__PCLMUL__)
|
|
+#if defined(__GNUC__) || defined(__clang__)
|
|
#define MBEDTLS_AESNI_HAVE_INTRINSICS
|
|
#endif
|
|
/* For 32-bit, we only support intrinsics */
|
|
diff --git a/library/aesni.c b/library/aesni.c
|
|
index 2857068..3e104ab 100644
|
|
--- a/library/aesni.c
|
|
+++ b/library/aesni.c
|
|
@@ -31,16 +31,14 @@
|
|
#include <immintrin.h>
|
|
#endif
|
|
|
|
-#if defined(MBEDTLS_ARCH_IS_X86)
|
|
#if defined(MBEDTLS_COMPILER_IS_GCC)
|
|
#pragma GCC push_options
|
|
#pragma GCC target ("pclmul,sse2,aes")
|
|
#define MBEDTLS_POP_TARGET_PRAGMA
|
|
-#elif defined(__clang__) && (__clang_major__ >= 5)
|
|
+#elif defined(__clang__)
|
|
#pragma clang attribute push (__attribute__((target("pclmul,sse2,aes"))), apply_to=function)
|
|
#define MBEDTLS_POP_TARGET_PRAGMA
|
|
#endif
|
|
-#endif
|
|
|
|
#if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY)
|
|
/*
|