From d82d5a1fe56239d4d1215c6152f5bd5359c275cc Mon Sep 17 00:00:00 2001 From: matejcik Date: Tue, 9 Jul 2024 11:01:58 +0200 Subject: [PATCH] build(core): fix build for GCC13 we need to cherry-pick two commits into the micropython submodule, and adapt one of the fixes --- core/embed/unix/main.c | 4 ++-- vendor/micropython | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/embed/unix/main.c b/core/embed/unix/main.c index ffef7ca45..413a2a31e 100644 --- a/core/embed/unix/main.c +++ b/core/embed/unix/main.c @@ -682,9 +682,9 @@ MP_NOINLINE int main_(int argc, char **argv) { #if !MICROPY_VFS #ifdef TREZOR_EMULATOR_FROZEN -uint mp_import_stat(const char *path) { return MP_IMPORT_STAT_NO_EXIST; } +mp_import_stat_t mp_import_stat(const char *path) { return MP_IMPORT_STAT_NO_EXIST; } #else -uint mp_import_stat(const char *path) { +mp_import_stat_t mp_import_stat(const char *path) { struct stat st; if (stat(path, &st) == 0) { if (S_ISDIR(st.st_mode)) { diff --git a/vendor/micropython b/vendor/micropython index 27acb6c49..d2d97062f 160000 --- a/vendor/micropython +++ b/vendor/micropython @@ -1 +1 @@ -Subproject commit 27acb6c49f7dedbe5d60b16b8f64ea6c9de82aae +Subproject commit d2d97062f7ef731109e895760035b4e3e047ad8c