Merge pull request #36957 from akien-mga/mbedtls-padlock-unsupported
mbedtls: Re-add patch to disable VIA padlock
This commit is contained in:
commit
f67ebdc4a8
3 changed files with 19 additions and 1 deletions
3
thirdparty/README.md
vendored
3
thirdparty/README.md
vendored
|
@ -312,6 +312,9 @@ File extracted from upstream release tarball (`-apache.tgz` variant):
|
||||||
- LICENSE and apache-2.0.txt files
|
- LICENSE and apache-2.0.txt files
|
||||||
- Applied the patch in `thirdparty/mbedtls/patches/1453.diff` (PR 1453).
|
- Applied the patch in `thirdparty/mbedtls/patches/1453.diff` (PR 1453).
|
||||||
Soon to be merged upstream. Check it out at next update.
|
Soon to be merged upstream. Check it out at next update.
|
||||||
|
- Applied the patch in `thirdparty/mbedtls/patches/padlock.diff`. This disables
|
||||||
|
VIA padlock support which defines a symbol `unsupported` which clashes with
|
||||||
|
a pre-defined symbol.
|
||||||
- Added 2 files `godot_core_mbedtls_platform.{c,h}` providing configuration
|
- Added 2 files `godot_core_mbedtls_platform.{c,h}` providing configuration
|
||||||
for light bundling with core.
|
for light bundling with core.
|
||||||
|
|
||||||
|
|
4
thirdparty/mbedtls/include/mbedtls/config.h
vendored
4
thirdparty/mbedtls/include/mbedtls/config.h
vendored
|
@ -2542,7 +2542,9 @@
|
||||||
*
|
*
|
||||||
* This modules adds support for the VIA PadLock on x86.
|
* This modules adds support for the VIA PadLock on x86.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PADLOCK_C
|
// -- GODOT start --
|
||||||
|
// #define MBEDTLS_PADLOCK_C
|
||||||
|
// -- GODOT end --
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \def MBEDTLS_PEM_PARSE_C
|
* \def MBEDTLS_PEM_PARSE_C
|
||||||
|
|
13
thirdparty/mbedtls/patches/padlock.diff
vendored
Normal file
13
thirdparty/mbedtls/patches/padlock.diff
vendored
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
--- a/thirdparty/mbedtls/include/mbedtls/config.h
|
||||||
|
+++ b/thirdparty/mbedtls/include/mbedtls/config.h
|
||||||
|
@@ -2477,7 +2477,9 @@
|
||||||
|
*
|
||||||
|
* This modules adds support for the VIA PadLock on x86.
|
||||||
|
*/
|
||||||
|
-#define MBEDTLS_PADLOCK_C
|
||||||
|
+// -- GODOT start --
|
||||||
|
+// #define MBEDTLS_PADLOCK_C
|
||||||
|
+// -- GODOT end --
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \def MBEDTLS_PEM_PARSE_C
|
Loading…
Reference in a new issue