From 2b5feb9121a2fd6679c1ec0c6f4f2cb00b6e3616 Mon Sep 17 00:00:00 2001 From: Alessandro Gatti Date: Sun, 22 Sep 2024 12:51:18 +0200 Subject: [PATCH] lib/libffi: Update libffi to 3.4.6. Libffi is updated to the latest stable version (v3.4.6) as the version of libffi that was linked by the repository predates the introduction of RISC-V processors (both 32 and 64 bits). This is necessary as the packaged version of libffi used by the CI for RISC-V 64 turned out to simply not work correctly, whilst a source-built version of libffi worked just fine. Signed-off-by: Alessandro Gatti --- .gitmodules | 2 +- lib/libffi | 2 +- ports/unix/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index e6712c1f9f..6338f0e66d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/micropython/axtls.git [submodule "lib/libffi"] path = lib/libffi - url = https://github.com/atgreen/libffi + url = https://github.com/libffi/libffi [submodule "lib/lwip"] path = lib/lwip url = https://github.com/lwip-tcpip/lwip.git diff --git a/lib/libffi b/lib/libffi index e9de7e35f2..3d0ce1e6fc 160000 --- a/lib/libffi +++ b/lib/libffi @@ -1 +1 @@ -Subproject commit e9de7e35f2339598b16cbb375f9992643ed81209 +Subproject commit 3d0ce1e6fcf19f853894862abcbac0ae78a7be60 diff --git a/ports/unix/Makefile b/ports/unix/Makefile index d5bd6d4098..f02e6c6355 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -168,7 +168,7 @@ ifeq ($(MICROPY_STANDALONE),1) # Build libffi from source. GIT_SUBMODULES += lib/libffi DEPLIBS += libffi -LIBFFI_CFLAGS := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include) +LIBFFI_CFLAGS := -I$(shell ls -1d $(BUILD)/lib/libffi/include) ifeq ($(MICROPY_FORCE_32BIT),1) LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib32/libffi.a else