From b0ee4b0ed7bf46fc9e716f1dd431261a3ed7674c Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 20 Oct 2025 02:36:47 +0000 Subject: [PATCH] [android] force mbedtls to not make bad codegen by explicitly enabling appropriate macro flags (runtime check is done anyways) Signed-off-by: lizzie --- .patch/mbedtls/0004-arm64-aes-fix.patch | 17 +++++++++++++++++ externals/cpmfile.json | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .patch/mbedtls/0004-arm64-aes-fix.patch diff --git a/.patch/mbedtls/0004-arm64-aes-fix.patch b/.patch/mbedtls/0004-arm64-aes-fix.patch new file mode 100644 index 0000000000..b7dcf7fb67 --- /dev/null +++ b/.patch/mbedtls/0004-arm64-aes-fix.patch @@ -0,0 +1,17 @@ +diff --git a/library/common.h b/library/common.h +index 50f2a29..372e80c 100644 +--- a/library/common.h ++++ b/library/common.h +@@ -19,10 +19,10 @@ + #include + #include + +-#if defined(__ARM_NEON) ++#if defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64) + #include + #define MBEDTLS_HAVE_NEON_INTRINSICS +-#elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64) ++#else + #include + #define MBEDTLS_HAVE_NEON_INTRINSICS + #endif diff --git a/externals/cpmfile.json b/externals/cpmfile.json index a8376db540..386727ab87 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -108,7 +108,8 @@ "skip_updates": true, "patches": [ "0002-aesni-fix.patch", - "0003-aesni-fix.patch" + "0003-aesni-fix.patch", + "0004-arm64-aes-fix.patch" ] }, "enet": {