mbedtls: Fix UWP arm32 build after 2.28.3 enabled AES-NI intrinsics on MSVC
This commit is contained in:
parent
7ce807a9c5
commit
a9710a2a9b
3 changed files with 22 additions and 3 deletions
3
thirdparty/README.md
vendored
3
thirdparty/README.md
vendored
|
@ -288,7 +288,8 @@ File extracted from upstream release tarball:
|
|||
- The `LICENSE` file.
|
||||
- Applied the patch in `patches/1453.diff` to fix UWP build (upstream PR:
|
||||
https://github.com/ARMmbed/mbedtls/pull/1453).
|
||||
Applied the patch in `patches/windows-arm64-hardclock.diff`
|
||||
Applied the patch in `patches/windows-arm64-hardclock.diff`.
|
||||
Applied the patch in `aesni-no-arm-intrinsics.patch` also to fix UWP build.
|
||||
- Added 2 files `godot_core_mbedtls_platform.c` and `godot_core_mbedtls_config.h`
|
||||
providing configuration for light bundling with core.
|
||||
|
||||
|
|
5
thirdparty/mbedtls/include/mbedtls/aesni.h
vendored
5
thirdparty/mbedtls/include/mbedtls/aesni.h
vendored
|
@ -54,9 +54,10 @@
|
|||
* macros that may change in future releases.
|
||||
*/
|
||||
#undef MBEDTLS_AESNI_HAVE_INTRINSICS
|
||||
#if defined(_MSC_VER)
|
||||
#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
|
||||
/* Visual Studio supports AESNI intrinsics since VS 2008 SP1. We only support
|
||||
* VS 2013 and up for other reasons anyway, so no need to check the version. */
|
||||
* VS 2013 and up for other reasons anyway, so no need to check the version.
|
||||
* Only supported on x64 and x86. */
|
||||
#define MBEDTLS_AESNI_HAVE_INTRINSICS
|
||||
#endif
|
||||
/* GCC-like compilers: currently, we only support intrinsics if the requisite
|
||||
|
|
17
thirdparty/mbedtls/patches/aesni-no-arm-intrinsics.patch
vendored
Normal file
17
thirdparty/mbedtls/patches/aesni-no-arm-intrinsics.patch
vendored
Normal file
|
@ -0,0 +1,17 @@
|
|||
diff --git a/thirdparty/mbedtls/include/mbedtls/aesni.h b/thirdparty/mbedtls/include/mbedtls/aesni.h
|
||||
index 6741dead05..6c545bd4a3 100644
|
||||
--- a/thirdparty/mbedtls/include/mbedtls/aesni.h
|
||||
+++ b/thirdparty/mbedtls/include/mbedtls/aesni.h
|
||||
@@ -54,9 +54,10 @@
|
||||
* macros that may change in future releases.
|
||||
*/
|
||||
#undef MBEDTLS_AESNI_HAVE_INTRINSICS
|
||||
-#if defined(_MSC_VER)
|
||||
+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
|
||||
/* Visual Studio supports AESNI intrinsics since VS 2008 SP1. We only support
|
||||
- * VS 2013 and up for other reasons anyway, so no need to check the version. */
|
||||
+ * VS 2013 and up for other reasons anyway, so no need to check the version.
|
||||
+ * Only supported on x64 and x86. */
|
||||
#define MBEDTLS_AESNI_HAVE_INTRINSICS
|
||||
#endif
|
||||
/* GCC-like compilers: currently, we only support intrinsics if the requisite
|
Loading…
Reference in a new issue