... and add patch missing patch to fix build on MIPS soft float system.

Signed-off-by: Oleksij Rempel <o.rem...@pengutronix.de>
---
 ...sed-ifndef-for-__mips_soft_float-442.patch | 25 +++++++++++++++++++
 patches/libffi-3.3/series                     |  4 +++
 rules/libffi.make                             |  4 +--
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 
patches/libffi-3.3/0001-Fixed-missed-ifndef-for-__mips_soft_float-442.patch
 create mode 100644 patches/libffi-3.3/series

diff --git 
a/patches/libffi-3.3/0001-Fixed-missed-ifndef-for-__mips_soft_float-442.patch 
b/patches/libffi-3.3/0001-Fixed-missed-ifndef-for-__mips_soft_float-442.patch
new file mode 100644
index 000000000..fae0a0e7d
--- /dev/null
+++ 
b/patches/libffi-3.3/0001-Fixed-missed-ifndef-for-__mips_soft_float-442.patch
@@ -0,0 +1,25 @@
+From: Carl Hurd <carl.m.h...@gmail.com>
+Date: Fri, 29 Nov 2019 14:46:11 -0500
+Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float (#442)
+
+Thank you!
+---
+ src/mips/o32.S | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/mips/o32.S b/src/mips/o32.S
+index 44e74cb91a21..799139b2968b 100644
+--- a/src/mips/o32.S
++++ b/src/mips/o32.S
+@@ -282,9 +282,11 @@ $LCFI12:
+       li      $13, 1          # FFI_O32
+       bne     $16, $13, 1f    # Skip fp save if FFI_O32_SOFT_FLOAT
+       
++#ifndef __mips_soft_float
+       # Store all possible float/double registers.
+       s.d     $f12, FA_0_0_OFF2($fp)
+       s.d     $f14, FA_1_0_OFF2($fp)
++#endif
+ 1:
+       # prepare arguments for ffi_closure_mips_inner_O32
+       REG_L   a0, 4($15)       # cif 
diff --git a/patches/libffi-3.3/series b/patches/libffi-3.3/series
new file mode 100644
index 000000000..c778250e1
--- /dev/null
+++ b/patches/libffi-3.3/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Fixed-missed-ifndef-for-__mips_soft_float-442.patch
+# 3bcc9eb6287e614be7370f49463a53e9  - git-ptx-patches magic
diff --git a/rules/libffi.make b/rules/libffi.make
index 01da0e573..1feab4bdc 100644
--- a/rules/libffi.make
+++ b/rules/libffi.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi
 #
 # Paths and names
 #
-LIBFFI_VERSION := 3.2.1
-LIBFFI_MD5     := 83b89587607e3eb65c70d361f13bab43
+LIBFFI_VERSION := 3.3
+LIBFFI_MD5     := 6313289e32f1d38a9df4770b014a2ca7
 LIBFFI         := libffi-$(LIBFFI_VERSION)
 LIBFFI_SUFFIX  := tar.gz
 LIBFFI_SOURCE  := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX)
-- 
2.25.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to