diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-10 09:31:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 09:31:00 +0100 |
| commit | f67ebdc4a85cbf6ee3c3cb52b2aab63564fc71b7 (patch) | |
| tree | 93901952ca42a555a2028653abf4c239221f886a | |
| parent | f70b5fa30cd91f0375b43efae7de5d9d7151130c (diff) | |
| parent | 8189abd64a0871871fbae5a8e94753b99a2af2ae (diff) | |
Merge pull request #36957 from akien-mga/mbedtls-padlock-unsupported
mbedtls: Re-add patch to disable VIA padlock
| -rw-r--r-- | thirdparty/README.md | 3 | ||||
| -rw-r--r-- | thirdparty/mbedtls/include/mbedtls/config.h | 4 | ||||
| -rw-r--r-- | thirdparty/mbedtls/patches/padlock.diff | 13 |
3 files changed, 19 insertions, 1 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 0602d2a1d1..5c9c114ad1 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -312,6 +312,9 @@ File extracted from upstream release tarball (`-apache.tgz` variant): - LICENSE and apache-2.0.txt files - Applied the patch in `thirdparty/mbedtls/patches/1453.diff` (PR 1453). 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 for light bundling with core. diff --git a/thirdparty/mbedtls/include/mbedtls/config.h b/thirdparty/mbedtls/include/mbedtls/config.h index 834cced87f..8d9c31a504 100644 --- a/thirdparty/mbedtls/include/mbedtls/config.h +++ b/thirdparty/mbedtls/include/mbedtls/config.h @@ -2542,7 +2542,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 diff --git a/thirdparty/mbedtls/patches/padlock.diff b/thirdparty/mbedtls/patches/padlock.diff new file mode 100644 index 0000000000..6ace48891c --- /dev/null +++ b/thirdparty/mbedtls/patches/padlock.diff @@ -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 |