VERY experimental Nintendo Switch 2 emulator
C++
[experiment] mbedtls force ARM64 Neon even when macros say otherwise (#2793)
lizzie55cc4d5edef9
diff --git a/.patch/mbedtls/0003-aesni-fix.patch b/.patch/mbedtls/0001-aesni-fix.patchsimilarity index 52%rename from .patch/mbedtls/0003-aesni-fix.patchrename to .patch/mbedtls/0001-aesni-fix.patchindex c620b42554..5587e4c22d 100644--- a/.patch/mbedtls/0003-aesni-fix.patch+++ b/.patch/mbedtls/0001-aesni-fix.patch@@ -1,3 +1,16 @@+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.cindex 2857068..3e104ab 100644--- a/library/aesni.cdiff --git a/.patch/mbedtls/0001-cmake-version.patch b/.patch/mbedtls/0001-cmake-version.patchdeleted file mode 100644index 2b78804884..0000000000--- a/.patch/mbedtls/0001-cmake-version.patch+++ /dev/null@@ -1,10 +0,0 @@-diff --git a/CMakeLists.txt b/CMakeLists.txt-index 1811c42..bac9098 100644---- a/CMakeLists.txt-+++ b/CMakeLists.txt-@@ -1,4 +1,4 @@--cmake_minimum_required(VERSION 2.6)-+cmake_minimum_required(VERSION 3.5)- if(TEST_CPP)- project("mbed TLS" C CXX)- else()diff --git a/.patch/mbedtls/0002-aesni-fix.patch b/.patch/mbedtls/0002-aesni-fix.patchdeleted file mode 100644index dc5d3153b7..0000000000--- a/.patch/mbedtls/0002-aesni-fix.patch+++ /dev/null@@ -1,13 +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/.patch/mbedtls/0002-arm64-aes-fix.patch b/.patch/mbedtls/0002-arm64-aes-fix.patchnew file mode 100644index 0000000000..285cb75139--- /dev/null+++ b/.patch/mbedtls/0002-arm64-aes-fix.patch@@ -0,0 +1,20 @@+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.h>+ #define MBEDTLS_HAVE_NEON_INTRINSICS+-#elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)+-#include <arm64_neon.h>++#elif defined(__ANDROID__) || defined(__ARM_NEON)++#include <arm_neon.h>+ #define MBEDTLS_HAVE_NEON_INTRINSICS+ #endif+diff --git a/externals/cpmfile.json b/externals/cpmfile.jsonindex a10c2381bc..0a059cdaef 100644--- a/externals/cpmfile.json+++ b/externals/cpmfile.json@@ -103,8 +103,8 @@"artifact": "%TAG%.tar.bz2","skip_updates": true,"patches": [- "0002-aesni-fix.patch",- "0003-aesni-fix.patch"+ "0001-aesni-fix.patch",+ "0002-arm64-aes-fix.patch"]},"enet": {