package/libffi: bump to version 3.2.1

From 102c02de867bfe831b5366c89d66bcf170db962e Mon Sep 17 00:00:00 2001

From 580f46a7bc6e9fea3a2227b5268cc3aed1d60e3b Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Date: Thu, 7 Feb 2013 22:26:56 +0100

Subject: [PATCH] Fix installation location of libffi

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

The libffi is currently declared as toolexeclib_LTLIBRARIES. In many

cases, toolexeclib libraries will be installed in /usr/lib, so it

library is always installed in /usr/lib.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

[unfuzz for 3.2.1]

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>

---

 Makefile.am | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am

index 6f669ca..b60bcc1 100644

index 0e40451..309474c 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -93,7 +93,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)

@@ -104,7 +104,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)

 MAKEOVERRIDES=

 libffi_la_SOURCES = src/prep_cif.c src/types.c \

-- 

1.7.9.5

2.5.3

From 31b6b6bc14197cd4183bdbd311fddeb36b5ae100 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>

Date: Sat, 19 Sep 2015 22:53:29 +0200

Subject: [PATCH] Fix use of compact eh frames on MIPS

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Newer MIPS toolchains use a different (compact) eh_frame format.

libffi don't like them, so we have to switch to the older format.

Mips and compiler support it.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>

[unfuzz for 3.2.1]

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>

---

 configure.ac | 10 ++++++++++

 1 file changed, 10 insertions(+)

--- a/configure.ac	2013-08-08 14:53:11.884267155 +0200

+++ b/configure.ac	2013-08-08 14:54:14.437493244 +0200

@@ -430,6 +430,16 @@

diff --git a/configure.ac b/configure.ac

index a7bf5ee..36cd0d4 100644

--- a/configure.ac

+++ b/configure.ac

@@ -469,6 +469,16 @@ esac

 AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1)

 AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE)

+fi

+

 if test x$TARGET = xX86_64; then

     AC_CACHE_CHECK([assembler supports unwind section type],

     AC_CACHE_CHECK([toolchain supports unwind section type],

 	libffi_cv_as_x86_64_unwind_section_type, [

-- 

2.5.3

From cbc5a3c0200aa6c2cf8d6798d69a21501557c83f Mon Sep 17 00:00:00 2001

From: Ryan Hill <rhill@gentoo.org>

Date: Sat, 31 May 2014 08:26:34 -0400

Subject: [PATCH 05/10] Fix typo

This patch was borrowed from upstream, commit

cbc5a3c0200aa6c2cf8d6798d69a21501557c83f, and will be part of the next

3.1.1 release.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---

 include/ffi.h.in | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/ffi.h.in b/include/ffi.h.in

index 93c776f..70c6179 100644

--- a/include/ffi.h.in

+++ b/include/ffi.h.in

@@ -1,5 +1,5 @@

 /* -----------------------------------------------------------------*-C-*-

-   libffi @VERSION@ - Copyright (c) 2011 Anthony Green

+   libffi @VERSION@ - Copyright (c) 2011, 2014 Anthony Green

                     - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.

    Permission is hereby granted, free of charge, to any person

@@ -221,10 +221,10 @@ typedef struct {

 #endif

 } ffi_cif;

-#if HAVE_LONG_DOUBLE_VARIANT

+#if @HAVE_LONG_DOUBLE_VARIANT@

 /* Used to adjust size/alignment of ffi types.  */

 void ffi_prep_types (ffi_abi abi);

-# endif

+#endif

 /* Used internally, but overridden by some architectures */

 ffi_status ffi_prep_cif_core(ffi_cif *cif,

-- 

2.0.0

From 978c9540154d320525488db1b7049277122f736d Mon Sep 17 00:00:00 2001

From: Samuli Suominen <ssuominen@gentoo.org>

Date: Sat, 31 May 2014 08:53:10 -0400

Subject: [PATCH 06/10] Add missing GNU stack markings in win32.S

This patch was borrowed from upstream, commit

978c9540154d320525488db1b7049277122f736d, and will be part of the next

3.1.1 release.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---

 src/x86/win32.S | 6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/x86/win32.S b/src/x86/win32.S

index daf0e79..e42baf2 100644

--- a/src/x86/win32.S

+++ b/src/x86/win32.S

@@ -1,5 +1,6 @@

 /* -----------------------------------------------------------------------

-   win32.S - Copyright (c) 1996, 1998, 2001, 2002, 2009  Red Hat, Inc.

+   win32.S - Copyright (c) 2014  Anthony Green

+	     Copyright (c) 1996, 1998, 2001, 2002, 2009  Red Hat, Inc.

 	     Copyright (c) 2001  John Beniton

 	     Copyright (c) 2002  Ranjit Mathew

 	     Copyright (c) 2009  Daniel Witte

@@ -1304,3 +1305,6 @@ L_ffi_closure_SYSV_inner$stub:

 #endif /* !_MSC_VER */

+#if defined __ELF__ && defined __linux__

+	.section	.note.GNU-stack,"",@progbits

+#endif

-- 

2.0.0

From ad0d1d239afc7ad09203847793dcc020856d1035 Mon Sep 17 00:00:00 2001

From: Samuli Suominen <ssuominen@gentoo.org>

Date: Thu, 12 Jun 2014 06:30:21 -0400

Subject: [PATCH 09/10] Fix paths in libffi.pc.in

This patch was borrowed from upstream, commit

ad0d1d239afc7ad09203847793dcc020856d1035, and will be part of the next

3.1.1 release.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---

 configure.ac | 10 +++++-----

 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac

index 4f7fe3f..bbc1a9d 100644

--- a/configure.ac

+++ b/configure.ac

@@ -590,11 +590,11 @@ AC_ARG_ENABLE(purify-safety,

 if test "x$GCC" = "xyes"; then

   if test -n "$with_cross_host" &&

      test x"$with_cross_host" != x"no"; then

-    toolexecdir='$(exec_prefix)/$(target_alias)'

-    toolexeclibdir='$(toolexecdir)/lib'

+    toolexecdir="${exec_prefix}"/'$(target_alias)'

+    toolexeclibdir="${toolexecdir}"/lib

   else

-    toolexecdir='$(libdir)/gcc-lib/$(target_alias)'

-    toolexeclibdir='$(libdir)'

+    toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'

+    toolexeclibdir="${libdir}"

   fi

   multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`

   case $multi_os_directory in

@@ -603,7 +603,7 @@ if test "x$GCC" = "xyes"; then

   esac

   AC_SUBST(toolexecdir)

 else

-  toolexeclibdir='$(libdir)'

+  toolexeclibdir="${libdir}"

 fi

 AC_SUBST(toolexeclibdir)

-- 

2.0.0