[DistroKit] [PATCH v3 2/3] platform-mips: libffi version 3.3

[Oleksij Rempel <o.rempel@pengutronix.de>]

This version is needed to build libffi with mips soft float toolchain

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

diff --git a/configs/platform-mips/patches/libffi-3.3/0001-Fixed-missed-ifndef-for-__mips_soft_float-442.patch b/configs/platform-mips/patches/libffi-3.3/0001-Fixed-missed-ifndef-for-__mips_soft_float-442.patch
new file mode 100644
index 0000000..fae0a0e
--- /dev/null
+++ b/configs/platform-mips/patches/libffi-3.3/0001-Fixed-missed-ifndef-for-__mips_soft_float-442.patch
@@ -0,0 +1,25 @@
+From: Carl Hurd <carl.m.hurd@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/configs/platform-mips/patches/libffi-3.3/series b/configs/platform-mips/patches/libffi-3.3/series
new file mode 100644
index 0000000..c778250
--- /dev/null
+++ b/configs/platform-mips/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/configs/platform-mips/rules/libffi.make b/configs/platform-mips/rules/libffi.make
new file mode 100644
index 0000000..1feab4b
--- /dev/null
+++ b/configs/platform-mips/rules/libffi.make
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2008 by Robert Schwebel <r.schwebel@pengutronix.de>
+#               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBFFI) += libffi
+
+#
+# Paths and names
+#
+LIBFFI_VERSION	:= 3.3
+LIBFFI_MD5	:= 6313289e32f1d38a9df4770b014a2ca7
+LIBFFI		:= libffi-$(LIBFFI_VERSION)
+LIBFFI_SUFFIX	:= tar.gz
+LIBFFI_SOURCE	:= $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX)
+LIBFFI_DIR	:= $(BUILDDIR)/$(LIBFFI)
+LIBFFI_URL	:= \
+	http://ftp.gwdg.de/pub/linux/sources.redhat.com/libffi/$(LIBFFI).$(LIBFFI_SUFFIX) \
+	ftp://sourceware.org/pub/libffi/$(LIBFFI).$(LIBFFI_SUFFIX)
+LIBFFI_LICENSE	:= MIT
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+LIBFFI_CONF_TOOL := autoconf
+LIBFFI_CONF_OPT := \
+	$(CROSS_AUTOCONF_USR) \
+	--disable-static \
+	--enable-portable-binary \
+	--disable-pax_emutramp \
+	--disable-debug \
+	--enable-structs \
+	--enable-raw-api \
+	--disable-purify-safety \
+	--without-gcc-arch
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libffi.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libffi)
+	@$(call install_fixup, libffi,PRIORITY,optional)
+	@$(call install_fixup, libffi,SECTION,base)
+	@$(call install_fixup, libffi,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
+	@$(call install_fixup, libffi,DESCRIPTION,missing)
+
+	@$(call install_lib, libffi, 0, 0, 0644, libffi)
+
+	@$(call install_finish, libffi)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.25.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de