util-linux: add numbers to patches
PATCH 1/3 util-linux: add numbers to patches
As we are going to add an Xtensa related patch that needs to be applied *after* the AArch64 patch, let's first add a number to each util-linux patch file name, so that we know they will be applied in the right order.
--- .../util-linux-001-sscanf-no-ms-as.patch | 87 ++++++++++++++++++++ .../util-linux-002-uclibc-build-fix.patch | 16 ++++ .../util-linux-003-fdisk-aarch64-support.patch | 22 +++++ .../util-linux-fdisk-aarch64-support.patch | 22 ----- .../util-linux/util-linux-sscanf-no-ms-as.patch | 87 -------------------- .../util-linux/util-linux-uclibc-build-fix.patch | 16 ---- 6 files changed, 125 insertions(+), 125 deletions(-) create mode 100644 package/util-linux/util-linux-001-sscanf-no-ms-as.patch create mode 100644 package/util-linux/util-linux-002-uclibc-build-fix.patch create mode 100644 package/util-linux/util-linux-003-fdisk-aarch64-support.patch delete mode 100644 package/util-linux/util-linux-fdisk-aarch64-support.patch delete mode 100644 package/util-linux/util-linux-sscanf-no-ms-as.patch delete mode 100644 package/util-linux/util-linux-uclibc-build-fix.patch
package/util-linux/util-linux-001-sscanf-no-ms-as.patch new file +87 -0
@@ -0,0 +1,87 @@ +[PATCH] Fix libmount build under uClibc + +Taken from gentoo-hardened: +http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=91879751 + +For details, see https://bugs.gentoo.org/show_bug.cgi?id=406303 + +Signed-off-by: Peter Korsgaard <[email protected]> +diff -Naur util-linux-2.20.1.orig/libmount/src/tab_parse.c util-linux-2.20.1/libmount/src/tab_parse.c +--- util-linux-2.20.1.orig/libmount/src/tab_parse.c 2011-12-12 20:51:06.646614964 -0500 ++++ util-linux-2.20.1/libmount/src/tab_parse.c 2011-12-12 21:02:03.587865010 -0500 +@@ -51,19 +51,21 @@ + */ + static int mnt_parse_table_line(struct libmnt_fs *fs, char *s) + { +- int rc, n = 0; +- char *src, *fstype, *optstr; +- +- rc = sscanf(s, UL_SCNsA" " /* (1) source */ +- UL_SCNsA" " /* (2) target */ +- UL_SCNsA" " /* (3) FS type */ +- UL_SCNsA" " /* (4) options */ ++ int rc, n = 0, len = strlen (s) + 1; ++ char *src = malloc (sizeof *src * len); ++ char *fstype = malloc (sizeof *fstype * len); ++ char *optstr = malloc (sizeof *optstr * len); ++ ++ rc = sscanf(s, "%s"" " /* (1) source */ ++ "%s"" " /* (2) target */ ++ "%s"" " /* (3) FS type */ ++ "%s"" " /* (4) options */ + "%n", /* byte count */ + +- &src, +- &fs->target, +- &fstype, +- &optstr, ++ src, ++ fs->target, ++ fstype, ++ optstr, + &n); + + if (rc == 4) { +@@ -108,16 +110,20 @@ + */ + static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s) + { +- int rc, end = 0; ++ int rc, end = 0, len = strlen (s) + 1; + unsigned int maj, min; + char *fstype, *src, *p; + ++ fs->root = malloc (sizeof *fs->root * len); ++ fs->target = malloc (sizeof *fs->target * len); ++ fs->vfs_optstr = malloc (sizeof *fs->vfs_optstr * len); ++ + rc = sscanf(s, "%u " /* (1) id */ + "%u " /* (2) parent */ + "%u:%u " /* (3) maj:min */ +- UL_SCNsA" " /* (4) mountroot */ +- UL_SCNsA" " /* (5) target */ +- UL_SCNsA /* (6) vfs options (fs-independent) */ ++ "%s"" " /* (4) mountroot */ ++ "%s"" " /* (5) target */ ++ "%s" /* (6) vfs options (fs-independent) */ + "%n", /* number of read bytes */ + + &fs->id, +@@ -139,9 +145,14 @@ + } + s = p + 3; + +- rc += sscanf(s, UL_SCNsA" " /* (8) FS type */ +- UL_SCNsA" " /* (9) source */ +- UL_SCNsA, /* (10) fs options (fs specific) */ ++ len = strlen (s) + 1; ++ fstype = malloc (sizeof *fstype * len); ++ src = malloc (sizeof *src * len); ++ fs->fs_optstr = malloc (sizeof *fs->fs_optstr * len); ++ ++ rc += sscanf(s, "%s"" " /* (8) FS type */ ++ "%s"" " /* (9) source */ ++ "%s", /* (10) fs options (fs specific) */ + + &fstype, + &src,
package/util-linux/util-linux-002-uclibc-build-fix.patch new file +16 -0
@@ -0,0 +1,16 @@ +Signed-off-by: Khem Raj <[email protected]> + +Index: util-linux-2.19.1/configure.ac +=================================================================== +--- util-linux-2.19.1.orig/configure.ac ++++ util-linux-2.19.1/configure.ac +@@ -250,7 +250,7 @@ esac + + + AC_MSG_CHECKING(whether program_invocation_short_name is defined) +-AC_TRY_COMPILE([#include <argp.h>], ++AC_TRY_COMPILE([#include <errno.h>], + [program_invocation_short_name = "test";], + AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, + [Define if program_invocation_short_name is defined]) +
package/util-linux/util-linux-003-fdisk-aarch64-support.patch new file +22 -0
@@ -0,0 +1,22 @@ +Add case for the aarch64 architecture + +Taken from https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1061609 + +Code written by Wookey. + +Signed-off-by: Thomas Petazzoni <[email protected]> + +Index: b/fdisk/fdiskbsdlabel.h +=================================================================== +--- a/fdisk/fdiskbsdlabel.h ++++ b/fdisk/fdiskbsdlabel.h +@@ -48,7 +48,8 @@ + + #if defined (i386) || defined (__sparc__) || defined (__arm__) || \ + defined (__mips__) || defined (__s390__) || defined (__sh__) || \ +- defined(__x86_64__) || defined (__avr32__) || defined(__cris__) ++ defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \ ++ defined(__aarch64__) + #define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 + #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
package/util-linux/util-linux-fdisk-aarch64-support.patch deleted +0 -22
@@ -1,22 +0,0 @@ -Add case for the aarch64 architecture - -Taken from https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1061609 - -Code written by Wookey. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/fdisk/fdiskbsdlabel.h -=================================================================== ---- a/fdisk/fdiskbsdlabel.h -+++ b/fdisk/fdiskbsdlabel.h -@@ -48,7 +48,8 @@ - - #if defined (i386) || defined (__sparc__) || defined (__arm__) || \ - defined (__mips__) || defined (__s390__) || defined (__sh__) || \ -- defined(__x86_64__) || defined (__avr32__) || defined(__cris__) -+ defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \ -+ defined(__aarch64__) - #define BSD_LABELSECTOR 1 - #define BSD_LABELOFFSET 0 - #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
package/util-linux/util-linux-sscanf-no-ms-as.patch deleted +0 -87
87 lines not on this page · raw message
package/util-linux/util-linux-uclibc-build-fix.patch deleted +0 -16
@@ -1,16 +0,0 @@ -Signed-off-by: Khem Raj <[email protected]> - -Index: util-linux-2.19.1/configure.ac -=================================================================== ---- util-linux-2.19.1.orig/configure.ac -+++ util-linux-2.19.1/configure.ac -@@ -250,7 +250,7 @@ esac - - - AC_MSG_CHECKING(whether program_invocation_short_name is defined) --AC_TRY_COMPILE([#include <argp.h>], -+AC_TRY_COMPILE([#include <errno.h>], - [program_invocation_short_name = "test";], - AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, - [Define if program_invocation_short_name is defined]) -
Signature · 1 line
1.7.9.5
PATCH 2/3 util-linux: add support for Xtensa
From: Chris Zankel <[email protected]>
[Thomas Petazzoni: rename patch to not have the package version in the patch file name, adjust the commit title.]
--- .../util-linux/util-linux-004-xtensa-support.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/util-linux/util-linux-004-xtensa-support.patch
package/util-linux/util-linux-004-xtensa-support.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- util-linux-2.20.1/fdisk/fdiskbsdlabel.h.orig 2013-01-21 19:17:58.023049856 -0800 ++++ util-linux-2.20.1/fdisk/fdiskbsdlabel.h 2013-01-21 19:18:09.867050151 -0800 +@@ -49,7 +49,7 @@ + #if defined (i386) || defined (__sparc__) || defined (__arm__) || \ + defined (__mips__) || defined (__s390__) || defined (__sh__) || \ + defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || defined(__xtensa__) + #define BSD_LABELSECTOR 1 + #define BSD_LABELOFFSET 0 + #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
Signature · 1 line
1.7.9.5
PATCH 3/3 libffi: switch to using a Git version, brings Microblaze and Xtensa support
In reply to Thomas PetazzoniWe already had backported patches for the Blackfin and AArch64 support, and now we would have needed to also backport the Xtensa support and the Microblaze support. This starts to get crazy.
Let's switch to using a Git version from Github, until libffi finally releases a new stable version.
In order to achieve this, we also need to:
* autoreconf the package, so that a libffi.pc file gets generated
* manually install the libffi.pc file, because it doesn't get installed by libffi Makefile, for some reason
* remove the part of the target post install hook that was messing with libffi.pc, since it was modifying the one in STAGING_DIR (which is odd for a target post install hook), and the libffi.pc file is anyway not installed to the target anymore.
--- .../libffi-0001-Add-support-for-Blackfin.patch | 1044 --------- ...fi-0002-Add-aarch64-support-from-upstream.patch | 2326 -------------------- package/libffi/libffi.mk | 29 +- 3 files changed, 23 insertions(+), 3376 deletions(-) delete mode 100644 package/libffi/libffi-0001-Add-support-for-Blackfin.patch delete mode 100644 package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch
package/libffi/libffi-0001-Add-support-for-Blackfin.patch deleted +0 -1044
@@ -1,1044 +0,0 @@ -From 643764d29559e2ca6280837069972b1d4790d61a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Fri, 16 Nov 2012 01:10:10 +0100 -Subject: [PATCH 1/2] Add support for Blackfin - -Taken upstream from -https://github.com/atgreen/libffi/commit/213ed15c70e72d666154c08e2b41dae3f61f20d3. Will -be part of the upcoming 3.0.12 release. - -We have kept the part of the patches changing configure and -Makefile.in in order to avoid having to autoreconf the package, which -requires autoconf 2.68. - -Code written by Alexandre Keunecke. - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - ChangeLog | 8 +++ - Makefile.am | 4 ++ - Makefile.in | 160 ++++++++++++++++++++++------------------- - README | 8 ++- - configure | 113 +++++++++++++---------------- - configure.ac | 5 ++ - src/bfin/ffi.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/bfin/ffitarget.h | 43 +++++++++++ - src/bfin/sysv.S | 177 +++++++++++++++++++++++++++++++++++++++++++++ - 9 files changed, 574 insertions(+), 139 deletions(-) - create mode 100644 src/bfin/ffi.c - create mode 100644 src/bfin/ffitarget.h - create mode 100644 src/bfin/sysv.S - -diff --git a/ChangeLog b/ChangeLog -index f4148a9..376edf7 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,11 @@ -+2012-04-23 Alexandre Keunecke I. de Mendonca <[email protected]> -+ -+ * configure.ac: Add Blackfin/sysv support -+ * Makefile.am: Add Blackfin/sysv support -+ * src/bfin/ffi.c: Add Blackfin/sysv support -+ * src/bfin/ffitarget.h: Add Blackfin/sysv support -+ * src/bfin/sysv.S: Add Blackfin/sysv support -+ - 2012-04-11 Anthony Green <[email protected]> - - * Makefile.am (EXTRA_DIST): Add new script. -diff --git a/Makefile.am b/Makefile.am -index 4a855d7..16f32a6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -27,6 +27,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ - src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \ - src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h \ - src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \ -+ src/bfin/ffi.c src/bfin/ffitarget.h src/bfin/sysv.S \ - src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ - src/moxie/ffi.c src/moxie/eabi.S libtool-version \ - ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ -@@ -105,6 +106,9 @@ endif - if MIPS - nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S - endif -+if BFIN -+nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S -+endif - if X86 - nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S - endif -diff --git a/Makefile.in b/Makefile.in -index 4308193..f5c10af 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -38,35 +38,36 @@ host_triplet = @host@ - target_triplet = @target@ - @FFI_DEBUG_TRUE at am__append_1 = src/debug.c - @MIPS_TRUE at am__append_2 = src/mips/ffi.c src/mips/o32.S src/mips/n32.S -- at X86_TRUE@am__append_3 = src/x86/ffi.c src/x86/sysv.S -- at X86_FREEBSD_TRUE@am__append_4 = src/x86/ffi.c src/x86/freebsd.S -- at X86_WIN32_TRUE@am__append_5 = src/x86/ffi.c src/x86/win32.S -- at X86_WIN64_TRUE@am__append_6 = src/x86/ffi.c src/x86/win64.S -- at X86_DARWIN_TRUE@am__append_7 = src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S -- at SPARC_TRUE@am__append_8 = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S -- at ALPHA_TRUE@am__append_9 = src/alpha/ffi.c src/alpha/osf.S -- at IA64_TRUE@am__append_10 = src/ia64/ffi.c src/ia64/unix.S -- at M32R_TRUE@am__append_11 = src/m32r/sysv.S src/m32r/ffi.c -- at M68K_TRUE@am__append_12 = src/m68k/ffi.c src/m68k/sysv.S -- at POWERPC_TRUE@am__append_13 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S -- at POWERPC_AIX_TRUE@am__append_14 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S -- at POWERPC_DARWIN_TRUE@am__append_15 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S -- at POWERPC_FREEBSD_TRUE@am__append_16 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S -- at ARM_TRUE@am__append_17 = src/arm/sysv.S src/arm/ffi.c -- at ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE at am__append_18 = src/arm/trampoline.S -- at AVR32_TRUE@am__append_19 = src/avr32/sysv.S src/avr32/ffi.c -- at LIBFFI_CRIS_TRUE@am__append_20 = src/cris/sysv.S src/cris/ffi.c -- at FRV_TRUE@am__append_21 = src/frv/eabi.S src/frv/ffi.c -- at MOXIE_TRUE@am__append_22 = src/moxie/eabi.S src/moxie/ffi.c -- at S390_TRUE@am__append_23 = src/s390/sysv.S src/s390/ffi.c -- at X86_64_TRUE@am__append_24 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S -- at SH_TRUE@am__append_25 = src/sh/sysv.S src/sh/ffi.c -- at SH64_TRUE@am__append_26 = src/sh64/sysv.S src/sh64/ffi.c -- at PA_LINUX_TRUE@am__append_27 = src/pa/linux.S src/pa/ffi.c -- at PA_HPUX_TRUE@am__append_28 = src/pa/hpux32.S src/pa/ffi.c -+ at BFIN_TRUE@am__append_3 = src/bfin/ffi.c src/bfin/sysv.S -+ at X86_TRUE@am__append_4 = src/x86/ffi.c src/x86/sysv.S -+ at X86_FREEBSD_TRUE@am__append_5 = src/x86/ffi.c src/x86/freebsd.S -+ at X86_WIN32_TRUE@am__append_6 = src/x86/ffi.c src/x86/win32.S -+ at X86_WIN64_TRUE@am__append_7 = src/x86/ffi.c src/x86/win64.S -+ at X86_DARWIN_TRUE@am__append_8 = src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S -+ at SPARC_TRUE@am__append_9 = src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S -+ at ALPHA_TRUE@am__append_10 = src/alpha/ffi.c src/alpha/osf.S -+ at IA64_TRUE@am__append_11 = src/ia64/ffi.c src/ia64/unix.S -+ at M32R_TRUE@am__append_12 = src/m32r/sysv.S src/m32r/ffi.c -+ at M68K_TRUE@am__append_13 = src/m68k/ffi.c src/m68k/sysv.S -+ at POWERPC_TRUE@am__append_14 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S -+ at POWERPC_AIX_TRUE@am__append_15 = src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S -+ at POWERPC_DARWIN_TRUE@am__append_16 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S -+ at POWERPC_FREEBSD_TRUE@am__append_17 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S -+ at ARM_TRUE@am__append_18 = src/arm/sysv.S src/arm/ffi.c -+ at ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE at am__append_19 = src/arm/trampoline.S -+ at AVR32_TRUE@am__append_20 = src/avr32/sysv.S src/avr32/ffi.c -+ at LIBFFI_CRIS_TRUE@am__append_21 = src/cris/sysv.S src/cris/ffi.c -+ at FRV_TRUE@am__append_22 = src/frv/eabi.S src/frv/ffi.c -+ at MOXIE_TRUE@am__append_23 = src/moxie/eabi.S src/moxie/ffi.c -+ at S390_TRUE@am__append_24 = src/s390/sysv.S src/s390/ffi.c -+ at X86_64_TRUE@am__append_25 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S -+ at SH_TRUE@am__append_26 = src/sh/sysv.S src/sh/ffi.c -+ at SH64_TRUE@am__append_27 = src/sh64/sysv.S src/sh64/ffi.c -+ at PA_LINUX_TRUE@am__append_28 = src/pa/linux.S src/pa/ffi.c -+ at PA_HPUX_TRUE@am__append_29 = src/pa/hpux32.S src/pa/ffi.c - # Build debug. Define FFI_DEBUG on the commandline so that, when building with - # MSVC, it can link against the debug CRT. -- at FFI_DEBUG_TRUE@am__append_29 = -DFFI_DEBUG -+ at FFI_DEBUG_TRUE@am__append_30 = -DFFI_DEBUG - subdir = . - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ -@@ -75,17 +76,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - compile config.guess config.sub depcomp install-sh ltmain.sh \ - mdate-sh missing texinfo.tex - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ -- $(top_srcdir)/m4/ax_cc_maxopt.m4 \ -- $(top_srcdir)/m4/ax_cflags_warn_all.m4 \ -- $(top_srcdir)/m4/ax_compiler_vendor.m4 \ -- $(top_srcdir)/m4/ax_configure_args.m4 \ -- $(top_srcdir)/m4/ax_enable_builddir.m4 \ -- $(top_srcdir)/m4/ax_gcc_archflag.m4 \ -- $(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \ -- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ -- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ -- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -@@ -126,44 +117,45 @@ am_libffi_la_OBJECTS = src/prep_cif.lo src/types.lo src/raw_api.lo \ - @FFI_DEBUG_TRUE at am__objects_1 = src/debug.lo - @MIPS_TRUE at am__objects_2 = src/mips/ffi.lo src/mips/o32.lo \ - @MIPS_TRUE@ src/mips/n32.lo -- at X86_TRUE@am__objects_3 = src/x86/ffi.lo src/x86/sysv.lo -- at X86_FREEBSD_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/freebsd.lo -- at X86_WIN32_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/win32.lo -- at X86_WIN64_TRUE@am__objects_6 = src/x86/ffi.lo src/x86/win64.lo -- at X86_DARWIN_TRUE@am__objects_7 = src/x86/ffi.lo src/x86/darwin.lo \ -+ at BFIN_TRUE@am__objects_3 = src/bfin/ffi.lo src/bfin/sysv.lo -+ at X86_TRUE@am__objects_4 = src/x86/ffi.lo src/x86/sysv.lo -+ at X86_FREEBSD_TRUE@am__objects_5 = src/x86/ffi.lo src/x86/freebsd.lo -+ at X86_WIN32_TRUE@am__objects_6 = src/x86/ffi.lo src/x86/win32.lo -+ at X86_WIN64_TRUE@am__objects_7 = src/x86/ffi.lo src/x86/win64.lo -+ at X86_DARWIN_TRUE@am__objects_8 = src/x86/ffi.lo src/x86/darwin.lo \ - @X86_DARWIN_TRUE@ src/x86/ffi64.lo src/x86/darwin64.lo -- at SPARC_TRUE@am__objects_8 = src/sparc/ffi.lo src/sparc/v8.lo \ -+ at SPARC_TRUE@am__objects_9 = src/sparc/ffi.lo src/sparc/v8.lo \ - @SPARC_TRUE@ src/sparc/v9.lo -- at ALPHA_TRUE@am__objects_9 = src/alpha/ffi.lo src/alpha/osf.lo -- at IA64_TRUE@am__objects_10 = src/ia64/ffi.lo src/ia64/unix.lo -- at M32R_TRUE@am__objects_11 = src/m32r/sysv.lo src/m32r/ffi.lo -- at M68K_TRUE@am__objects_12 = src/m68k/ffi.lo src/m68k/sysv.lo -- at POWERPC_TRUE@am__objects_13 = src/powerpc/ffi.lo src/powerpc/sysv.lo \ -+ at ALPHA_TRUE@am__objects_10 = src/alpha/ffi.lo src/alpha/osf.lo -+ at IA64_TRUE@am__objects_11 = src/ia64/ffi.lo src/ia64/unix.lo -+ at M32R_TRUE@am__objects_12 = src/m32r/sysv.lo src/m32r/ffi.lo -+ at M68K_TRUE@am__objects_13 = src/m68k/ffi.lo src/m68k/sysv.lo -+ at POWERPC_TRUE@am__objects_14 = src/powerpc/ffi.lo src/powerpc/sysv.lo \ - @POWERPC_TRUE@ src/powerpc/ppc_closure.lo \ - @POWERPC_TRUE@ src/powerpc/linux64.lo \ - @POWERPC_TRUE@ src/powerpc/linux64_closure.lo -- at POWERPC_AIX_TRUE@am__objects_14 = src/powerpc/ffi_darwin.lo \ -+ at POWERPC_AIX_TRUE@am__objects_15 = src/powerpc/ffi_darwin.lo \ - @POWERPC_AIX_TRUE@ src/powerpc/aix.lo \ - @POWERPC_AIX_TRUE@ src/powerpc/aix_closure.lo -- at POWERPC_DARWIN_TRUE@am__objects_15 = src/powerpc/ffi_darwin.lo \ -+ at POWERPC_DARWIN_TRUE@am__objects_16 = src/powerpc/ffi_darwin.lo \ - @POWERPC_DARWIN_TRUE@ src/powerpc/darwin.lo \ - @POWERPC_DARWIN_TRUE@ src/powerpc/darwin_closure.lo -- at POWERPC_FREEBSD_TRUE@am__objects_16 = src/powerpc/ffi.lo \ -+ at POWERPC_FREEBSD_TRUE@am__objects_17 = src/powerpc/ffi.lo \ - @POWERPC_FREEBSD_TRUE@ src/powerpc/sysv.lo \ - @POWERPC_FREEBSD_TRUE@ src/powerpc/ppc_closure.lo -- at ARM_TRUE@am__objects_17 = src/arm/sysv.lo src/arm/ffi.lo -- at ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE at am__objects_18 = src/arm/trampoline.lo -- at AVR32_TRUE@am__objects_19 = src/avr32/sysv.lo src/avr32/ffi.lo -- at LIBFFI_CRIS_TRUE@am__objects_20 = src/cris/sysv.lo src/cris/ffi.lo -- at FRV_TRUE@am__objects_21 = src/frv/eabi.lo src/frv/ffi.lo -- at MOXIE_TRUE@am__objects_22 = src/moxie/eabi.lo src/moxie/ffi.lo -- at S390_TRUE@am__objects_23 = src/s390/sysv.lo src/s390/ffi.lo -- at X86_64_TRUE@am__objects_24 = src/x86/ffi64.lo src/x86/unix64.lo \ -+ at ARM_TRUE@am__objects_18 = src/arm/sysv.lo src/arm/ffi.lo -+ at ARM_TRUE@@FFI_EXEC_TRAMPOLINE_TABLE_TRUE at am__objects_19 = src/arm/trampoline.lo -+ at AVR32_TRUE@am__objects_20 = src/avr32/sysv.lo src/avr32/ffi.lo -+ at LIBFFI_CRIS_TRUE@am__objects_21 = src/cris/sysv.lo src/cris/ffi.lo -+ at FRV_TRUE@am__objects_22 = src/frv/eabi.lo src/frv/ffi.lo -+ at MOXIE_TRUE@am__objects_23 = src/moxie/eabi.lo src/moxie/ffi.lo -+ at S390_TRUE@am__objects_24 = src/s390/sysv.lo src/s390/ffi.lo -+ at X86_64_TRUE@am__objects_25 = src/x86/ffi64.lo src/x86/unix64.lo \ - @X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo -- at SH_TRUE@am__objects_25 = src/sh/sysv.lo src/sh/ffi.lo -- at SH64_TRUE@am__objects_26 = src/sh64/sysv.lo src/sh64/ffi.lo -- at PA_LINUX_TRUE@am__objects_27 = src/pa/linux.lo src/pa/ffi.lo -- at PA_HPUX_TRUE@am__objects_28 = src/pa/hpux32.lo src/pa/ffi.lo -+ at SH_TRUE@am__objects_26 = src/sh/sysv.lo src/sh/ffi.lo -+ at SH64_TRUE@am__objects_27 = src/sh64/sysv.lo src/sh64/ffi.lo -+ at PA_LINUX_TRUE@am__objects_28 = src/pa/linux.lo src/pa/ffi.lo -+ at PA_HPUX_TRUE@am__objects_29 = src/pa/hpux32.lo src/pa/ffi.lo - nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) $(am__objects_4) $(am__objects_5) \ - $(am__objects_6) $(am__objects_7) $(am__objects_8) \ -@@ -173,17 +165,17 @@ nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ - $(am__objects_18) $(am__objects_19) $(am__objects_20) \ - $(am__objects_21) $(am__objects_22) $(am__objects_23) \ - $(am__objects_24) $(am__objects_25) $(am__objects_26) \ -- $(am__objects_27) $(am__objects_28) -+ $(am__objects_27) $(am__objects_28) $(am__objects_29) - libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \ - $(nodist_libffi_la_OBJECTS) - libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libffi_la_LDFLAGS) $(LDFLAGS) -o $@ - libffi_convenience_la_LIBADD = --am__objects_29 = src/prep_cif.lo src/types.lo src/raw_api.lo \ -+am__objects_30 = src/prep_cif.lo src/types.lo src/raw_api.lo \ - src/java_raw_api.lo src/closures.lo --am_libffi_convenience_la_OBJECTS = $(am__objects_29) --am__objects_30 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ -+am_libffi_convenience_la_OBJECTS = $(am__objects_30) -+am__objects_31 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) $(am__objects_5) $(am__objects_6) \ - $(am__objects_7) $(am__objects_8) $(am__objects_9) \ - $(am__objects_10) $(am__objects_11) $(am__objects_12) \ -@@ -192,8 +184,8 @@ am__objects_30 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - $(am__objects_19) $(am__objects_20) $(am__objects_21) \ - $(am__objects_22) $(am__objects_23) $(am__objects_24) \ - $(am__objects_25) $(am__objects_26) $(am__objects_27) \ -- $(am__objects_28) --nodist_libffi_convenience_la_OBJECTS = $(am__objects_30) -+ $(am__objects_28) $(am__objects_29) -+nodist_libffi_convenience_la_OBJECTS = $(am__objects_31) - libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \ - $(nodist_libffi_convenience_la_OBJECTS) - DEFAULT_INCLUDES = -I. at am__isrc@ -@@ -440,6 +432,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ - src/x86/win64.S src/x86/freebsd.S src/x86/ffi64.c \ - src/x86/unix64.S src/x86/ffitarget.h src/pa/ffitarget.h \ - src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c \ -+ src/bfin/ffi.c src/bfin/ffitarget.h src/bfin/sysv.S \ - src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \ - src/moxie/ffi.c src/moxie/eabi.S libtool-version \ - ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4 \ -@@ -508,10 +501,10 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \ - $(am__append_18) $(am__append_19) $(am__append_20) \ - $(am__append_21) $(am__append_22) $(am__append_23) \ - $(am__append_24) $(am__append_25) $(am__append_26) \ -- $(am__append_27) $(am__append_28) -+ $(am__append_27) $(am__append_28) $(am__append_29) - libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) - nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) --AM_CFLAGS = -g $(am__append_29) -+AM_CFLAGS = -g $(am__append_30) - libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) - AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src -DFFI_BUILDING - AM_CCASFLAGS = $(AM_CPPFLAGS) -g -@@ -637,6 +630,16 @@ src/mips/o32.lo: src/mips/$(am__dirstamp) \ - src/mips/$(DEPDIR)/$(am__dirstamp) - src/mips/n32.lo: src/mips/$(am__dirstamp) \ - src/mips/$(DEPDIR)/$(am__dirstamp) -+src/bfin/$(am__dirstamp): -+ @$(MKDIR_P) src/bfin -+ @: > src/bfin/$(am__dirstamp) -+src/bfin/$(DEPDIR)/$(am__dirstamp): -+ @$(MKDIR_P) src/bfin/$(DEPDIR) -+ @: > src/bfin/$(DEPDIR)/$(am__dirstamp) -+src/bfin/ffi.lo: src/bfin/$(am__dirstamp) \ -+ src/bfin/$(DEPDIR)/$(am__dirstamp) -+src/bfin/sysv.lo: src/bfin/$(am__dirstamp) \ -+ src/bfin/$(DEPDIR)/$(am__dirstamp) - src/x86/$(am__dirstamp): - @$(MKDIR_P) src/x86 - @: > src/x86/$(am__dirstamp) -@@ -852,6 +855,10 @@ mostlyclean-compile: - -rm -f src/avr32/ffi.lo - -rm -f src/avr32/sysv.$(OBJEXT) - -rm -f src/avr32/sysv.lo -+ -rm -f src/bfin/ffi.$(OBJEXT) -+ -rm -f src/bfin/ffi.lo -+ -rm -f src/bfin/sysv.$(OBJEXT) -+ -rm -f src/bfin/sysv.lo - -rm -f src/closures.$(OBJEXT) - -rm -f src/closures.lo - -rm -f src/cris/ffi.$(OBJEXT) -@@ -973,6 +980,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote at src/arm/$(DEPDIR)/trampoline.Plo at am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote at src/avr32/$(DEPDIR)/ffi.Plo at am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote at src/avr32/$(DEPDIR)/sysv.Plo at am__quote@ -+ at AMDEP_TRUE@@am__include@ @am__quote at src/bfin/$(DEPDIR)/ffi.Plo at am__quote@ -+ at AMDEP_TRUE@@am__include@ @am__quote at src/bfin/$(DEPDIR)/sysv.Plo at am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote at src/cris/$(DEPDIR)/ffi.Plo at am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote at src/cris/$(DEPDIR)/sysv.Plo at am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote at src/frv/$(DEPDIR)/eabi.Plo at am__quote@ -@@ -1077,6 +1086,7 @@ clean-libtool: - -rm -rf src/alpha/.libs src/alpha/_libs - -rm -rf src/arm/.libs src/arm/_libs - -rm -rf src/avr32/.libs src/avr32/_libs -+ -rm -rf src/bfin/.libs src/bfin/_libs - -rm -rf src/cris/.libs src/cris/_libs - -rm -rf src/frv/.libs src/frv/_libs - -rm -rf src/ia64/.libs src/ia64/_libs -@@ -1631,6 +1641,8 @@ distclean-generic: - -rm -f src/arm/$(am__dirstamp) - -rm -f src/avr32/$(DEPDIR)/$(am__dirstamp) - -rm -f src/avr32/$(am__dirstamp) -+ -rm -f src/bfin/$(DEPDIR)/$(am__dirstamp) -+ -rm -f src/bfin/$(am__dirstamp) - -rm -f src/cris/$(DEPDIR)/$(am__dirstamp) - -rm -f src/cris/$(am__dirstamp) - -rm -f src/frv/$(DEPDIR)/$(am__dirstamp) -@@ -1670,7 +1682,7 @@ clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \ - - distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) -- -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) -+ -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags -@@ -1790,7 +1802,7 @@ installcheck-am: - maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache -- -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) -+ -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/bfin/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) - -rm -f Makefile - maintainer-clean-am: distclean-am maintainer-clean-aminfo \ - maintainer-clean-generic maintainer-clean-vti -diff --git a/README b/README -index bcc7178..ec240a4 100644 ---- a/README -+++ b/README -@@ -1,8 +1,8 @@ - Status - ====== - --libffi-3.0.11 was released on April 11, 2012. Check the libffi web --page for updates: <URL:http://sourceware.org/libffi/>. -+libffi-3.0.XX was released on XXXXXXX. Check the libffi web page for -+updates: <URL:http://sourceware.org/libffi/>. - - - What is libffi? -@@ -56,6 +56,7 @@ tested: - | ARM | Linux | - | ARM | iOS | - | AVR32 | Linux | -+| Blackfin | uClinux | - | HPPA | HPUX | - | IA-64 | Linux | - | M68K | FreeMiNT | -@@ -148,6 +149,9 @@ History - - See the ChangeLog files for details. - -+3.0.12 XXX-XX-XX -+ Add Blackfin support. -+ - 3.0.11 Apr-11-12 - Add support for variadic functions (ffi_prep_cif_var). - Add Linux/x32 support. -diff --git a/configure b/configure -index 91b2317..4ccba55 100755 ---- a/configure -+++ b/configure -@@ -679,6 +679,8 @@ X86_FALSE - X86_TRUE - SPARC_FALSE - SPARC_TRUE -+BFIN_FALSE -+BFIN_TRUE - MIPS_FALSE - MIPS_TRUE - AM_LTLDFLAGS -@@ -6840,14 +6842,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) -- case `/usr/bin/file conftest.o` in -- *x86-64*) -- LD="${LD-ld} -m elf32_x86_64" -- ;; -- *) -- LD="${LD-ld} -m elf_i386" -- ;; -- esac -+ LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" -@@ -8418,10 +8413,6 @@ _lt_linker_boilerplate=`cat conftest.err` - $RM -r conftest* - - --## CAVEAT EMPTOR: --## There is no encapsulation within the following macros, do not change --## the running order or otherwise move them around unless you know exactly --## what you are doing... - if test -n "$compiler"; then - - lt_prog_compiler_no_builtin_flag= -@@ -10972,10 +10963,14 @@ fi - # before this can be enabled. - hardcode_into_libs=yes - -+ # Add ABI-specific directories to the system library path. -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -12419,7 +12414,7 @@ if test "x$ax_gcc_arch" = xyes; then - ax_gcc_arch="" - if test "$cross_compiling" = no; then - case $host_cpu in -- i[3456]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones -+ i[3456]86*|x86_64*) # use cpuid codes - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -12535,18 +12530,24 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - case $ax_cv_gcc_x86_cpuid_1 in - *5[48]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;; - *5??:*:*:*) ax_gcc_arch=pentium ;; -- *6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; -- *6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; -- *6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; -- *6[9d]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;; -- *6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; -- *6??:*:*:*) ax_gcc_arch=pentiumpro ;; -- *f3[347]:*:*:*|*f41347:*:*:*) -+ *0?6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; -+ *0?6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; -+ *0?6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; -+ *0?6[9de]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;; -+ *0?6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; -+ *0?6f?:*:*:*|*1?66?:*:*:*) ax_gcc_arch="core2 pentium-m pentium3 pentiumpro" ;; -+ *1?6[7d]?:*:*:*) ax_gcc_arch="penryn core2 pentium-m pentium3 pentiumpro" ;; -+ *1?6[aef]?:*:*:*|*2?6[5cef]?:*:*:*) ax_gcc_arch="corei7 core2 pentium-m pentium3 pentiumpro" ;; -+ *1?6c?:*:*:*|*[23]?66?:*:*:*) ax_gcc_arch="atom core2 pentium-m pentium3 pentiumpro" ;; -+ *2?6[ad]?:*:*:*) ax_gcc_arch="corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; -+ *0?6??:*:*:*) ax_gcc_arch=pentiumpro ;; -+ *6??:*:*:*) ax_gcc_arch="core2 pentiumpro" ;; -+ ?000?f3[347]:*:*:*|?000?f41347:*:*:*|?000?f6?:*:*:*) - case $host_cpu in -- x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;; -- *) ax_gcc_arch="prescott pentium4 pentiumpro" ;; -- esac ;; -- *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";; -+ x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;; -+ *) ax_gcc_arch="prescott pentium4 pentiumpro" ;; -+ esac ;; -+ ?000?f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";; - esac ;; - *:68747541:*:*) # AMD - case $ax_cv_gcc_x86_cpuid_1 in -@@ -12618,10 +12619,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;; - *) ax_gcc_arch="athlon-4 athlon k7" ;; - esac ;; -- *f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;; -- *f5?:*:*:*) ax_gcc_arch="opteron k8" ;; -- *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;; -- *f??:*:*:*) ax_gcc_arch="k8" ;; -+ ?00??f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;; -+ ?00??f5?:*:*:*) ax_gcc_arch="opteron k8" ;; -+ ?00??f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;; -+ ?00??f??:*:*:*) ax_gcc_arch="k8" ;; -+ ?05??f??:*:*:*) ax_gcc_arch="btver1 amdfam10 k8" ;; -+ ?06??f??:*:*:*) ax_gcc_arch="bdver1 amdfam10 k8" ;; -+ *f??:*:*:*) ax_gcc_arch="amdfam10 k8" ;; - esac ;; - *:746e6543:*:*) # IDT - case $ax_cv_gcc_x86_cpuid_1 in -@@ -13150,6 +13154,10 @@ case "$host" in - TARGET=AVR32; TARGETDIR=avr32 - ;; - -+ bfin*) -+ TARGET=BFIN; TARGETDIR=bfin -+ ;; -+ - cris-*-*) - TARGET=LIBFFI_CRIS; TARGETDIR=cris - ;; -@@ -13295,6 +13303,14 @@ else - MIPS_FALSE= - fi - -+ if test x$TARGET = xBFIN; then -+ BFIN_TRUE= -+ BFIN_FALSE='#' -+else -+ BFIN_TRUE='#' -+ BFIN_FALSE= -+fi -+ - if test x$TARGET = xSPARC; then - SPARC_TRUE= - SPARC_FALSE='#' -@@ -14134,40 +14150,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - esac - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler .cfi pseudo-op support" >&5 --$as_echo_n "checking assembler .cfi pseudo-op support... " >&6; } --if ${gcc_cv_as_cfi_pseudo_op+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -- gcc_cv_as_cfi_pseudo_op=unknown -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --asm (".cfi_startproc\n\t.cfi_endproc"); --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- gcc_cv_as_cfi_pseudo_op=yes --else -- gcc_cv_as_cfi_pseudo_op=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_cfi_pseudo_op" >&5 --$as_echo "$gcc_cv_as_cfi_pseudo_op" >&6; } -- if test "x$gcc_cv_as_cfi_pseudo_op" = xyes; then -- --$as_echo "#define HAVE_AS_CFI_PSEUDO_OP 1" >>confdefs.h -- -- fi -- -+GCC_AS_CFI_PSEUDO_OP - - if test x$TARGET = xSPARC; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler and linker support unaligned pc related relocs" >&5 -@@ -14739,6 +14722,10 @@ if test -z "${MIPS_TRUE}" && test -z "${MIPS_FALSE}"; then - as_fn_error $? "conditional \"MIPS\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${BFIN_TRUE}" && test -z "${BFIN_FALSE}"; then -+ as_fn_error $? "conditional \"BFIN\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${SPARC_TRUE}" && test -z "${SPARC_FALSE}"; then - as_fn_error $? "conditional \"SPARC\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -diff --git a/configure.ac b/configure.ac -index 1021769..9b946a2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -75,6 +75,10 @@ case "$host" in - TARGET=AVR32; TARGETDIR=avr32 - ;; - -+ bfin*) -+ TARGET=BFIN; TARGETDIR=bfin -+ ;; -+ - cris-*-*) - TARGET=LIBFFI_CRIS; TARGETDIR=cris - ;; -@@ -213,6 +217,7 @@ if test $TARGETDIR = unknown; then - fi - - AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS) -+AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN) - AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC) - AM_CONDITIONAL(X86, test x$TARGET = xX86) - AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD) -diff --git a/src/bfin/ffi.c b/src/bfin/ffi.c -new file mode 100644 -index 0000000..0beccc1 ---- /dev/null -+++ b/src/bfin/ffi.c -@@ -0,0 +1,195 @@ -+/* ----------------------------------------------------------------------- -+ ffi.c - Copyright (c) 2012 Alexandre K. I. de Mendonca <[email protected]> -+ -+ Blackfin Foreign Function Interface -+ -+ Permission is hereby granted, free of charge, to any person obtaining -+ a copy of this software and associated documentation files (the -+ ``Software''), to deal in the Software without restriction, including -+ without limitation the rights to use, copy, modify, merge, publish, -+ distribute, sublicense, and/or sell copies of the Software, and to -+ permit persons to whom the Software is furnished to do so, subject to -+ the following conditions: -+ -+ The above copyright notice and this permission notice shall be included -+ in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ DEALINGS IN THE SOFTWARE. -+ ----------------------------------------------------------------------- */ -+#include <ffi.h> -+#include <ffi_common.h> -+ -+#include <stdlib.h> -+#include <stdio.h> -+ -+/* Maximum number of GPRs available for argument passing. */ -+#define MAX_GPRARGS 3 -+ -+/* -+ * Return types -+ */ -+#define FFIBFIN_RET_VOID 0 -+#define FFIBFIN_RET_BYTE 1 -+#define FFIBFIN_RET_HALFWORD 2 -+#define FFIBFIN_RET_INT64 3 -+#define FFIBFIN_RET_INT32 4 -+ -+/*====================================================================*/ -+/* PROTOTYPE * -+ /*====================================================================*/ -+void ffi_prep_args(unsigned char *, extended_cif *); -+ -+/*====================================================================*/ -+/* Externals */ -+/* (Assembly) */ -+/*====================================================================*/ -+ -+extern void ffi_call_SYSV(unsigned, extended_cif *, void(*)(unsigned char *, extended_cif *), unsigned, void *, void(*fn)(void)); -+ -+/*====================================================================*/ -+/* Implementation */ -+/* */ -+/*====================================================================*/ -+ -+ -+/* -+ * This function calculates the return type (size) based on type. -+ */ -+ -+ffi_status ffi_prep_cif_machdep(ffi_cif *cif) -+{ -+ /* --------------------------------------* -+ * Return handling * -+ * --------------------------------------*/ -+ switch (cif->rtype->type) { -+ case FFI_TYPE_VOID: -+ cif->flags = FFIBFIN_RET_VOID; -+ break; -+ case FFI_TYPE_UINT16: -+ case FFI_TYPE_SINT16: -+ cif->flags = FFIBFIN_RET_HALFWORD; -+ break; -+ case FFI_TYPE_UINT8: -+ cif->flags = FFIBFIN_RET_BYTE; -+ break; -+ case FFI_TYPE_INT: -+ case FFI_TYPE_UINT32: -+ case FFI_TYPE_SINT32: -+ case FFI_TYPE_FLOAT: -+ case FFI_TYPE_POINTER: -+ case FFI_TYPE_SINT8: -+ cif->flags = FFIBFIN_RET_INT32; -+ break; -+ case FFI_TYPE_SINT64: -+ case FFI_TYPE_UINT64: -+ case FFI_TYPE_DOUBLE: -+ cif->flags = FFIBFIN_RET_INT64; -+ break; -+ case FFI_TYPE_STRUCT: -+ if (cif->rtype->size <= 4){ -+ cif->flags = FFIBFIN_RET_INT32; -+ }else if (cif->rtype->size == 8){ -+ cif->flags = FFIBFIN_RET_INT64; -+ }else{ -+ //it will return via a hidden pointer in P0 -+ cif->flags = FFIBFIN_RET_VOID; -+ } -+ break; -+ default: -+ FFI_ASSERT(0); -+ break; -+ } -+ return FFI_OK; -+} -+ -+/* -+ * This will prepare the arguments and will call the assembly routine -+ * cif = the call interface -+ * fn = the function to be called -+ * rvalue = the return value -+ * avalue = the arguments -+ */ -+void ffi_call(ffi_cif *cif, void(*fn)(void), void *rvalue, void **avalue) -+{ -+ int ret_type = cif->flags; -+ extended_cif ecif; -+ ecif.cif = cif; -+ ecif.avalue = avalue; -+ ecif.rvalue = rvalue; -+ -+ switch (cif->abi) { -+ case FFI_SYSV: -+ ffi_call_SYSV(cif->bytes, &ecif, ffi_prep_args, ret_type, ecif.rvalue, fn); -+ break; -+ default: -+ FFI_ASSERT(0); -+ break; -+ } -+} -+ -+ -+/* -+* This function prepares the parameters (copies them from the ecif to the stack) -+* to call the function (ffi_prep_args is called by the assembly routine in file -+* sysv.S, which also calls the actual function) -+*/ -+void ffi_prep_args(unsigned char *stack, extended_cif *ecif) -+{ -+ register unsigned int i = 0; -+ void **p_argv; -+ unsigned char *argp; -+ ffi_type **p_arg; -+ argp = stack; -+ p_argv = ecif->avalue; -+ for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; -+ (i != 0); -+ i--, p_arg++) { -+ size_t z; -+ z = (*p_arg)->size; -+ if (z < sizeof(int)) { -+ z = sizeof(int); -+ switch ((*p_arg)->type) { -+ case FFI_TYPE_SINT8: { -+ signed char v = *(SINT8 *)(* p_argv); -+ signed int t = v; -+ *(signed int *) argp = t; -+ } -+ break; -+ case FFI_TYPE_UINT8: { -+ unsigned char v = *(UINT8 *)(* p_argv); -+ unsigned int t = v; -+ *(unsigned int *) argp = t; -+ } -+ break; -+ case FFI_TYPE_SINT16: -+ *(signed int *) argp = (signed int) * (SINT16 *)(* p_argv); -+ break; -+ case FFI_TYPE_UINT16: -+ *(unsigned int *) argp = (unsigned int) * (UINT16 *)(* p_argv); -+ break; -+ case FFI_TYPE_STRUCT: -+ memcpy(argp, *p_argv, (*p_arg)->size); -+ break; -+ default: -+ FFI_ASSERT(0); -+ break; -+ } -+ } else if (z == sizeof(int)) { -+ *(unsigned int *) argp = (unsigned int) * (UINT32 *)(* p_argv); -+ } else { -+ memcpy(argp, *p_argv, z); -+ } -+ p_argv++; -+ argp += z; -+ } -+} -+ -+ -+ -diff --git a/src/bfin/ffitarget.h b/src/bfin/ffitarget.h -new file mode 100644 -index 0000000..2175c01 ---- /dev/null -+++ b/src/bfin/ffitarget.h -@@ -0,0 +1,43 @@ -+/* ----------------------------------------------------------------------- -+ ffitarget.h - Copyright (c) 2012 Alexandre K. I. de Mendonca <[email protected]> -+ -+ Blackfin Foreign Function Interface -+ -+ Permission is hereby granted, free of charge, to any person obtaining -+ a copy of this software and associated documentation files (the -+ ``Software''), to deal in the Software without restriction, including -+ without limitation the rights to use, copy, modify, merge, publish, -+ distribute, sublicense, and/or sell copies of the Software, and to -+ permit persons to whom the Software is furnished to do so, subject to -+ the following conditions: -+ -+ The above copyright notice and this permission notice shall be included -+ in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ DEALINGS IN THE SOFTWARE. -+ ----------------------------------------------------------------------- */ -+ -+#ifndef LIBFFI_TARGET_H -+#define LIBFFI_TARGET_H -+ -+#ifndef LIBFFI_ASM -+typedef unsigned long ffi_arg; -+typedef signed long ffi_sarg; -+ -+typedef enum ffi_abi { -+ FFI_FIRST_ABI = 0, -+ FFI_SYSV, -+ FFI_LAST_ABI, -+ FFI_DEFAULT_ABI = FFI_SYSV -+} ffi_abi; -+#endif -+ -+#endif -+ -diff --git a/src/bfin/sysv.S b/src/bfin/sysv.S -new file mode 100644 -index 0000000..ae7a152 ---- /dev/null -+++ b/src/bfin/sysv.S -@@ -0,0 +1,177 @@ -+/* ----------------------------------------------------------------------- -+ sysv.S - Copyright (c) 2012 Alexandre K. I. de Mendonca <[email protected]> -+ -+ Blackfin Foreign Function Interface -+ -+ Permission is hereby granted, free of charge, to any person obtaining -+ a copy of this software and associated documentation files (the -+ ``Software''), to deal in the Software without restriction, including -+ without limitation the rights to use, copy, modify, merge, publish, -+ distribute, sublicense, and/or sell copies of the Software, and to -+ permit persons to whom the Software is furnished to do so, subject to -+ the following conditions: -+ -+ The above copyright notice and this permission notice shall be included -+ in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ DEALINGS IN THE SOFTWARE. -+ ----------------------------------------------------------------------- */ -+ -+#define LIBFFI_ASM -+#include <fficonfig.h> -+#include <ffi.h> -+ -+.text -+.align 4 -+ -+ /* -+ There is a "feature" in the bfin toolchain that it puts a _ before funcion names -+ that's why the function here it's called _ffi_call_SYSV and not ffi_call_SYSV -+ */ -+ .global _ffi_call_SYSV; -+ .type _ffi_call_SYSV, STT_FUNC; -+ .func ffi_call_SYSV -+ -+ /* -+ cif->bytes = R0 (fp+8) -+ &ecif = R1 (fp+12) -+ ffi_prep_args = R2 (fp+16) -+ ret_type = stack (fp+20) -+ ecif.rvalue = stack (fp+24) -+ fn = stack (fp+28) -+ got (fp+32) -+ There is room for improvement here (we can use temporary registers -+ instead of saving the values in the memory) -+ REGS: -+ P5 => Stack pointer (function arguments) -+ R5 => cif->bytes -+ R4 => ret->type -+ -+ FP-20 = P3 -+ FP-16 = SP (parameters area) -+ FP-12 = SP (temp) -+ FP-08 = function return part 1 [R0] -+ FP-04 = function return part 2 [R1] -+ */ -+ -+_ffi_call_SYSV: -+.prologue: -+ LINK 20; -+ [FP-20] = P3; -+ [FP+8] = R0; -+ [FP+12] = R1; -+ [FP+16] = R2; -+ -+.allocate_stack: -+ //alocate cif->bytes into the stack -+ R1 = [FP+8]; -+ R0 = SP; -+ R0 = R0 - R1; -+ R1 = 4; -+ R0 = R0 - R1; -+ [FP-12] = SP; -+ SP = R0; -+ [FP-16] = SP; -+ -+.call_prep_args: -+ //get the addr of prep_args -+ P0 = [P3 + _ffi_prep_args at FUNCDESC_GOT17M4]; -+ P1 = [P0]; -+ P3 = [P0+4]; -+ R0 = [FP-16];//SP (parameter area) -+ R1 = [FP+12];//ecif -+ call (P1); -+ -+.call_user_function: -+ //ajust SP so as to allow the user function access the parameters on the stack -+ SP = [FP-16]; //point to function parameters -+ R0 = [SP]; -+ R1 = [SP+4]; -+ R2 = [SP+8]; -+ //load user function address -+ P0 = FP; -+ P0 +=28; -+ P1 = [P0]; -+ P1 = [P1]; -+ P3 = [P0+4]; -+ /* -+ For functions returning aggregate values (struct) occupying more than 8 bytes, -+ the caller allocates the return value object on the stack and the address -+ of this object is passed to the callee as a hidden argument in register P0. -+ */ -+ P0 = [FP+24]; -+ -+ call (P1); -+ SP = [FP-12]; -+.compute_return: -+ P2 = [FP-20]; -+ [FP-8] = R0; -+ [FP-4] = R1; -+ -+ R0 = [FP+20]; -+ R1 = R0 << 2; -+ -+ R0 = [P2+.rettable at GOT17M4]; -+ R0 = R1 + R0; -+ P2 = R0; -+ R1 = [P2]; -+ -+ P2 = [FP+-20]; -+ R0 = [P2+.rettable at GOT17M4]; -+ R0 = R1 + R0; -+ P2 = R0; -+ R0 = [FP-8]; -+ R1 = [FP-4]; -+ jump (P2); -+ -+/* -+#define FFIBFIN_RET_VOID 0 -+#define FFIBFIN_RET_BYTE 1 -+#define FFIBFIN_RET_HALFWORD 2 -+#define FFIBFIN_RET_INT64 3 -+#define FFIBFIN_RET_INT32 4 -+*/ -+.align 4 -+.align 4 -+.rettable: -+ .dd .epilogue - .rettable -+ .dd .rbyte - .rettable; -+ .dd .rhalfword - .rettable; -+ .dd .rint64 - .rettable; -+ .dd .rint32 - .rettable; -+ -+.rbyte: -+ P0 = [FP+24]; -+ R0 = R0.B (Z); -+ [P0] = R0; -+ JUMP .epilogue -+.rhalfword: -+ P0 = [FP+24]; -+ R0 = R0.L; -+ [P0] = R0; -+ JUMP .epilogue -+.rint64: -+ P0 = [FP+24];// &rvalue -+ [P0] = R0; -+ [P0+4] = R1; -+ JUMP .epilogue -+.rint32: -+ P0 = [FP+24]; -+ [P0] = R0; -+.epilogue: -+ R0 = [FP+8]; -+ R1 = [FP+12]; -+ R2 = [FP+16]; -+ P3 = [FP-20]; -+ UNLINK; -+ RTS; -+ -+.size _ffi_call_SYSV,.-_ffi_call_SYSV; -+.endfunc --- -1.7.9.5 -
package/libffi/libffi-0002-Add-aarch64-support-from-upstream.patch deleted +0 -2326
1,956 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.9.5
Part of the diff is not shown here. View the raw message.
PATCH 1/3 util-linux: add numbers to patches
In reply to Thomas PetazzoniQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> As we are going to add an Xtensa related patch that needs to be Thomas> applied *after* the AArch64 patch, let's first add a number to each Thomas> util-linux patch file name, so that we know they will be applied in Thomas> the right order.
Committed all 3, thanks.
Signature · 1 line
Bye, Peter Korsgaard