Browse Source
Remove mbedtls patches
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3606/head
crueter
2 weeks ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with
0 additions and
55 deletions
-
.patch/mbedtls/0001-aesni-fix.patch
-
.patch/mbedtls/0002-arm64-aes-fix.patch
|
|
@ -1,35 +0,0 @@ |
|
|
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) |
|
|
|
|
|
/* |
|
|
|
|
|
@ -1,20 +0,0 @@ |
|
|
diff --git a/library/common.h b/library/common.h
|
|
|
|
|
|
index 50f2a29..c60d9dc 100644
|
|
|
|
|
|
--- a/library/common.h
|
|
|
|
|
|
+++ b/library/common.h
|
|
|
|
|
|
@@ -19,11 +19,11 @@
|
|
|
|
|
|
#include <stdint.h> |
|
|
|
|
|
#include <stddef.h> |
|
|
|
|
|
|
|
|
|
|
|
-#if defined(__ARM_NEON)
|
|
|
|
|
|
-#include <arm_neon.h>
|
|
|
|
|
|
+#if defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
|
|
|
|
|
|
+#include <arm64_neon.h>
|
|
|
|
|
|
#define MBEDTLS_HAVE_NEON_INTRINSICS |
|
|
|
|
|
-#elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
|
|
|
|
|
|
-#include <arm64_neon.h>
|
|
|
|
|
|
+#elif (defined(__ANDROID__) && defined(__ARM_FP)) || defined(__ARM_NEON)
|
|
|
|
|
|
+#include <arm_neon.h>
|
|
|
|
|
|
#define MBEDTLS_HAVE_NEON_INTRINSICS |
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|