diff options
| author | Anthony Green <green@gmachine.(none)> | 2009-12-26 07:02:27 -0500 |
|---|---|---|
| committer | Anthony Green <green@gmachine.(none)> | 2009-12-26 07:02:27 -0500 |
| commit | 9458d88f676e9a21ab8993a54e16754b11687419 (patch) | |
| tree | 5e8f943332cf97f138ee40696355b64398413ff4 | |
| parent | 6a3412417593f068a04dc6163f4269cb295ad5ca (diff) | |
| download | libffi-9458d88f676e9a21ab8993a54e16754b11687419.tar.gz | |
Rebase from GCC
58 files changed, 1521 insertions, 847 deletions
@@ -1,3 +1,31 @@ +2009-12-25 Matthias Klose <doko@ubuntu.com> + + * man/ffi_call.3: Fix #include in examples. + * doc/libffi.texi: Add dircategory. + +2009-12-25 Frank Everdij <f.p.x.everdij@tudelft.nl> + + * include/ffi.h.in: Placed '__GNUC__' ifdef around + '__attribute__((aligned(8)))' in ffi_closure, fixes compile for + IRIX MIPSPro c99. + * include/ffi_common.h: Added '__sgi' define to non + '__attribute__((__mode__()))' integer typedefs. + * src/mips/ffi.c (ffi_call, ffi_closure_mips_inner_O32, + ffi_closure_mips_inner_N32): Added 'defined(_MIPSEB)' to BE check. + (ffi_closure_mips_inner_O32, ffi_closure_mips_inner_N32): Added + FFI_LONGDOUBLE support and alignment(N32 only). + * src/mips/ffitarget.h: Corrected '#include <sgidefs.h>' for IRIX and + fixed non '__attribute__((__mode__()))' integer typedefs. + * src/mips/n32.S: Put '#ifdef linux' around '.abicalls' and '.eh_frame' + since they are Linux/GNU Assembler specific. + +2009-12-25 Bradley Smith <brad@brad-smith.co.uk> + + * configure.ac, Makefile.am, src/avr32/ffi.c, + src/avr32/ffitarget.h, + src/avr32/sysv.S: Add AVR32 port. + * configure, Makefile.in: Rebuilt. + 2009-12-21 Andreas Tobler <a.tobler@schweiz.org> * configure.ac: Make i?86 build on FreeBSD and OpenBSD. diff --git a/ChangeLog.libffi b/ChangeLog.libffi index 559033a..9b6367b 100644 --- a/ChangeLog.libffi +++ b/ChangeLog.libffi @@ -29,27 +29,6 @@ * testsuite/libffi.call/cls_longdouble.c: Ditto. * testsuite/libffi.call/cls_double_va.c: Ditto. -2009-10-11 Matthias Klose <doko@ubuntu.com> - - * man/ffi_call.3: Fix #include in examples. - * doc/libffi.texi: Add dircategory. - -2009-10-23 Frank Everdij <f.p.x.everdij@tudelft.nl> - - * include/ffi.h.in: Placed '__GNUC__' ifdef around - '__attribute__((aligned(8)))' in ffi_closure, fixes compile for - IRIX MIPSPro c99. - * include/ffi_common.h: Added '__sgi' define to non - '__attribute__((__mode__()))' integer typedefs. - * src/mips/ffi.c (ffi_call, ffi_closure_mips_inner_O32, - ffi_closure_mips_inner_N32): Added 'defined(_MIPSEB)' to BE check. - (ffi_closure_mips_inner_O32, ffi_closure_mips_inner_N32): Added - FFI_LONGDOUBLE support and alignment(N32 only). - * src/mips/ffitarget.h: Corrected '#include <sgidefs.h>' for IRIX and - fixed non '__attribute__((__mode__()))' integer typedefs. - * src/mips/n32.S: Put '#ifdef linux' around '.abicalls' and '.eh_frame' - since they are Linux/GNU Assembler specific. - 2009-12-25 Andreas Tobler <a.tobler@schweiz.org> * fficonfig.h.in: Rebuilt again. @@ -64,17 +43,6 @@ * fficonfig.h.in: Rebuilt. * src/closures.c (dlmmap): Define version for snow leopard. -2009-10-05 Bradley Smith <brad@brad-smith.co.uk> - - * configure.ac, Makefile.am, src/avr32/ffi.c, - src/avr32/ffitarget.h, - src/avr32/sysv.S: Add AVR32 port. - * testsuite/libffi.call/cls_dbls_struct.c, - testsuite/libffi.call/cls_double_va.c, - testsuite/libffi.call/cls_longdouble_va.c, - testsuite/libffi.call/huge_struct.c: Mark expected failures on - AVR32. - 2009-06-16 Andrew Haley <aph@redhat.com> * testsuite/libffi.call/cls_align_sint64.c, diff --git a/Makefile.in b/Makefile.in index 49afcc1..177adae 100644 --- a/Makefile.in +++ b/Makefile.in @@ -264,7 +264,6 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ -AM_LTLDFLAGS = @AM_LTLDFLAGS@ AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -479,7 +478,7 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) AM_CFLAGS = -Wall -g -fexceptions -libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(AM_LTLDFLAGS) +libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) all: fficonfig.h diff --git a/config.guess b/config.guess index 2fc3acc..2fc3acc 100755..100644 --- a/config.guess +++ b/config.guess diff --git a/config.sub b/config.sub index 6b2ff9f..6b2ff9f 100755..100644 --- a/config.sub +++ b/config.sub diff --git a/doc/.svn/entries b/doc/.svn/entries index 5abe404..ab08c69 100644 --- a/doc/.svn/entries +++ b/doc/.svn/entries @@ -1,15 +1,15 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/doc svn+ssh://green@gcc.gnu.org/svn/gcc -2009-06-09T10:21:19.356122Z -148309 -aph +2009-12-26T05:01:43.471937Z +155471 +green @@ -32,11 +32,11 @@ file -2009-12-20T06:01:58.272552Z -2c36d1d9259ed7b885ff66784a65d3a0 -2009-06-09T10:21:19.356122Z -148309 -aph +2009-12-26T05:00:42.848225Z +3d48f7b34f9e140271227980cdfac146 +2009-12-26T05:01:43.471937Z +155471 +green @@ -58,7 +58,7 @@ aph -15350 +15362 stamp-vti file diff --git a/doc/.svn/text-base/libffi.texi.svn-base b/doc/.svn/text-base/libffi.texi.svn-base index 90c676a..9a5060d 100644 --- a/doc/.svn/text-base/libffi.texi.svn-base +++ b/doc/.svn/text-base/libffi.texi.svn-base @@ -31,7 +31,7 @@ section entitled ``GNU General Public License''. @end quotation @end copying -@dircategory +@dircategory Development @direntry * libffi: (libffi). Portable foreign-function interface library. @end direntry diff --git a/doc/libffi.info b/doc/libffi.info index 7a8890e..87dee8a 100644 --- a/doc/libffi.info +++ b/doc/libffi.info @@ -1,5 +1,5 @@ -This is ../libffi/doc/libffi.info, produced by makeinfo version 4.13 -from ../libffi/doc/libffi.texi. +This is doc/libffi.info, produced by makeinfo version 4.12 from +./doc/libffi.texi. This manual is for Libffi, a portable foreign-function interface library. @@ -13,7 +13,7 @@ library. included in the section entitled "GNU General Public License". -INFO-DIR-SECTION Development +INFO-DIR-SECTION START-INFO-DIR-ENTRY * libffi: (libffi). Portable foreign-function interface library. END-INFO-DIR-ENTRY @@ -516,18 +516,18 @@ Index Tag Table: -Node: Top700 -Node: Introduction1436 -Node: Using libffi3072 -Node: The Basics3507 -Node: Simple Example6114 -Node: Types7141 -Node: Primitive Types7424 -Node: Structures9244 -Node: Type Example10104 -Node: Multiple ABIs11327 -Node: The Closure API11698 -Node: Missing Features14618 -Node: Index15111 +Node: Top670 +Node: Introduction1406 +Node: Using libffi3042 +Node: The Basics3477 +Node: Simple Example6084 +Node: Types7111 +Node: Primitive Types7394 +Node: Structures9214 +Node: Type Example10074 +Node: Multiple ABIs11297 +Node: The Closure API11668 +Node: Missing Features14588 +Node: Index15081 End Tag Table diff --git a/doc/stamp-vti b/doc/stamp-vti index 33d1237..81d0b79 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 25 December 2009 -@set UPDATED-MONTH December 2009 -@set EDITION 3.0.9rc7 -@set VERSION 3.0.9rc7 +@set UPDATED 14 February 2008 +@set UPDATED-MONTH February 2008 +@set EDITION 3.0.8 +@set VERSION 3.0.8 diff --git a/doc/version.texi b/doc/version.texi index 33d1237..81d0b79 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 25 December 2009 -@set UPDATED-MONTH December 2009 -@set EDITION 3.0.9rc7 -@set VERSION 3.0.9rc7 +@set UPDATED 14 February 2008 +@set UPDATED-MONTH February 2008 +@set EDITION 3.0.8 +@set VERSION 3.0.8 diff --git a/include/.svn/entries b/include/.svn/entries index 3124db5..7b9977e 100644 --- a/include/.svn/entries +++ b/include/.svn/entries @@ -1,15 +1,15 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/include svn+ssh://green@gcc.gnu.org/svn/gcc -2009-12-05T17:18:53.298892Z -155012 -rwild +2009-12-26T04:59:25.888276Z +155470 +green @@ -32,11 +32,11 @@ file -2009-12-20T06:01:52.296563Z -ec6d4ca2bd2cdaa6a515412cedd717a1 -2009-06-12T15:57:58.721771Z -148433 -aph +2009-12-26T04:53:55.603976Z +ed03fb27476d372ad782e6ddea030f3b +2009-12-26T04:59:25.888276Z +155470 +green @@ -58,7 +58,7 @@ aph -10882 +10926 Makefile.in file @@ -66,7 +66,7 @@ file -2009-12-20T06:01:52.296563Z +2009-12-26T04:20:27.025981Z bc7944b6049d3417505b65c0d178c0db 2009-12-05T17:18:53.298892Z 155012 @@ -100,11 +100,11 @@ file -2009-12-20T06:01:52.297561Z -5bffed11a81aed973aeec1041d96e2bc -2009-06-12T15:57:58.721771Z -148433 -aph +2009-12-26T04:53:55.603976Z +6ac39dc1d5ec4b22e08fbdc45913f9e1 +2009-12-26T04:59:25.888276Z +155470 +green @@ -126,7 +126,7 @@ aph -2904 +3033 Makefile.am file diff --git a/include/.svn/text-base/ffi.h.in.svn-base b/include/.svn/text-base/ffi.h.in.svn-base index a06d626..32f6103 100644 --- a/include/.svn/text-base/ffi.h.in.svn-base +++ b/include/.svn/text-base/ffi.h.in.svn-base @@ -256,7 +256,11 @@ typedef struct { ffi_cif *cif; void (*fun)(ffi_cif*,void*,void**,void*); void *user_data; +#ifdef __GNUC__ } ffi_closure __attribute__((aligned (8))); +#else +} ffi_closure; +#endif void *ffi_closure_alloc (size_t size, void **code); void ffi_closure_free (void *); diff --git a/include/.svn/text-base/ffi_common.h.svn-base b/include/.svn/text-base/ffi_common.h.svn-base index 16c5f88..42cace9 100644 --- a/include/.svn/text-base/ffi_common.h.svn-base +++ b/include/.svn/text-base/ffi_common.h.svn-base @@ -84,15 +84,21 @@ typedef struct } extended_cif; /* Terse sized type definitions. */ -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__sgi) typedef unsigned char UINT8; typedef signed char SINT8; typedef unsigned short UINT16; typedef signed short SINT16; typedef unsigned int UINT32; typedef signed int SINT32; +# ifdef _MSC_VER typedef unsigned __int64 UINT64; typedef signed __int64 SINT64; +# else +# include <inttypes.h> +typedef uint64_t UINT64; +typedef int64_t SINT64; +# endif #else typedef unsigned int UINT8 __attribute__((__mode__(__QI__))); typedef signed int SINT8 __attribute__((__mode__(__QI__))); diff --git a/include/Makefile.in b/include/Makefile.in index 3a55fd4..136f36c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -78,7 +78,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ -AM_LTLDFLAGS = @AM_LTLDFLAGS@ AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ diff --git a/install-sh b/install-sh index 6ebe46d..6ebe46d 100755..100644 --- a/install-sh +++ b/install-sh diff --git a/man/.svn/entries b/man/.svn/entries index ee47176..bf11eb0 100644 --- a/man/.svn/entries +++ b/man/.svn/entries @@ -1,15 +1,15 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/man svn+ssh://green@gcc.gnu.org/svn/gcc -2009-12-05T17:18:53.298892Z -155012 -rwild +2009-12-26T05:01:43.471937Z +155471 +green @@ -32,11 +32,11 @@ file -2009-12-20T06:01:58.333556Z -77a8c0a182b31529309b91d3aa9d7a35 -2009-06-12T15:57:58.721771Z -148433 -aph +2009-12-26T05:00:42.849225Z +dd7b61f56e75a1d052dd10dc02ac4940 +2009-12-26T05:01:43.471937Z +155471 +green @@ -58,7 +58,7 @@ aph -2337 +2333 Makefile.in file @@ -66,7 +66,7 @@ file -2009-12-20T06:01:58.334555Z +2009-12-26T04:20:27.101235Z 05c58ceade6051d8b2ff7afc80cbb9c3 2009-12-05T17:18:53.298892Z 155012 diff --git a/man/.svn/text-base/ffi_call.3.svn-base b/man/.svn/text-base/ffi_call.3.svn-base index 0b692c5..5351513 100644 --- a/man/.svn/text-base/ffi_call.3.svn-base +++ b/man/.svn/text-base/ffi_call.3.svn-base @@ -43,7 +43,7 @@ integral type must be used to hold the return value. .Sh EXAMPLES .Bd -literal -#include <ffi/ffi.h> +#include <ffi.h> #include <stdio.h> unsigned char diff --git a/man/Makefile.in b/man/Makefile.in index d50f19d..3e40be2 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -76,7 +76,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ -AM_LTLDFLAGS = @AM_LTLDFLAGS@ AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ diff --git a/patches/fix-huge_struct-test b/patches/fix-huge_struct-test index 9a0a9fe..2be3d2a 100644 --- a/patches/fix-huge_struct-test +++ b/patches/fix-huge_struct-test @@ -14,10 +14,10 @@ Index: libffi/ChangeLog.libffi + * testsuite/libffi.call/cls_longdouble.c: Ditto. + * testsuite/libffi.call/cls_double_va.c: Ditto. + - 2009-10-11 Matthias Klose <doko@ubuntu.com> + 2009-12-25 Andreas Tobler <a.tobler@schweiz.org> - * man/ffi_call.3: Fix #include in examples. -@@ -219,20 +230,20 @@ + * fficonfig.h.in: Rebuilt again. +@@ -187,20 +198,20 @@ 2008-12-22 Timothy Wall <twall@users.sf.net> * testsuite/libffi.call/closure_fn0.c, diff --git a/patches/series b/patches/series index 03ad2e5..6457173 100644 --- a/patches/series +++ b/patches/series @@ -1,8 +1,5 @@ stand-alone -avr32 snow-leopard -sgi-mips -fix-docs fix-huge_struct-test windows undefine_AC_ARG_VAR_PRECIOUS diff --git a/patches/snow-leopard b/patches/snow-leopard index b65960a..c486787 100644 --- a/patches/snow-leopard +++ b/patches/snow-leopard @@ -70,9 +70,9 @@ Index: libffi/ChangeLog.libffi + * fficonfig.h.in: Rebuilt. + * src/closures.c (dlmmap): Define version for snow leopard. + - 2009-10-05 Bradley Smith <brad@brad-smith.co.uk> + 2009-06-16 Andrew Haley <aph@redhat.com> - * configure.ac, Makefile.am, src/avr32/ffi.c, + * testsuite/libffi.call/cls_align_sint64.c, Index: libffi/configure.ac =================================================================== --- libffi.orig/configure.ac @@ -96,15 +96,23 @@ Index: libffi/configure =================================================================== --- libffi.orig/configure +++ libffi/configure -@@ -14498,7 +14498,7 @@ _ACEOF +@@ -14497,6 +14497,16 @@ _ACEOF + fi fi - case "$target" in -- i?86-apple-darwin10*) ++case "$target" in + *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*) - - cat >>confdefs.h <<\_ACEOF - #define FFI_MMAP_EXEC_WRIT 1 ++ ++cat >>confdefs.h <<\_ACEOF ++#define FFI_MMAP_EXEC_WRIT 1 ++_ACEOF ++ ++ ;; ++esac ++ + { $as_echo "$as_me:$LINENO: checking whether .eh_frame section should be read-only" >&5 + $as_echo_n "checking whether .eh_frame section should be read-only... " >&6; } + if test "${libffi_cv_ro_eh_frame+set}" = set; then Index: libffi/fficonfig.h.in =================================================================== --- libffi.orig/fficonfig.h.in @@ -119,13 +127,3 @@ Index: libffi/fficonfig.h.in /* Define this is you do not want support for the raw API. */ #undef FFI_NO_RAW_API -@@ -122,9 +125,6 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - --/* Define to the home page for this package. */ --#undef PACKAGE_URL -- - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - diff --git a/patches/stand-alone b/patches/stand-alone index 45509c1..fdbc46e 100644 --- a/patches/stand-alone +++ b/patches/stand-alone @@ -617,7 +617,7 @@ Index: libffi/Makefile.am SUBDIRS = include testsuite man -@@ -26,10 +25,15 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change +@@ -27,10 +26,15 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \ src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h \ src/sparc/ffi.c src/x86/darwin64.S \ @@ -635,7 +635,7 @@ Index: libffi/Makefile.am ## ################################################################ -@@ -76,12 +80,17 @@ AM_MAKEFLAGS = \ +@@ -77,12 +81,17 @@ AM_MAKEFLAGS = \ MAKEOVERRIDES= @@ -654,7 +654,7 @@ Index: libffi/Makefile.am nodist_libffi_la_SOURCES = if MIPS -@@ -162,17 +171,13 @@ nodist_libffi_convenience_la_SOURCES = $ +@@ -166,17 +175,13 @@ nodist_libffi_convenience_la_SOURCES = $ AM_CFLAGS = -Wall -g -fexceptions @@ -690,27 +690,9 @@ Index: libffi/Makefile.in VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -@@ -51,38 +52,32 @@ target_triplet = @target@ - @POWERPC_DARWIN_TRUE@am__append_14 = src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S - @POWERPC_FREEBSD_TRUE@am__append_15 = src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S - @ARM_TRUE@am__append_16 = src/arm/sysv.S src/arm/ffi.c --@LIBFFI_CRIS_TRUE@am__append_17 = src/cris/sysv.S src/cris/ffi.c --@FRV_TRUE@am__append_18 = src/frv/eabi.S src/frv/ffi.c --@S390_TRUE@am__append_19 = src/s390/sysv.S src/s390/ffi.c --@X86_64_TRUE@am__append_20 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S --@SH_TRUE@am__append_21 = src/sh/sysv.S src/sh/ffi.c --@SH64_TRUE@am__append_22 = src/sh64/sysv.S src/sh64/ffi.c --@PA_LINUX_TRUE@am__append_23 = src/pa/linux.S src/pa/ffi.c --@PA_HPUX_TRUE@am__append_24 = src/pa/hpux32.S src/pa/ffi.c -+@AVR32_TRUE@am__append_17 = src/avr32/sysv.S src/avr32/ffi.c -+@LIBFFI_CRIS_TRUE@am__append_18 = src/cris/sysv.S src/cris/ffi.c -+@FRV_TRUE@am__append_19 = src/frv/eabi.S src/frv/ffi.c -+@S390_TRUE@am__append_20 = src/s390/sysv.S src/s390/ffi.c -+@X86_64_TRUE@am__append_21 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S -+@SH_TRUE@am__append_22 = src/sh/sysv.S src/sh/ffi.c -+@SH64_TRUE@am__append_23 = src/sh64/sysv.S src/sh64/ffi.c -+@PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c -+@PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c +@@ -61,29 +62,22 @@ target_triplet = @target@ + @PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c + @PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ - $(srcdir)/../config.guess $(srcdir)/../config.sub \ @@ -747,7 +729,7 @@ Index: libffi/Makefile.in CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ -@@ -105,8 +100,9 @@ am__nobase_list = $(am__nobase_strip_set +@@ -106,8 +100,9 @@ am__nobase_list = $(am__nobase_strip_set am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' @@ -759,61 +741,7 @@ Index: libffi/Makefile.in libffi_la_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp am_libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ -@@ -139,15 +135,16 @@ am_libffi_la_OBJECTS = src/debug.lo src/ - @POWERPC_FREEBSD_TRUE@ src/powerpc/sysv.lo \ - @POWERPC_FREEBSD_TRUE@ src/powerpc/ppc_closure.lo - @ARM_TRUE@am__objects_16 = src/arm/sysv.lo src/arm/ffi.lo --@LIBFFI_CRIS_TRUE@am__objects_17 = src/cris/sysv.lo src/cris/ffi.lo --@FRV_TRUE@am__objects_18 = src/frv/eabi.lo src/frv/ffi.lo --@S390_TRUE@am__objects_19 = src/s390/sysv.lo src/s390/ffi.lo --@X86_64_TRUE@am__objects_20 = src/x86/ffi64.lo src/x86/unix64.lo \ -+@AVR32_TRUE@am__objects_17 = src/avr32/sysv.lo src/avr32/ffi.lo -+@LIBFFI_CRIS_TRUE@am__objects_18 = src/cris/sysv.lo src/cris/ffi.lo -+@FRV_TRUE@am__objects_19 = src/frv/eabi.lo src/frv/ffi.lo -+@S390_TRUE@am__objects_20 = src/s390/sysv.lo src/s390/ffi.lo -+@X86_64_TRUE@am__objects_21 = src/x86/ffi64.lo src/x86/unix64.lo \ - @X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo --@SH_TRUE@am__objects_21 = src/sh/sysv.lo src/sh/ffi.lo --@SH64_TRUE@am__objects_22 = src/sh64/sysv.lo src/sh64/ffi.lo --@PA_LINUX_TRUE@am__objects_23 = src/pa/linux.lo src/pa/ffi.lo --@PA_HPUX_TRUE@am__objects_24 = src/pa/hpux32.lo src/pa/ffi.lo -+@SH_TRUE@am__objects_22 = src/sh/sysv.lo src/sh/ffi.lo -+@SH64_TRUE@am__objects_23 = src/sh64/sysv.lo src/sh64/ffi.lo -+@PA_LINUX_TRUE@am__objects_24 = src/pa/linux.lo src/pa/ffi.lo -+@PA_HPUX_TRUE@am__objects_25 = 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) \ -@@ -156,29 +153,30 @@ nodist_libffi_la_OBJECTS = $(am__objects - $(am__objects_15) $(am__objects_16) $(am__objects_17) \ - $(am__objects_18) $(am__objects_19) $(am__objects_20) \ - $(am__objects_21) $(am__objects_22) $(am__objects_23) \ -- $(am__objects_24) -+ $(am__objects_24) $(am__objects_25) - 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_25 = src/debug.lo src/prep_cif.lo src/types.lo \ -+am__objects_26 = src/debug.lo 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_25) --am__objects_26 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ -+am_libffi_convenience_la_OBJECTS = $(am__objects_26) -+am__objects_27 = $(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) \ - $(am__objects_13) $(am__objects_14) $(am__objects_15) \ - $(am__objects_16) $(am__objects_17) $(am__objects_18) \ - $(am__objects_19) $(am__objects_20) $(am__objects_21) \ -- $(am__objects_22) $(am__objects_23) $(am__objects_24) --nodist_libffi_convenience_la_OBJECTS = $(am__objects_26) -+ $(am__objects_22) $(am__objects_23) $(am__objects_24) \ -+ $(am__objects_25) -+nodist_libffi_convenience_la_OBJECTS = $(am__objects_27) +@@ -181,7 +176,7 @@ nodist_libffi_convenience_la_OBJECTS = $ libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \ $(nodist_libffi_convenience_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ @@ -822,7 +750,7 @@ Index: libffi/Makefile.in am__depfiles_maybe = depfiles am__mv = mv -f CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -199,12 +197,18 @@ SOURCES = $(libffi_la_SOURCES) $(nodist_ +@@ -202,12 +197,18 @@ SOURCES = $(libffi_la_SOURCES) $(nodist_ $(libffi_convenience_la_SOURCES) \ $(nodist_libffi_convenience_la_SOURCES) DIST_SOURCES = $(libffi_la_SOURCES) $(libffi_convenience_la_SOURCES) @@ -847,7 +775,7 @@ Index: libffi/Makefile.in RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ -@@ -212,6 +216,7 @@ RECURSIVE_TARGETS = all-recursive check- +@@ -215,6 +216,7 @@ RECURSIVE_TARGETS = all-recursive check- install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive @@ -855,15 +783,7 @@ Index: libffi/Makefile.in RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -259,6 +264,7 @@ distcleancheck_listfiles = find . -type - ACLOCAL = @ACLOCAL@ - ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ -+AM_LTLDFLAGS = @AM_LTLDFLAGS@ - AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ -@@ -313,7 +319,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -316,7 +318,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -871,7 +791,7 @@ Index: libffi/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -@@ -360,9 +365,9 @@ libdir = @libdir@ +@@ -363,9 +364,9 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -882,7 +802,7 @@ Index: libffi/Makefile.in oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ -@@ -383,11 +388,11 @@ top_build_prefix = @top_build_prefix@ +@@ -386,7 +387,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign subdir-objects @@ -890,12 +810,7 @@ Index: libffi/Makefile.in SUBDIRS = include testsuite man EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ - src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \ -+ src/avr32/ffi.c src/avr32/sysv.S src/avr32/ffitarget.h \ - src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \ - src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \ - src/ia64/unix.S \ -@@ -406,11 +411,15 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change +@@ -410,11 +410,15 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \ src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h \ src/sparc/ffi.c src/x86/darwin64.S \ @@ -913,7 +828,7 @@ Index: libffi/Makefile.in # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and -@@ -450,11 +459,14 @@ AM_MAKEFLAGS = \ +@@ -454,11 +458,14 @@ AM_MAKEFLAGS = \ "DESTDIR=$(DESTDIR)" MAKEOVERRIDES = @@ -929,18 +844,13 @@ Index: libffi/Makefile.in nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) \ $(am__append_3) $(am__append_4) $(am__append_5) \ $(am__append_6) $(am__append_7) $(am__append_8) \ -@@ -463,19 +475,18 @@ nodist_libffi_la_SOURCES = $(am__append_ - $(am__append_15) $(am__append_16) $(am__append_17) \ - $(am__append_18) $(am__append_19) $(am__append_20) \ - $(am__append_21) $(am__append_22) $(am__append_23) \ -- $(am__append_24) -+ $(am__append_24) $(am__append_25) +@@ -471,15 +478,14 @@ nodist_libffi_la_SOURCES = $(am__append_ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) AM_CFLAGS = -Wall -g -fexceptions -LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) -libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) -+libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(AM_LTLDFLAGS) ++libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) all: fficonfig.h @@ -952,7 +862,7 @@ Index: libffi/Makefile.in am--refresh: @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -@@ -527,41 +538,43 @@ $(srcdir)/fficonfig.h.in: @MAINTAINER_MO +@@ -531,41 +537,43 @@ $(srcdir)/fficonfig.h.in: @MAINTAINER_MO distclean-hdr: -rm -f fficonfig.h stamp-h1 @@ -1017,24 +927,7 @@ Index: libffi/Makefile.in dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ -@@ -701,6 +714,16 @@ src/arm/sysv.lo: src/arm/$(am__dirstamp) - src/arm/$(DEPDIR)/$(am__dirstamp) - src/arm/ffi.lo: src/arm/$(am__dirstamp) \ - src/arm/$(DEPDIR)/$(am__dirstamp) -+src/avr32/$(am__dirstamp): -+ @$(MKDIR_P) src/avr32 -+ @: > src/avr32/$(am__dirstamp) -+src/avr32/$(DEPDIR)/$(am__dirstamp): -+ @$(MKDIR_P) src/avr32/$(DEPDIR) -+ @: > src/avr32/$(DEPDIR)/$(am__dirstamp) -+src/avr32/sysv.lo: src/avr32/$(am__dirstamp) \ -+ src/avr32/$(DEPDIR)/$(am__dirstamp) -+src/avr32/ffi.lo: src/avr32/$(am__dirstamp) \ -+ src/avr32/$(DEPDIR)/$(am__dirstamp) - src/cris/$(am__dirstamp): - @$(MKDIR_P) src/cris - @: > src/cris/$(am__dirstamp) -@@ -764,7 +787,7 @@ src/pa/ffi.lo: src/pa/$(am__dirstamp) sr +@@ -778,7 +786,7 @@ src/pa/ffi.lo: src/pa/$(am__dirstamp) sr src/pa/hpux32.lo: src/pa/$(am__dirstamp) \ src/pa/$(DEPDIR)/$(am__dirstamp) libffi.la: $(libffi_la_OBJECTS) $(libffi_la_DEPENDENCIES) @@ -1043,35 +936,7 @@ Index: libffi/Makefile.in libffi_convenience.la: $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_DEPENDENCIES) $(LINK) $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_LIBADD) $(LIBS) -@@ -778,6 +801,10 @@ mostlyclean-compile: - -rm -f src/arm/ffi.lo - -rm -f src/arm/sysv.$(OBJEXT) - -rm -f src/arm/sysv.lo -+ -rm -f src/avr32/ffi.$(OBJEXT) -+ -rm -f src/avr32/ffi.lo -+ -rm -f src/avr32/sysv.$(OBJEXT) -+ -rm -f src/avr32/sysv.lo - -rm -f src/closures.$(OBJEXT) - -rm -f src/closures.lo - -rm -f src/cris/ffi.$(OBJEXT) -@@ -892,6 +919,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/osf.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/ffi.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/sysv.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/ffi.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@src/avr32/$(DEPDIR)/sysv.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/ffi.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/cris/$(DEPDIR)/sysv.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@src/frv/$(DEPDIR)/eabi.Plo@am__quote@ -@@ -993,6 +1022,7 @@ clean-libtool: - -rm -rf src/.libs src/_libs - -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/cris/.libs src/cris/_libs - -rm -rf src/frv/.libs src/frv/_libs - -rm -rf src/ia64/.libs src/ia64/_libs -@@ -1009,23 +1039,191 @@ clean-libtool: +@@ -1030,23 +1038,191 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt @@ -1279,7 +1144,7 @@ Index: libffi/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. -@@ -1222,6 +1420,9 @@ distdir: $(DISTFILES) +@@ -1243,6 +1419,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -1289,7 +1154,7 @@ Index: libffi/Makefile.in -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -@@ -1338,10 +1539,10 @@ distcleancheck: distclean +@@ -1359,10 +1538,10 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive @@ -1302,7 +1167,7 @@ Index: libffi/Makefile.in test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive -@@ -1365,12 +1566,15 @@ clean-generic: +@@ -1386,6 +1565,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) @@ -1310,15 +1175,7 @@ Index: libffi/Makefile.in -rm -f src/$(DEPDIR)/$(am__dirstamp) -rm -f src/$(am__dirstamp) -rm -f src/alpha/$(DEPDIR)/$(am__dirstamp) - -rm -f src/alpha/$(am__dirstamp) - -rm -f src/arm/$(DEPDIR)/$(am__dirstamp) - -rm -f src/arm/$(am__dirstamp) -+ -rm -f src/avr32/$(DEPDIR)/$(am__dirstamp) -+ -rm -f src/avr32/$(am__dirstamp) - -rm -f src/cris/$(DEPDIR)/$(am__dirstamp) - -rm -f src/cris/$(am__dirstamp) - -rm -f src/frv/$(DEPDIR)/$(am__dirstamp) -@@ -1401,114 +1605,186 @@ distclean-generic: +@@ -1424,12 +1604,12 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." @@ -1333,11 +1190,9 @@ Index: libffi/Makefile.in -distclean: distclean-multi distclean-recursive +distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -- -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(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/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(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/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(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 +@@ -1438,100 +1618,172 @@ distclean-am: clean-am distclean-compile dvi: dvi-recursive @@ -1474,8 +1329,7 @@ Index: libffi/Makefile.in +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/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(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/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(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/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(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-generic +maintainer-clean-am: distclean-am maintainer-clean-aminfo \ @@ -12653,7 +12507,7 @@ Index: libffi/configure #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for libffi 3.0.8. -+# Generated by GNU Autoconf 2.63 for libffi 3.0.9rc6. ++# Generated by GNU Autoconf 2.63 for libffi 3.0.9rc7. # # Report bugs to <http://gcc.gnu.org/bugs.html>. # @@ -13609,14 +13463,14 @@ Index: libffi/configure PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.8' -PACKAGE_STRING='libffi 3.0.8' -+PACKAGE_VERSION='3.0.9rc6' -+PACKAGE_STRING='libffi 3.0.9rc6' ++PACKAGE_VERSION='3.0.9rc7' ++PACKAGE_STRING='libffi 3.0.9rc7' PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html' -PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ -@@ -672,6 +857,7 @@ OTOOL +@@ -674,6 +859,7 @@ OTOOL LIPO NMEDIT DSYMUTIL @@ -13624,7 +13478,7 @@ Index: libffi/configure RANLIB AR OBJDUMP -@@ -741,7 +927,6 @@ build_os +@@ -743,7 +929,6 @@ build_os build_vendor build_cpu build @@ -13632,7 +13486,7 @@ Index: libffi/configure target_alias host_alias build_alias -@@ -772,7 +957,6 @@ bindir +@@ -774,7 +959,6 @@ bindir program_transform_name prefix exec_prefix @@ -13640,7 +13494,7 @@ Index: libffi/configure PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION -@@ -783,7 +967,6 @@ SHELL' +@@ -785,7 +969,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -13648,7 +13502,7 @@ Index: libffi/configure enable_dependency_tracking enable_shared enable_static -@@ -912,7 +1095,8 @@ do +@@ -914,7 +1097,8 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -13658,7 +13512,7 @@ Index: libffi/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -938,7 +1122,8 @@ do +@@ -940,7 +1124,8 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -13668,7 +13522,7 @@ Index: libffi/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1142,7 +1327,8 @@ do +@@ -1144,7 +1329,8 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -13678,7 +13532,7 @@ Index: libffi/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1158,7 +1344,8 @@ do +@@ -1160,7 +1346,8 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -13688,7 +13542,7 @@ Index: libffi/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1188,17 +1375,17 @@ do +@@ -1190,17 +1377,17 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -13712,7 +13566,7 @@ Index: libffi/configure eval $ac_envvar=\$ac_optarg export $ac_envvar ;; -@@ -1215,13 +1402,15 @@ done +@@ -1217,13 +1404,15 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -13730,7 +13584,7 @@ Index: libffi/configure *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi -@@ -1244,7 +1433,8 @@ do +@@ -1246,7 +1435,8 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac @@ -13740,7 +13594,7 @@ Index: libffi/configure done # There might be people who depend on the old broken behavior: `$host' -@@ -1274,9 +1464,11 @@ test "$silent" = yes && exec 6>/dev/null +@@ -1276,9 +1466,11 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || @@ -13754,7 +13608,7 @@ Index: libffi/configure # Find the source files, if location was not specified. -@@ -1315,11 +1507,13 @@ else +@@ -1317,11 +1509,13 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -13770,25 +13624,25 @@ Index: libffi/configure pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1345,7 +1539,7 @@ if test "$ac_init_help" = "long"; then +@@ -1347,7 +1541,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.8 to adapt to many kinds of systems. -+\`configure' configures libffi 3.0.9rc6 to adapt to many kinds of systems. ++\`configure' configures libffi 3.0.9rc7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... -@@ -1416,7 +1610,7 @@ fi +@@ -1418,7 +1612,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.8:";; -+ short | recursive ) echo "Configuration of libffi 3.0.9rc6:";; ++ short | recursive ) echo "Configuration of libffi 3.0.9rc7:";; esac cat <<\_ACEOF -@@ -1424,7 +1618,6 @@ Optional Features: +@@ -1426,7 +1620,6 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] @@ -13796,13 +13650,13 @@ Index: libffi/configure --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-shared[=PKGS] build shared libraries [default=yes] -@@ -1524,604 +1717,69 @@ fi +@@ -1526,604 +1719,69 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.8 -generated by GNU Autoconf 2.64 -+libffi configure 3.0.9rc6 ++libffi configure 3.0.9rc7 +generated by GNU Autoconf 2.63 -Copyright (C) 2009 Free Software Foundation, Inc. @@ -13902,7 +13756,7 @@ Index: libffi/configure - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval -+It was created by libffi $as_me 3.0.9rc6, which was ++It was created by libffi $as_me 3.0.9rc7, which was +generated by GNU Autoconf 2.63. Invocation command line was -} # ac_fn_c_try_link @@ -14444,7 +14298,7 @@ Index: libffi/configure _ACEOF -@@ -2148,9 +1806,9 @@ do +@@ -2150,9 +1808,9 @@ do ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -14456,7 +14310,7 @@ Index: libffi/configure if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else -@@ -2166,13 +1824,13 @@ do +@@ -2168,13 +1826,13 @@ do -* ) ac_must_keep_next=true ;; esac fi @@ -14473,7 +14327,7 @@ Index: libffi/configure # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there -@@ -2197,13 +1855,13 @@ _ASBOX +@@ -2199,13 +1857,13 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -14489,7 +14343,7 @@ Index: libffi/configure esac ;; esac done -@@ -2275,39 +1933,37 @@ _ASBOX +@@ -2277,39 +1935,37 @@ _ASBOX exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -14534,7 +14388,7 @@ Index: libffi/configure _ACEOF -@@ -2328,7 +1984,7 @@ for ac_site_file in "$ac_site_file1" "$a +@@ -2330,7 +1986,7 @@ for ac_site_file in "$ac_site_file1" "$a do test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then @@ -14543,7 +14397,7 @@ Index: libffi/configure $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" -@@ -2339,7 +1995,7 @@ if test -r "$cache_file"; then +@@ -2341,7 +1997,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then @@ -14552,7 +14406,7 @@ Index: libffi/configure $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; -@@ -2347,7 +2003,7 @@ $as_echo "$as_me: loading cache $cache_f +@@ -2349,7 +2005,7 @@ $as_echo "$as_me: loading cache $cache_f esac fi else @@ -14561,7 +14415,7 @@ Index: libffi/configure $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -@@ -2362,11 +2018,11 @@ for ac_var in $ac_precious_vars; do +@@ -2364,11 +2020,11 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) @@ -14575,7 +14429,7 @@ Index: libffi/configure $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; -@@ -2376,17 +2032,17 @@ $as_echo "$as_me: error: \`$ac_var' was +@@ -2378,17 +2034,17 @@ $as_echo "$as_me: error: \`$ac_var' was ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then @@ -14597,7 +14451,7 @@ Index: libffi/configure $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac -@@ -2398,84 +2054,74 @@ $as_echo "$as_me: current value: \`$ac +@@ -2400,84 +2056,74 @@ $as_echo "$as_me: current value: \`$ac esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. @@ -14723,7 +14577,7 @@ Index: libffi/configure fi # These three variables are undocumented and unsupported, -@@ -2489,27 +2135,35 @@ ac_configure="$SHELL $ac_aux_dir/configu +@@ -2491,27 +2137,35 @@ ac_configure="$SHELL $ac_aux_dir/configu # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -14766,7 +14620,7 @@ Index: libffi/configure esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -2525,24 +2179,28 @@ IFS=$ac_save_IFS +@@ -2527,24 +2181,28 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -14800,7 +14654,7 @@ Index: libffi/configure esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -2558,24 +2216,28 @@ IFS=$ac_save_IFS +@@ -2560,24 +2218,28 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac @@ -14834,7 +14688,7 @@ Index: libffi/configure esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' -@@ -2597,7 +2259,6 @@ test -n "$target_alias" && +@@ -2599,7 +2261,6 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- @@ -14842,7 +14696,7 @@ Index: libffi/configure target_alias=${target_alias-$host_alias} . ${srcdir}/configure.host -@@ -2618,10 +2279,10 @@ am__api_version='1.11' +@@ -2620,10 +2281,10 @@ am__api_version='1.11' # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. @@ -14855,7 +14709,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2629,11 +2290,11 @@ for as_dir in $PATH +@@ -2631,11 +2292,11 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14871,7 +14725,7 @@ Index: libffi/configure /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2670,7 +2331,7 @@ case $as_dir/ in #(( +@@ -2672,7 +2333,7 @@ case $as_dir/ in #(( ;; esac @@ -14880,7 +14734,7 @@ Index: libffi/configure IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir -@@ -2686,7 +2347,7 @@ fi +@@ -2688,7 +2349,7 @@ fi INSTALL=$ac_install_sh fi fi @@ -14889,7 +14743,7 @@ Index: libffi/configure $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2697,7 +2358,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR +@@ -2699,7 +2360,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -14898,7 +14752,7 @@ Index: libffi/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -2708,11 +2369,15 @@ am_lf=' +@@ -2710,11 +2371,15 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) @@ -14916,7 +14770,7 @@ Index: libffi/configure esac # Do `set' in a subshell so we don't clobber the current shell's -@@ -2734,8 +2399,11 @@ if ( +@@ -2736,8 +2401,11 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -14930,7 +14784,7 @@ Index: libffi/configure fi test "$2" = conftest.file -@@ -2744,10 +2412,13 @@ then +@@ -2746,10 +2414,13 @@ then # Ok. : else @@ -14947,7 +14801,7 @@ Index: libffi/configure $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -2775,7 +2446,7 @@ if eval "$MISSING --run true"; then +@@ -2777,7 +2448,7 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= @@ -14956,7 +14810,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -@@ -2796,9 +2467,9 @@ if test "$cross_compiling" != no; then +@@ -2798,9 +2469,9 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -14968,7 +14822,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -2809,24 +2480,24 @@ for as_dir in $PATH +@@ -2811,24 +2482,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14998,7 +14852,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -2836,9 +2507,9 @@ if test -z "$ac_cv_prog_STRIP"; then +@@ -2838,9 +2509,9 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -15010,7 +14864,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -2849,24 +2520,24 @@ for as_dir in $PATH +@@ -2851,24 +2522,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15040,7 +14894,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -2875,7 +2546,7 @@ fi +@@ -2877,7 +2548,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -15049,7 +14903,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -2888,10 +2559,10 @@ fi +@@ -2890,10 +2561,10 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" @@ -15062,7 +14916,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2899,7 +2570,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s +@@ -2901,7 +2572,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15071,7 +14925,7 @@ Index: libffi/configure for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -@@ -2911,7 +2582,7 @@ do +@@ -2913,7 +2584,7 @@ do esac done done @@ -15080,7 +14934,7 @@ Index: libffi/configure IFS=$as_save_IFS fi -@@ -2927,7 +2598,7 @@ fi +@@ -2929,7 +2600,7 @@ fi MKDIR_P="$ac_install_sh -d" fi fi @@ -15089,7 +14943,7 @@ Index: libffi/configure $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" -@@ -2940,9 +2611,9 @@ for ac_prog in gawk mawk nawk awk +@@ -2942,9 +2613,9 @@ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -15101,7 +14955,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2953,24 +2624,24 @@ for as_dir in $PATH +@@ -2955,24 +2626,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15131,7 +14985,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -2978,11 +2649,11 @@ fi +@@ -2980,11 +2651,11 @@ fi test -n "$AWK" && break done @@ -15145,7 +14999,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -3000,11 +2671,11 @@ esac +@@ -3002,11 +2673,11 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -15159,7 +15013,7 @@ Index: libffi/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -3024,7 +2695,9 @@ if test "`cd $srcdir && pwd`" != "`pwd`" +@@ -3026,7 +2697,9 @@ if test "`cd $srcdir && pwd`" != "`pwd`" am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then @@ -15170,16 +15024,16 @@ Index: libffi/configure fi fi -@@ -3040,7 +2713,7 @@ fi +@@ -3042,7 +2715,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.8' -+ VERSION='3.0.9rc6' ++ VERSION='3.0.9rc7' cat >>confdefs.h <<_ACEOF -@@ -3096,9 +2769,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -3098,9 +2771,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -15191,7 +15045,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3109,24 +2782,24 @@ for as_dir in $PATH +@@ -3111,24 +2784,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15221,7 +15075,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -3136,9 +2809,9 @@ if test -z "$ac_cv_prog_CC"; then +@@ -3138,9 +2811,9 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -15233,7 +15087,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3149,24 +2822,24 @@ for as_dir in $PATH +@@ -3151,24 +2824,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15263,7 +15117,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -3175,7 +2848,7 @@ fi +@@ -3177,7 +2850,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -15272,7 +15126,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3189,9 +2862,9 @@ if test -z "$CC"; then +@@ -3191,9 +2864,9 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -15284,7 +15138,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3202,24 +2875,24 @@ for as_dir in $PATH +@@ -3204,24 +2877,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15314,7 +15168,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -3229,9 +2902,9 @@ fi +@@ -3231,9 +2904,9 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -15326,7 +15180,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3243,18 +2916,18 @@ for as_dir in $PATH +@@ -3245,18 +2918,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15348,7 +15202,7 @@ Index: libffi/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -3273,10 +2946,10 @@ fi +@@ -3275,10 +2948,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -15361,7 +15215,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -3288,9 +2961,9 @@ if test -z "$CC"; then +@@ -3290,9 +2963,9 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -15373,7 +15227,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3301,24 +2974,24 @@ for as_dir in $PATH +@@ -3303,24 +2976,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15403,7 +15257,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -3332,9 +3005,9 @@ if test -z "$CC"; then +@@ -3334,9 +3007,9 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -15415,7 +15269,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3345,24 +3018,24 @@ for as_dir in $PATH +@@ -3347,24 +3020,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -15445,7 +15299,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -3375,7 +3048,7 @@ done +@@ -3377,7 +3050,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) @@ -15454,7 +15308,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3386,37 +3059,57 @@ fi +@@ -3388,37 +3061,57 @@ fi fi @@ -15532,7 +15386,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -3428,11 +3121,11 @@ main () +@@ -3430,11 +3123,11 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files @@ -15546,7 +15400,7 @@ Index: libffi/configure $as_echo_n "checking for C compiler default output file name... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -@@ -3449,17 +3142,17 @@ do +@@ -3451,17 +3144,17 @@ do done rm -f $ac_rmfiles @@ -15569,7 +15423,7 @@ Index: libffi/configure # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -3476,7 +3169,7 @@ do +@@ -3478,7 +3171,7 @@ do # certainly right. break;; *.* ) @@ -15578,7 +15432,7 @@ Index: libffi/configure then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi -@@ -3495,75 +3188,84 @@ test "$ac_cv_exeext" = no && ac_cv_exeex +@@ -3497,75 +3190,84 @@ test "$ac_cv_exeext" = no && ac_cv_exeex else ac_file='' fi @@ -15688,7 +15542,7 @@ Index: libffi/configure # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -3578,24 +3280,32 @@ for ac_file in conftest.exe conftest con +@@ -3580,24 +3282,32 @@ for ac_file in conftest.exe conftest con esac done else @@ -15728,7 +15582,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -3607,17 +3317,17 @@ main () +@@ -3609,17 +3319,17 @@ main () } _ACEOF rm -f conftest.o conftest.obj @@ -15751,7 +15605,7 @@ Index: libffi/configure for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in -@@ -3630,23 +3340,31 @@ else +@@ -3632,23 +3342,31 @@ else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15790,7 +15644,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -3660,16 +3378,37 @@ main () +@@ -3662,16 +3380,37 @@ main () return 0; } _ACEOF @@ -15831,7 +15685,7 @@ Index: libffi/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -3678,16 +3417,20 @@ else +@@ -3680,16 +3419,20 @@ else fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -15855,7 +15709,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -3698,11 +3441,35 @@ main () +@@ -3700,11 +3443,35 @@ main () return 0; } _ACEOF @@ -15894,7 +15748,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -3713,12 +3480,36 @@ main () +@@ -3715,12 +3482,36 @@ main () return 0; } _ACEOF @@ -15935,7 +15789,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -3729,17 +3520,42 @@ main () +@@ -3731,17 +3522,42 @@ main () return 0; } _ACEOF @@ -15980,7 +15834,7 @@ Index: libffi/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -3756,14 +3572,18 @@ else +@@ -3758,14 +3574,18 @@ else CFLAGS= fi fi @@ -16002,7 +15856,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -@@ -3820,9 +3640,32 @@ for ac_arg in '' -qlanglvl=extc89 -qlang +@@ -3822,9 +3642,32 @@ for ac_arg in '' -qlanglvl=extc89 -qlang -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -16036,7 +15890,7 @@ Index: libffi/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -3833,19 +3676,17 @@ fi +@@ -3835,19 +3678,17 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -16059,7 +15913,7 @@ Index: libffi/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -3864,7 +3705,7 @@ am__doit: +@@ -3866,7 +3707,7 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -16068,7 +15922,7 @@ Index: libffi/configure $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -@@ -3892,12 +3733,12 @@ if test "$am__include" = "#"; then +@@ -3894,12 +3735,12 @@ if test "$am__include" = "#"; then fi @@ -16083,7 +15937,7 @@ Index: libffi/configure enableval=$enable_dependency_tracking; fi -@@ -3917,9 +3758,9 @@ fi +@@ -3919,9 +3760,9 @@ fi depcc="$CC" am_compiler_list= @@ -16095,7 +15949,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4027,7 +3868,7 @@ else +@@ -4029,7 +3870,7 @@ else fi fi @@ -16104,7 +15958,7 @@ Index: libffi/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -4055,9 +3896,9 @@ test "${CCASFLAGS+set}" = set || CCASFLA +@@ -4057,9 +3898,9 @@ test "${CCASFLAGS+set}" = set || CCASFLA depcc="$CCAS" am_compiler_list= @@ -16116,7 +15970,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4163,7 +4004,7 @@ else +@@ -4165,7 +4006,7 @@ else fi fi @@ -16125,7 +15979,7 @@ Index: libffi/configure $as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type -@@ -4179,18 +4020,22 @@ fi +@@ -4181,18 +4022,22 @@ fi if test "x$CC" != xcc; then @@ -16152,7 +16006,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -4206,63 +4051,63 @@ _ACEOF +@@ -4208,63 +4053,63 @@ _ACEOF # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* @@ -16241,7 +16095,7 @@ Index: libffi/configure then # cc works too. : -@@ -4279,13 +4124,15 @@ rm -f core conftest* +@@ -4281,13 +4126,15 @@ rm -f core conftest* fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then @@ -16260,7 +16114,7 @@ Index: libffi/configure fi -@@ -4306,14 +4153,14 @@ fi +@@ -4308,14 +4155,14 @@ fi case `pwd` in *\ * | *\ *) @@ -16278,7 +16132,7 @@ Index: libffi/configure -@@ -4329,78 +4176,9 @@ macro_revision='1.3134' +@@ -4331,78 +4178,9 @@ macro_revision='1.3134' ltmain="$ac_aux_dir/ltmain.sh" @@ -16359,7 +16213,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -4408,7 +4186,7 @@ else +@@ -4410,7 +4188,7 @@ else ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed @@ -16368,7 +16222,7 @@ Index: libffi/configure if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST -@@ -4417,7 +4195,7 @@ for as_dir in $PATH +@@ -4419,7 +4197,7 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16377,7 +16231,7 @@ Index: libffi/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -@@ -4437,7 +4215,7 @@ case `"$ac_path_SED" --version 2>&1` in +@@ -4439,7 +4217,7 @@ case `"$ac_path_SED" --version 2>&1` in $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -16386,7 +16240,7 @@ Index: libffi/configure if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" -@@ -4452,17 +4230,19 @@ esac +@@ -4454,17 +4232,19 @@ esac $ac_path_SED_found && break 3 done done @@ -16409,7 +16263,7 @@ Index: libffi/configure $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed -@@ -4480,9 +4260,9 @@ Xsed="$SED -e 1s/^X//" +@@ -4482,9 +4262,9 @@ Xsed="$SED -e 1s/^X//" @@ -16421,7 +16275,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then -@@ -4493,7 +4273,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x +@@ -4495,7 +4275,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16430,7 +16284,7 @@ Index: libffi/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -@@ -4513,7 +4293,7 @@ case `"$ac_path_GREP" --version 2>&1` in +@@ -4515,7 +4295,7 @@ case `"$ac_path_GREP" --version 2>&1` in $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -16439,7 +16293,7 @@ Index: libffi/configure if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" -@@ -4528,24 +4308,26 @@ esac +@@ -4530,24 +4310,26 @@ esac $ac_path_GREP_found && break 3 done done @@ -16471,7 +16325,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -4559,7 +4341,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x +@@ -4561,7 +4343,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16480,7 +16334,7 @@ Index: libffi/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -@@ -4579,7 +4361,7 @@ case `"$ac_path_EGREP" --version 2>&1` i +@@ -4581,7 +4363,7 @@ case `"$ac_path_EGREP" --version 2>&1` i $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -16489,7 +16343,7 @@ Index: libffi/configure if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" -@@ -4594,10 +4376,12 @@ esac +@@ -4596,10 +4378,12 @@ esac $ac_path_EGREP_found && break 3 done done @@ -16504,7 +16358,7 @@ Index: libffi/configure fi else ac_cv_path_EGREP=$EGREP -@@ -4605,14 +4389,14 @@ fi +@@ -4607,14 +4391,14 @@ fi fi fi @@ -16522,7 +16376,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -4626,7 +4410,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x +@@ -4628,7 +4412,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16531,7 +16385,7 @@ Index: libffi/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -@@ -4646,7 +4430,7 @@ case `"$ac_path_FGREP" --version 2>&1` i +@@ -4648,7 +4432,7 @@ case `"$ac_path_FGREP" --version 2>&1` i $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -16540,7 +16394,7 @@ Index: libffi/configure if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" -@@ -4661,10 +4445,12 @@ esac +@@ -4663,10 +4447,12 @@ esac $ac_path_FGREP_found && break 3 done done @@ -16555,7 +16409,7 @@ Index: libffi/configure fi else ac_cv_path_FGREP=$FGREP -@@ -4672,7 +4458,7 @@ fi +@@ -4674,7 +4460,7 @@ fi fi fi @@ -16564,7 +16418,7 @@ Index: libffi/configure $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" -@@ -4698,7 +4484,7 @@ test -z "$GREP" && GREP=grep +@@ -4700,7 +4486,7 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. @@ -16573,7 +16427,7 @@ Index: libffi/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -4707,7 +4493,7 @@ fi +@@ -4709,7 +4495,7 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -16582,7 +16436,7 @@ Index: libffi/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -4737,13 +4523,13 @@ $as_echo_n "checking for ld used by $CC. +@@ -4739,13 +4525,13 @@ $as_echo_n "checking for ld used by $CC. ;; esac elif test "$with_gnu_ld" = yes; then @@ -16599,7 +16453,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -4774,16 +4560,18 @@ fi +@@ -4776,16 +4562,18 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -16623,7 +16477,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -4796,7 +4584,7 @@ case `$LD -v 2>&1 </dev/null` in +@@ -4798,7 +4586,7 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi @@ -16632,7 +16486,7 @@ Index: libffi/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -4808,9 +4596,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld +@@ -4810,9 +4598,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld @@ -16644,7 +16498,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$NM"; then -@@ -4857,23 +4645,20 @@ else +@@ -4859,23 +4647,20 @@ else : ${lt_cv_path_NM=no} fi fi @@ -16673,7 +16527,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then -@@ -4884,24 +4669,24 @@ for as_dir in $PATH +@@ -4886,24 +4671,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16703,7 +16557,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -4911,13 +4696,13 @@ fi +@@ -4913,13 +4698,13 @@ fi fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN @@ -16720,7 +16574,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then -@@ -4928,24 +4713,24 @@ for as_dir in $PATH +@@ -4930,24 +4715,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16750,7 +16604,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -4958,7 +4743,7 @@ done +@@ -4960,7 +4745,7 @@ done else case $cross_compiling:$ac_tool_warned in yes:) @@ -16759,7 +16613,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -4966,15 +4751,6 @@ esac +@@ -4968,15 +4753,6 @@ esac fi fi @@ -16775,7 +16629,7 @@ Index: libffi/configure if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" -@@ -4987,44 +4763,44 @@ test -z "$NM" && NM=nm +@@ -4989,44 +4765,44 @@ test -z "$NM" && NM=nm @@ -16789,15 +16643,15 @@ Index: libffi/configure lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:4773: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:4775: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:4776: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:4778: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) -+ (eval echo "\"\$as_me:4779: output\"" >&5) ++ (eval echo "\"\$as_me:4781: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -16831,7 +16685,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else i=0 -@@ -5057,11 +4833,6 @@ else +@@ -5059,11 +4835,6 @@ else lt_cv_sys_max_cmd_len=8192; ;; @@ -16843,7 +16697,7 @@ Index: libffi/configure amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. -@@ -5126,8 +4897,8 @@ else +@@ -5128,8 +4899,8 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. @@ -16854,7 +16708,7 @@ Index: libffi/configure test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` -@@ -5147,10 +4918,10 @@ else +@@ -5149,10 +4920,10 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -16867,7 +16721,7 @@ Index: libffi/configure $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -5164,7 +4935,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len +@@ -5166,7 +4937,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} @@ -16876,7 +16730,7 @@ Index: libffi/configure $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no -@@ -5174,17 +4945,17 @@ xsi_shell=no +@@ -5176,17 +4947,17 @@ xsi_shell=no && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -16897,7 +16751,7 @@ Index: libffi/configure $as_echo "$lt_shell_append" >&6; } -@@ -5219,14 +4990,14 @@ esac +@@ -5221,14 +4992,14 @@ esac @@ -16915,7 +16769,7 @@ Index: libffi/configure $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in -@@ -5255,9 +5026,9 @@ esac +@@ -5257,9 +5028,9 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -16927,7 +16781,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -5268,24 +5039,24 @@ for as_dir in $PATH +@@ -5270,24 +5041,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16957,7 +16811,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -5295,9 +5066,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then +@@ -5297,9 +5068,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -16969,7 +16823,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -5308,24 +5079,24 @@ for as_dir in $PATH +@@ -5310,24 +5081,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -16999,7 +16853,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -5334,7 +5105,7 @@ fi +@@ -5336,7 +5107,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -17008,7 +16862,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5354,9 +5125,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump +@@ -5356,9 +5127,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump @@ -17020,7 +16874,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -5398,8 +5169,7 @@ mingw* | pw32*) +@@ -5400,8 +5171,7 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. @@ -17030,7 +16884,7 @@ Index: libffi/configure lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else -@@ -5408,7 +5178,7 @@ mingw* | pw32*) +@@ -5410,7 +5180,7 @@ mingw* | pw32*) fi ;; @@ -17039,7 +16893,7 @@ Index: libffi/configure # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' -@@ -5438,10 +5208,6 @@ gnu*) +@@ -5440,10 +5210,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -17050,7 +16904,7 @@ Index: libffi/configure hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in -@@ -5450,11 +5216,11 @@ hpux10.20* | hpux11*) +@@ -5452,11 +5218,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) @@ -17064,7 +16918,7 @@ Index: libffi/configure lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac -@@ -5476,7 +5242,7 @@ irix5* | irix6* | nonstopux*) +@@ -5478,7 +5244,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. @@ -17073,7 +16927,7 @@ Index: libffi/configure lt_cv_deplibs_check_method=pass_all ;; -@@ -5555,7 +5321,7 @@ tpf*) +@@ -5557,7 +5323,7 @@ tpf*) esac fi @@ -17082,7 +16936,7 @@ Index: libffi/configure $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method -@@ -5575,9 +5341,9 @@ test -z "$deplibs_check_method" && depli +@@ -5577,9 +5343,9 @@ test -z "$deplibs_check_method" && depli if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -17094,7 +16948,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -5588,24 +5354,24 @@ for as_dir in $PATH +@@ -5590,24 +5356,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17124,7 +16978,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -5615,9 +5381,9 @@ if test -z "$ac_cv_prog_AR"; then +@@ -5617,9 +5383,9 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -17136,7 +16990,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then -@@ -5628,24 +5394,24 @@ for as_dir in $PATH +@@ -5630,24 +5396,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17166,7 +17020,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -5654,7 +5420,7 @@ fi +@@ -5656,7 +5422,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -17175,7 +17029,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5680,9 +5446,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru +@@ -5682,9 +5448,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -17187,7 +17041,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -5693,24 +5459,24 @@ for as_dir in $PATH +@@ -5695,24 +5461,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17217,7 +17071,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -5720,9 +5486,9 @@ if test -z "$ac_cv_prog_STRIP"; then +@@ -5722,9 +5488,9 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -17229,7 +17083,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -5733,24 +5499,24 @@ for as_dir in $PATH +@@ -5735,24 +5501,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17259,7 +17113,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -5759,7 +5525,7 @@ fi +@@ -5761,7 +5527,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -17268,7 +17122,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5779,9 +5545,9 @@ test -z "$STRIP" && STRIP=: +@@ -5781,9 +5547,9 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -17280,7 +17134,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then -@@ -5792,24 +5558,24 @@ for as_dir in $PATH +@@ -5794,24 +5560,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17310,7 +17164,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -5819,9 +5585,9 @@ if test -z "$ac_cv_prog_RANLIB"; then +@@ -5821,9 +5587,9 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -17322,7 +17176,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then -@@ -5832,24 +5598,24 @@ for as_dir in $PATH +@@ -5834,24 +5600,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17352,7 +17206,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -5858,7 +5624,7 @@ fi +@@ -5860,7 +5626,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -17361,7 +17215,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5892,18 +5658,6 @@ if test -n "$RANLIB"; then +@@ -5894,18 +5660,6 @@ if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi @@ -17380,7 +17234,7 @@ Index: libffi/configure -@@ -5948,9 +5702,9 @@ compiler=$CC +@@ -5950,9 +5704,9 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -17392,7 +17246,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else -@@ -6066,18 +5820,18 @@ void nm_test_func(void){} +@@ -6068,18 +5822,18 @@ void nm_test_func(void){} int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF @@ -17418,7 +17272,7 @@ Index: libffi/configure # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" -@@ -6130,11 +5884,11 @@ _LT_EOF +@@ -6132,11 +5886,11 @@ _LT_EOF lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" @@ -17433,7 +17287,7 @@ Index: libffi/configure pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -6168,10 +5922,10 @@ if test -z "$lt_cv_sys_global_symbol_pip +@@ -6170,10 +5924,10 @@ if test -z "$lt_cv_sys_global_symbol_pip lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then @@ -17446,7 +17300,7 @@ Index: libffi/configure $as_echo "ok" >&6; } fi -@@ -6198,7 +5952,7 @@ fi +@@ -6200,7 +5954,7 @@ fi # Check whether --enable-libtool-lock was given. @@ -17455,7 +17309,7 @@ Index: libffi/configure enableval=$enable_libtool_lock; fi -@@ -6210,11 +5964,11 @@ case $host in +@@ -6212,11 +5966,11 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -17470,13 +17324,13 @@ Index: libffi/configure case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -6228,12 +5982,12 @@ ia64-*-hpux*) +@@ -6230,12 +5984,12 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ echo '#line 5985 "configure"' > conftest.$ac_ext ++ echo '#line 5987 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17487,7 +17341,7 @@ Index: libffi/configure if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) -@@ -6267,11 +6021,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc +@@ -6269,11 +6023,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -17502,7 +17356,7 @@ Index: libffi/configure case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -6320,9 +6074,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* +@@ -6322,9 +6076,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -17514,7 +17368,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else ac_ext=c -@@ -6331,7 +6085,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con +@@ -6333,7 +6087,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -17527,7 +17381,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -6342,13 +6100,38 @@ main () +@@ -6344,13 +6102,38 @@ main () return 0; } _ACEOF @@ -17570,7 +17424,7 @@ Index: libffi/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -6356,7 +6139,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA +@@ -6358,7 +6141,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -17579,7 +17433,7 @@ Index: libffi/configure $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -@@ -6366,11 +6149,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } +@@ -6368,11 +6151,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -17594,7 +17448,7 @@ Index: libffi/configure case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -6396,9 +6179,9 @@ need_locks="$enable_libtool_lock" +@@ -6398,9 +6181,9 @@ need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 @@ -17606,7 +17460,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then -@@ -6409,24 +6192,24 @@ for as_dir in $PATH +@@ -6411,24 +6194,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17636,7 +17490,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6436,9 +6219,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then +@@ -6438,9 +6221,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 @@ -17648,7 +17502,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then -@@ -6449,24 +6232,24 @@ for as_dir in $PATH +@@ -6451,24 +6234,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17678,7 +17532,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6475,7 +6258,7 @@ fi +@@ -6477,7 +6260,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -17687,7 +17541,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6488,9 +6271,9 @@ fi +@@ -6490,9 +6273,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 @@ -17699,7 +17553,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then -@@ -6501,24 +6284,24 @@ for as_dir in $PATH +@@ -6503,24 +6286,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17729,7 +17583,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6528,9 +6311,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then +@@ -6530,9 +6313,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 @@ -17741,7 +17595,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then -@@ -6541,24 +6324,24 @@ for as_dir in $PATH +@@ -6543,24 +6326,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17771,7 +17625,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6567,7 +6350,7 @@ fi +@@ -6569,7 +6352,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -17780,7 +17634,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6580,9 +6363,9 @@ fi +@@ -6582,9 +6365,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 @@ -17792,7 +17646,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then -@@ -6593,24 +6376,24 @@ for as_dir in $PATH +@@ -6595,24 +6378,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17822,7 +17676,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6620,9 +6403,9 @@ if test -z "$ac_cv_prog_LIPO"; then +@@ -6622,9 +6405,9 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 @@ -17834,7 +17688,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then -@@ -6633,24 +6416,24 @@ for as_dir in $PATH +@@ -6635,24 +6418,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17864,7 +17718,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6659,7 +6442,7 @@ fi +@@ -6661,7 +6444,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -17873,7 +17727,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6672,9 +6455,9 @@ fi +@@ -6674,9 +6457,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 @@ -17885,7 +17739,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then -@@ -6685,24 +6468,24 @@ for as_dir in $PATH +@@ -6687,24 +6470,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17915,7 +17769,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6712,9 +6495,9 @@ if test -z "$ac_cv_prog_OTOOL"; then +@@ -6714,9 +6497,9 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 @@ -17927,7 +17781,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then -@@ -6725,24 +6508,24 @@ for as_dir in $PATH +@@ -6727,24 +6510,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -17957,7 +17811,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6751,7 +6534,7 @@ fi +@@ -6753,7 +6536,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -17966,7 +17820,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6764,9 +6547,9 @@ fi +@@ -6766,9 +6549,9 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 @@ -17978,7 +17832,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then -@@ -6777,24 +6560,24 @@ for as_dir in $PATH +@@ -6779,24 +6562,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -18008,7 +17862,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6804,9 +6587,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then +@@ -6806,9 +6589,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 @@ -18020,7 +17874,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then -@@ -6817,24 +6600,24 @@ for as_dir in $PATH +@@ -6819,24 +6602,24 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -18050,7 +17904,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -6843,7 +6626,7 @@ fi +@@ -6845,7 +6628,7 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -18059,7 +17913,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6879,9 +6662,9 @@ fi +@@ -6881,9 +6664,9 @@ fi @@ -18071,7 +17925,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no -@@ -6906,18 +6689,22 @@ else +@@ -6908,18 +6691,22 @@ else rm -f conftest.* fi fi @@ -18098,7 +17952,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -6928,48 +6715,43 @@ main () +@@ -6930,48 +6717,43 @@ main () return 0; } _ACEOF @@ -18181,7 +18035,7 @@ Index: libffi/configure case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -6997,7 +6779,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } +@@ -6999,7 +6781,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi @@ -18190,7 +18044,7 @@ Index: libffi/configure _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= -@@ -7010,14 +6792,14 @@ ac_cpp='$CPP $CPPFLAGS' +@@ -7012,14 +6794,14 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -18207,7 +18061,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -7032,7 +6814,11 @@ do +@@ -7034,7 +6816,11 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -18220,7 +18074,7 @@ Index: libffi/configure /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> -@@ -7041,34 +6827,78 @@ do +@@ -7043,34 +6829,78 @@ do #endif Syntax error _ACEOF @@ -18304,7 +18158,7 @@ Index: libffi/configure break fi -@@ -7080,7 +6910,7 @@ fi +@@ -7082,7 +6912,7 @@ fi else ac_cv_prog_CPP=$CPP fi @@ -18313,7 +18167,7 @@ Index: libffi/configure $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes -@@ -7091,7 +6921,11 @@ do +@@ -7093,7 +6923,11 @@ do # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -18326,7 +18180,7 @@ Index: libffi/configure /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> -@@ -7100,40 +6934,87 @@ do +@@ -7102,40 +6936,87 @@ do #endif Syntax error _ACEOF @@ -18423,7 +18277,7 @@ Index: libffi/configure fi ac_ext=c -@@ -7143,12 +7024,16 @@ ac_link='$CC -o conftest$ac_exeext $CFLA +@@ -7145,12 +7026,16 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -18443,7 +18297,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> -@@ -7163,23 +7048,48 @@ main () +@@ -7165,23 +7050,48 @@ main () return 0; } _ACEOF @@ -18497,7 +18351,7 @@ Index: libffi/configure else ac_cv_header_stdc=no fi -@@ -7189,14 +7099,18 @@ fi +@@ -7191,14 +7101,18 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -18519,7 +18373,7 @@ Index: libffi/configure else ac_cv_header_stdc=no fi -@@ -7206,10 +7120,14 @@ fi +@@ -7208,10 +7122,14 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -18536,7 +18390,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> -@@ -7236,34 +7154,118 @@ main () +@@ -7238,34 +7156,118 @@ main () return 0; } _ACEOF @@ -18668,7 +18522,7 @@ Index: libffi/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -7273,20 +7275,67 @@ fi +@@ -7275,20 +7277,67 @@ fi done @@ -18743,7 +18597,7 @@ Index: libffi/configure -@@ -7301,7 +7350,7 @@ done +@@ -7303,7 +7352,7 @@ done # Check whether --enable-shared was given. @@ -18752,7 +18606,7 @@ Index: libffi/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -7332,7 +7381,7 @@ fi +@@ -7334,7 +7383,7 @@ fi # Check whether --enable-static was given. @@ -18761,7 +18615,7 @@ Index: libffi/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -7364,7 +7413,7 @@ fi +@@ -7366,7 +7415,7 @@ fi # Check whether --with-pic was given. @@ -18770,7 +18624,7 @@ Index: libffi/configure withval=$with_pic; pic_mode="$withval" else pic_mode=default -@@ -7380,7 +7429,7 @@ test -z "$pic_mode" && pic_mode=default +@@ -7382,7 +7431,7 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. @@ -18779,7 +18633,7 @@ Index: libffi/configure enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; -@@ -7442,7 +7491,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo +@@ -7444,7 +7493,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo @@ -18787,7 +18641,7 @@ Index: libffi/configure test -z "$LN_S" && LN_S="ln -s" -@@ -7462,9 +7510,9 @@ if test -n "${ZSH_VERSION+set}" ; then +@@ -7464,9 +7512,9 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi @@ -18799,7 +18653,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null -@@ -7477,7 +7525,7 @@ else +@@ -7479,7 +7527,7 @@ else fi rmdir .libs 2>/dev/null fi @@ -18808,7 +18662,7 @@ Index: libffi/configure $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -@@ -7492,6 +7540,19 @@ _ACEOF +@@ -7494,6 +7542,19 @@ _ACEOF @@ -18828,7 +18682,7 @@ Index: libffi/configure case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some -@@ -7504,6 +7565,23 @@ aix3*) +@@ -7506,6 +7567,23 @@ aix3*) ;; esac @@ -18852,7 +18706,7 @@ Index: libffi/configure # Global variables: ofile=libtool can_build_shared=yes -@@ -7532,7 +7610,7 @@ for cc_temp in $compiler""; do +@@ -7534,7 +7612,7 @@ for cc_temp in $compiler""; do *) break;; esac done @@ -18861,7 +18715,7 @@ Index: libffi/configure # Only perform the check for file, if the check method requires it -@@ -7540,9 +7618,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file +@@ -7542,9 +7620,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -18873,7 +18727,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -7593,10 +7671,10 @@ fi +@@ -7595,10 +7673,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -18886,7 +18740,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -7606,9 +7684,9 @@ fi +@@ -7608,9 +7686,9 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then @@ -18898,7 +18752,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -7659,10 +7737,10 @@ fi +@@ -7661,10 +7739,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -18911,7 +18765,7 @@ Index: libffi/configure $as_echo "no" >&6; } fi -@@ -7732,25 +7810,16 @@ _lt_linker_boilerplate=`cat conftest.err +@@ -7734,25 +7812,16 @@ _lt_linker_boilerplate=`cat conftest.err $RM -r conftest* @@ -18940,17 +18794,17 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no -@@ -7766,15 +7835,15 @@ else +@@ -7768,15 +7837,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7838: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7840: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:7842: \$? = $ac_status" >&5 ++ echo "$as_me:7844: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18959,7 +18813,7 @@ Index: libffi/configure $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes -@@ -7783,7 +7852,7 @@ else +@@ -7785,7 +7854,7 @@ else $RM conftest* fi @@ -18968,7 +18822,7 @@ Index: libffi/configure $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -7803,7 +7872,7 @@ fi +@@ -7805,7 +7874,7 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= @@ -18977,7 +18831,7 @@ Index: libffi/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then -@@ -7852,12 +7921,6 @@ $as_echo_n "checking for $compiler optio +@@ -7854,12 +7923,6 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-fno-common' ;; @@ -18990,7 +18844,7 @@ Index: libffi/configure hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -@@ -7900,13 +7963,6 @@ $as_echo_n "checking for $compiler optio +@@ -7902,13 +7965,6 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='-fPIC' ;; esac @@ -19004,7 +18858,7 @@ Index: libffi/configure else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in -@@ -7948,7 +8004,7 @@ $as_echo_n "checking for $compiler optio +@@ -7950,7 +8006,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_static='-non_shared' ;; @@ -19013,7 +18867,7 @@ Index: libffi/configure case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) -@@ -7969,7 +8025,7 @@ $as_echo_n "checking for $compiler optio +@@ -7971,7 +8027,7 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; @@ -19022,7 +18876,7 @@ Index: libffi/configure # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' -@@ -7981,26 +8037,26 @@ $as_echo_n "checking for $compiler optio +@@ -7983,26 +8039,26 @@ $as_echo_n "checking for $compiler optio # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; @@ -19057,7 +18911,7 @@ Index: libffi/configure esac ;; esac -@@ -8088,7 +8144,7 @@ case $host_os in +@@ -8090,7 +8146,7 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -19066,7 +18920,7 @@ Index: libffi/configure $as_echo "$lt_prog_compiler_pic" >&6; } -@@ -8100,9 +8156,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; } +@@ -8102,9 +8158,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; } # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then @@ -19078,17 +18932,17 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no -@@ -8118,15 +8174,15 @@ else +@@ -8120,15 +8176,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8177: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8179: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:8181: \$? = $ac_status" >&5 ++ echo "$as_me:8183: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19097,7 +18951,7 @@ Index: libffi/configure $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes -@@ -8135,7 +8191,7 @@ else +@@ -8137,7 +8193,7 @@ else $RM conftest* fi @@ -19106,7 +18960,7 @@ Index: libffi/configure $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -8159,9 +8215,9 @@ fi +@@ -8161,9 +8217,9 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -19118,7 +18972,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no -@@ -8174,7 +8230,7 @@ else +@@ -8176,7 +8232,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 @@ -19127,7 +18981,7 @@ Index: libffi/configure $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes -@@ -8187,7 +8243,7 @@ else +@@ -8189,7 +8245,7 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -19136,7 +18990,7 @@ Index: libffi/configure $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -8202,9 +8258,9 @@ fi +@@ -8204,9 +8260,9 @@ fi @@ -19148,17 +19002,17 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -8223,16 +8279,16 @@ else +@@ -8225,16 +8281,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8282: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8284: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:8286: \$? = $ac_status" >&5 ++ echo "$as_me:8288: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19168,7 +19022,7 @@ Index: libffi/configure $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes -@@ -8249,7 +8305,7 @@ else +@@ -8251,7 +8307,7 @@ else $RM conftest* fi @@ -19177,7 +19031,7 @@ Index: libffi/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -8257,9 +8313,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; +@@ -8259,9 +8315,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; @@ -19189,17 +19043,17 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -8278,16 +8334,16 @@ else +@@ -8280,16 +8336,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8337: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8339: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:8341: \$? = $ac_status" >&5 ++ echo "$as_me:8343: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19209,7 +19063,7 @@ Index: libffi/configure $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes -@@ -8304,7 +8360,7 @@ else +@@ -8306,7 +8362,7 @@ else $RM conftest* fi @@ -19218,7 +19072,7 @@ Index: libffi/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -8313,7 +8369,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; +@@ -8315,7 +8371,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user @@ -19227,7 +19081,7 @@ Index: libffi/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -8321,10 +8377,10 @@ $as_echo_n "checking if we can lock with +@@ -8323,10 +8379,10 @@ $as_echo_n "checking if we can lock with touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -19240,7 +19094,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -8337,7 +8393,7 @@ fi +@@ -8339,7 +8395,7 @@ fi @@ -19249,7 +19103,7 @@ Index: libffi/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= -@@ -8400,33 +8456,7 @@ $as_echo_n "checking whether the $compil +@@ -8402,33 +8458,7 @@ $as_echo_n "checking whether the $compil esac ld_shlibs=yes @@ -19283,7 +19137,7 @@ Index: libffi/configure # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' -@@ -8444,7 +8474,6 @@ $as_echo_n "checking whether the $compil +@@ -8446,7 +8476,6 @@ $as_echo_n "checking whether the $compil fi supports_anon_versioning=no case `$LD -v 2>&1` in @@ -19291,7 +19145,7 @@ Index: libffi/configure *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -8460,12 +8489,11 @@ $as_echo_n "checking whether the $compil +@@ -8462,12 +8491,11 @@ $as_echo_n "checking whether the $compil ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -19307,7 +19161,7 @@ Index: libffi/configure _LT_EOF fi -@@ -8501,7 +8529,6 @@ _LT_EOF +@@ -8503,7 +8531,6 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -19315,7 +19169,7 @@ Index: libffi/configure allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes -@@ -8523,11 +8550,6 @@ _LT_EOF +@@ -8525,11 +8552,6 @@ _LT_EOF fi ;; @@ -19327,7 +19181,7 @@ Index: libffi/configure interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no -@@ -8543,7 +8565,7 @@ _LT_EOF +@@ -8545,7 +8567,7 @@ _LT_EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; @@ -19336,7 +19190,7 @@ Index: libffi/configure tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in -@@ -8557,12 +8579,11 @@ _LT_EOF +@@ -8559,12 +8581,11 @@ _LT_EOF tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -19352,7 +19206,7 @@ Index: libffi/configure tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; -@@ -8573,17 +8594,13 @@ _LT_EOF +@@ -8575,17 +8596,13 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; @@ -19372,7 +19226,7 @@ Index: libffi/configure compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 -@@ -8599,7 +8616,7 @@ _LT_EOF +@@ -8601,7 +8618,7 @@ _LT_EOF fi case $cc_basename in @@ -19381,7 +19235,7 @@ Index: libffi/configure # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec= -@@ -8730,10 +8747,8 @@ _LT_EOF +@@ -8732,10 +8749,8 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm @@ -19393,7 +19247,7 @@ Index: libffi/configure else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi -@@ -8820,7 +8835,11 @@ _LT_EOF +@@ -8822,7 +8837,11 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -19406,7 +19260,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -8831,11 +8850,31 @@ main () +@@ -8833,11 +8852,31 @@ main () return 0; } _ACEOF @@ -19443,7 +19297,7 @@ Index: libffi/configure s/^0 *\(.*\)$/\1/ p } -@@ -8845,13 +8884,20 @@ aix_libpath=`dump -H conftest$ac_exeext +@@ -8847,13 +8886,20 @@ aix_libpath=`dump -H conftest$ac_exeext if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -19467,7 +19321,7 @@ Index: libffi/configure else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -@@ -8860,7 +8906,11 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8862,7 +8908,11 @@ if test -z "$aix_libpath"; then aix_libp else # Determine the default libpath from the value encoded in an # empty executable. @@ -19480,7 +19334,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -8871,7 +8921,27 @@ main () +@@ -8873,7 +8923,27 @@ main () return 0; } _ACEOF @@ -19509,7 +19363,7 @@ Index: libffi/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -8885,9 +8955,16 @@ aix_libpath=`dump -H conftest$ac_exeext +@@ -8887,9 +8957,16 @@ aix_libpath=`dump -H conftest$ac_exeext if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -19528,7 +19382,7 @@ Index: libffi/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -8895,13 +8972,8 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8897,13 +8974,8 @@ if test -z "$aix_libpath"; then aix_libp # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' @@ -19544,7 +19398,7 @@ Index: libffi/configure archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -@@ -8940,7 +9012,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8942,7 +9014,7 @@ if test -z "$aix_libpath"; then aix_libp # Tell ltmain to make .dll files, not .so files. shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. @@ -19553,7 +19407,7 @@ Index: libffi/configure # The linker will automatically build a .lib file if we build a DLL. old_archive_from_new_cmds='true' # FIXME: Should let the user specify the lib program. -@@ -8956,11 +9028,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8958,11 +9030,7 @@ if test -z "$aix_libpath"; then aix_libp hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported @@ -19566,7 +19420,7 @@ Index: libffi/configure link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in -@@ -8968,7 +9036,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -8970,7 +9038,7 @@ if test -z "$aix_libpath"; then aix_libp *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then @@ -19575,7 +19429,7 @@ Index: libffi/configure archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -@@ -9034,7 +9102,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9036,7 +9104,7 @@ if test -z "$aix_libpath"; then aix_libp ;; hpux10*) @@ -19584,7 +19438,7 @@ Index: libffi/configure archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -@@ -9053,7 +9121,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9055,7 +9123,7 @@ if test -z "$aix_libpath"; then aix_libp ;; hpux11*) @@ -19593,7 +19447,7 @@ Index: libffi/configure case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -@@ -9074,46 +9142,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -9076,46 +9144,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -19641,7 +19495,7 @@ Index: libffi/configure ;; esac fi -@@ -9141,26 +9170,52 @@ fi +@@ -9143,26 +9172,52 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then @@ -19703,7 +19557,7 @@ Index: libffi/configure fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -@@ -9222,17 +9277,17 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9224,17 +9279,17 @@ rm -f core conftest.err conftest.$ac_obj hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported @@ -19724,7 +19578,7 @@ Index: libffi/configure fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -@@ -9242,13 +9297,13 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9244,13 +9299,13 @@ rm -f core conftest.err conftest.$ac_obj osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -19741,7 +19595,7 @@ Index: libffi/configure # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' -@@ -9412,7 +9467,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -9414,7 +9469,7 @@ rm -f core conftest.err conftest.$ac_obj fi fi @@ -19750,7 +19604,7 @@ Index: libffi/configure $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -@@ -9449,52 +9504,46 @@ x|xyes) +@@ -9451,52 +9506,46 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -19837,7 +19691,7 @@ Index: libffi/configure ;; esac fi -@@ -9657,7 +9706,7 @@ esac +@@ -9659,7 +9708,7 @@ esac @@ -19846,7 +19700,7 @@ Index: libffi/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then -@@ -9665,23 +9714,16 @@ if test "$GCC" = yes; then +@@ -9667,23 +9716,16 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac @@ -19876,7 +19730,7 @@ Index: libffi/configure # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= -@@ -9694,7 +9736,7 @@ if test "$GCC" = yes; then +@@ -9696,7 +9738,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done @@ -19885,7 +19739,7 @@ Index: libffi/configure BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; -@@ -9714,13 +9756,7 @@ BEGIN {RS=" "; FS="/|\n";} { +@@ -9716,13 +9758,7 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` @@ -19900,7 +19754,7 @@ Index: libffi/configure else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi -@@ -9808,7 +9844,7 @@ amigaos*) +@@ -9810,7 +9846,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. @@ -19909,7 +19763,7 @@ Index: libffi/configure ;; esac ;; -@@ -9861,12 +9897,23 @@ cygwin* | mingw* | pw32* | cegcc*) +@@ -9863,12 +9899,23 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' @@ -19935,7 +19789,7 @@ Index: libffi/configure ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' -@@ -9966,19 +10013,6 @@ gnu*) +@@ -9968,19 +10015,6 @@ gnu*) hardcode_into_libs=yes ;; @@ -19955,7 +19809,7 @@ Index: libffi/configure hpux9* | hpux10* | hpux11*) # Give a soname corresponding to the major version so that dld.sl refuses to # link against other versions. -@@ -10021,10 +10055,8 @@ hpux9* | hpux10* | hpux11*) +@@ -10023,10 +10057,8 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac @@ -19967,7 +19821,7 @@ Index: libffi/configure ;; interix[3-9]*) -@@ -10082,7 +10114,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -10084,7 +10116,7 @@ linux*oldld* | linux*aout* | linux*coff* ;; # This must be Linux ELF. @@ -19976,7 +19830,7 @@ Index: libffi/configure version_type=linux need_lib_prefix=no need_version=no -@@ -10091,17 +10123,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) +@@ -10093,17 +10125,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -20003,7 +19857,7 @@ Index: libffi/configure /* end confdefs.h. */ int -@@ -10112,29 +10143,56 @@ main () +@@ -10114,29 +10145,56 @@ main () return 0; } _ACEOF @@ -20071,7 +19925,7 @@ Index: libffi/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -10334,7 +10392,7 @@ uts4*) +@@ -10336,7 +10394,7 @@ uts4*) dynamic_linker=no ;; esac @@ -20080,7 +19934,7 @@ Index: libffi/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -10436,12 +10494,7 @@ fi +@@ -10438,12 +10496,7 @@ fi @@ -20094,7 +19948,7 @@ Index: libffi/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || -@@ -10466,7 +10519,7 @@ else +@@ -10468,7 +10521,7 @@ else # directories. hardcode_action=unsupported fi @@ -20103,7 +19957,7 @@ Index: libffi/configure $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || -@@ -10511,14 +10564,18 @@ else +@@ -10513,14 +10566,18 @@ else darwin*) # if libdl is installed we need to link against it @@ -20125,7 +19979,7 @@ Index: libffi/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -10536,18 +10593,43 @@ return dlopen (); +@@ -10538,18 +10595,43 @@ return dlopen (); return 0; } _ACEOF @@ -20175,7 +20029,7 @@ Index: libffi/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -10560,19 +10642,33 @@ fi +@@ -10562,19 +10644,33 @@ fi ;; *) @@ -20219,7 +20073,7 @@ Index: libffi/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -10581,6 +10677,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ +@@ -10583,6 +10679,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ extern "C" #endif char shl_load (); @@ -20233,7 +20087,7 @@ Index: libffi/configure int main () { -@@ -10589,32 +10692,56 @@ return shl_load (); +@@ -10591,32 +10694,56 @@ return shl_load (); return 0; } _ACEOF @@ -20309,7 +20163,7 @@ Index: libffi/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -10623,47 +10750,232 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ +@@ -10625,47 +10752,232 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ #ifdef __cplusplus extern "C" #endif @@ -20567,7 +20421,7 @@ Index: libffi/configure main () { return dlopen (); -@@ -10671,28 +10983,57 @@ return dlopen (); +@@ -10673,28 +10985,57 @@ return dlopen (); return 0; } _ACEOF @@ -20634,7 +20488,7 @@ Index: libffi/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -10710,18 +11051,43 @@ return dld_link (); +@@ -10712,18 +11053,43 @@ return dld_link (); return 0; } _ACEOF @@ -20684,7 +20538,7 @@ Index: libffi/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -10760,9 +11126,9 @@ fi +@@ -10762,9 +11128,9 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -20696,16 +20550,16 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -10771,7 +11137,7 @@ else +@@ -10773,7 +11139,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10774 "configure" -+#line 11140 "configure" +-#line 10776 "configure" ++#line 11142 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10812,13 +11178,7 @@ else +@@ -10814,13 +11180,7 @@ else # endif #endif @@ -20720,7 +20574,7 @@ Index: libffi/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10827,11 +11187,7 @@ int main () +@@ -10829,11 +11189,7 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; @@ -20733,7 +20587,7 @@ Index: libffi/configure /* dlclose (self); */ } else -@@ -10840,11 +11196,11 @@ int main () +@@ -10842,11 +11198,11 @@ int main () return status; } _LT_EOF @@ -20748,7 +20602,7 @@ Index: libffi/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -10861,14 +11217,14 @@ rm -fr conftest* +@@ -10863,14 +11219,14 @@ rm -fr conftest* fi @@ -20766,16 +20620,16 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -10877,7 +11233,7 @@ else +@@ -10879,7 +11235,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10880 "configure" -+#line 11236 "configure" +-#line 10882 "configure" ++#line 11238 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10918,13 +11274,7 @@ else +@@ -10920,13 +11276,7 @@ else # endif #endif @@ -20790,7 +20644,7 @@ Index: libffi/configure int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -@@ -10933,11 +11283,7 @@ int main () +@@ -10935,11 +11285,7 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; @@ -20803,7 +20657,7 @@ Index: libffi/configure /* dlclose (self); */ } else -@@ -10946,11 +11292,11 @@ int main () +@@ -10948,11 +11294,11 @@ int main () return status; } _LT_EOF @@ -20818,7 +20672,7 @@ Index: libffi/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -10967,7 +11313,7 @@ rm -fr conftest* +@@ -10969,7 +11315,7 @@ rm -fr conftest* fi @@ -20827,7 +20681,7 @@ Index: libffi/configure $as_echo "$lt_cv_dlopen_self_static" >&6; } fi -@@ -11006,12 +11352,12 @@ fi +@@ -11008,12 +11354,12 @@ fi striplib= old_striplib= @@ -20842,7 +20696,7 @@ Index: libffi/configure $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough -@@ -11020,15 +11366,15 @@ else +@@ -11022,15 +11368,15 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -20861,7 +20715,7 @@ Index: libffi/configure $as_echo "no" >&6; } ;; esac -@@ -11046,12 +11392,12 @@ fi +@@ -11048,12 +11394,12 @@ fi # Report which library types will actually be built @@ -20877,7 +20731,7 @@ Index: libffi/configure $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no -@@ -11072,14 +11418,14 @@ $as_echo_n "checking whether to build sh +@@ -11074,14 +11420,14 @@ $as_echo_n "checking whether to build sh fi ;; esac @@ -20895,7 +20749,7 @@ Index: libffi/configure $as_echo "$enable_static" >&6; } -@@ -11116,16 +11462,17 @@ CC="$lt_save_CC" +@@ -11118,16 +11464,17 @@ CC="$lt_save_CC" @@ -20916,7 +20770,7 @@ Index: libffi/configure $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= -@@ -11139,80 +11486,524 @@ fi +@@ -11141,80 +11488,524 @@ fi @@ -21496,7 +21350,7 @@ Index: libffi/configure # explicitly unmapped remain accessible. # 2. If you map two adjacent blocks of memory and then unmap them # both at once, they must both go away. -@@ -11225,16 +12016,20 @@ else +@@ -11227,16 +12018,20 @@ else ac_cv_func_mmap_dev_zero=yes;; esac fi @@ -21521,7 +21375,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <sys/types.h> #include <sys/mman.h> -@@ -11252,22 +12047,43 @@ int n = MAP_ANONYMOUS; +@@ -11254,22 +12049,43 @@ int n = MAP_ANONYMOUS; return 0; } _ACEOF @@ -21570,7 +21424,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else # Add a system to this blacklist if it has mmap() and MAP_ANON or -@@ -11282,24 +12098,30 @@ else +@@ -11284,24 +12100,30 @@ else ac_cv_func_mmap_anon=yes;; esac fi @@ -21605,7 +21459,7 @@ Index: libffi/configure fi -@@ -11327,6 +12149,10 @@ case "$host" in +@@ -11329,6 +12151,10 @@ case "$host" in amd64-*-freebsd*) TARGET=X86_64; TARGETDIR=x86 @@ -21615,8 +21469,8 @@ Index: libffi/configure + TARGET=X86_64; TARGETDIR=x86 ;; - cris-*-*) -@@ -11432,7 +12258,9 @@ esac + avr32*-*-*) +@@ -11438,7 +12264,9 @@ esac if test $TARGETDIR = unknown; then @@ -21627,7 +21481,7 @@ Index: libffi/configure fi if test x$TARGET = xMIPS; then -@@ -11636,12 +12464,16 @@ else +@@ -11650,12 +12478,16 @@ else fi @@ -21647,7 +21501,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> -@@ -11656,23 +12488,48 @@ main () +@@ -11670,23 +12502,48 @@ main () return 0; } _ACEOF @@ -21701,7 +21555,7 @@ Index: libffi/configure else ac_cv_header_stdc=no fi -@@ -11682,14 +12539,18 @@ fi +@@ -11696,14 +12553,18 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -21723,7 +21577,7 @@ Index: libffi/configure else ac_cv_header_stdc=no fi -@@ -11699,10 +12560,14 @@ fi +@@ -11713,10 +12574,14 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -21740,7 +21594,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> -@@ -11729,31 +12594,150 @@ main () +@@ -11743,31 +12608,150 @@ main () return 0; } _ACEOF @@ -21902,7 +21756,7 @@ Index: libffi/configure _ACEOF fi -@@ -11761,12 +12745,16 @@ done +@@ -11775,12 +12759,16 @@ done # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! @@ -21922,7 +21776,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <alloca.h> int -@@ -11778,28 +12766,59 @@ char *p = (char *) alloca (2 * sizeof (i +@@ -11792,28 +12780,59 @@ char *p = (char *) alloca (2 * sizeof (i return 0; } _ACEOF @@ -21991,7 +21845,7 @@ Index: libffi/configure /* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca -@@ -11831,20 +12850,47 @@ char *p = (char *) alloca (1); +@@ -11845,20 +12864,47 @@ char *p = (char *) alloca (1); return 0; } _ACEOF @@ -22045,7 +21899,7 @@ Index: libffi/configure else # The SVR3 libPW and SVR4 libucb both contain incompatible functions -@@ -11854,15 +12900,21 @@ else +@@ -11868,15 +12914,21 @@ else ALLOCA=\${LIBOBJDIR}alloca.$ac_objext @@ -22071,7 +21925,7 @@ Index: libffi/configure /* end confdefs.h. */ #if defined CRAY && ! defined CRAY2 webecray -@@ -11872,7 +12924,7 @@ wenotbecray +@@ -11886,7 +12938,7 @@ wenotbecray _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -22080,7 +21934,7 @@ Index: libffi/configure ac_cv_os_cray=yes else ac_cv_os_cray=no -@@ -11880,14 +12932,101 @@ fi +@@ -11894,14 +12946,101 @@ fi rm -f conftest* fi @@ -22186,7 +22040,7 @@ Index: libffi/configure cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -@@ -11899,15 +13038,19 @@ fi +@@ -11913,15 +13052,19 @@ fi done fi @@ -22210,7 +22064,7 @@ Index: libffi/configure /* end confdefs.h. */ $ac_includes_default int -@@ -11927,88 +13070,766 @@ find_stack_direction () +@@ -11941,88 +13084,766 @@ find_stack_direction () int main () { @@ -23040,7 +22894,7 @@ Index: libffi/configure $as_echo "$ac_cv_sizeof_long_double" >&6; } -@@ -12026,21 +13847,28 @@ if test -z "$HAVE_LONG_DOUBLE"; then +@@ -12040,21 +13861,28 @@ if test -z "$HAVE_LONG_DOUBLE"; then if test $ac_cv_sizeof_long_double != 0; then HAVE_LONG_DOUBLE=1 @@ -23073,7 +22927,7 @@ Index: libffi/configure /* end confdefs.h. */ #ifndef __APPLE_CC__ not a universal capable compiler -@@ -12048,34 +13876,46 @@ else +@@ -12062,34 +13890,46 @@ else typedef int dummy; _ACEOF @@ -23142,7 +22996,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <sys/types.h> #include <sys/param.h> -@@ -12093,9 +13933,30 @@ main () +@@ -12107,9 +13947,30 @@ main () return 0; } _ACEOF @@ -23175,7 +23029,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <sys/types.h> #include <sys/param.h> -@@ -12111,18 +13972,49 @@ main () +@@ -12125,18 +13986,49 @@ main () return 0; } _ACEOF @@ -23228,7 +23082,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <limits.h> -@@ -12137,9 +14029,30 @@ main () +@@ -12151,9 +14043,30 @@ main () return 0; } _ACEOF @@ -23261,7 +23115,7 @@ Index: libffi/configure /* end confdefs.h. */ #include <limits.h> -@@ -12154,20 +14067,51 @@ main () +@@ -12168,20 +14081,51 @@ main () return 0; } _ACEOF @@ -23317,7 +23171,7 @@ Index: libffi/configure /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -@@ -12193,7 +14137,24 @@ return use_ascii (foo) == use_ebcdic (fo +@@ -12207,7 +14151,24 @@ return use_ascii (foo) == use_ebcdic (fo return 0; } _ACEOF @@ -23343,7 +23197,7 @@ Index: libffi/configure if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi -@@ -12205,10 +14166,20 @@ if ac_fn_c_try_compile "$LINENO"; then : +@@ -12219,10 +14180,20 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_bigendian=unknown fi fi @@ -23365,7 +23219,7 @@ Index: libffi/configure /* end confdefs.h. */ $ac_includes_default int -@@ -12228,44 +14199,82 @@ main () +@@ -12242,44 +14213,82 @@ main () return 0; } _ACEOF @@ -23460,7 +23314,7 @@ Index: libffi/configure /* end confdefs.h. */ asm (".cfi_startproc\n\t.cfi_endproc"); int -@@ -12276,26 +14285,49 @@ main () +@@ -12290,26 +14299,49 @@ main () return 0; } _ACEOF @@ -23516,7 +23370,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else -@@ -12303,7 +14335,11 @@ else +@@ -12317,7 +14349,11 @@ else save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS -fpic" LDFLAGS="$LDFLAGS -shared" @@ -23529,7 +23383,7 @@ Index: libffi/configure /* end confdefs.h. */ asm (".text; foo: nop; .data; .align 4; .byte 0; .uaword %r_disp32(foo); .text"); int -@@ -12314,33 +14350,64 @@ main () +@@ -12328,33 +14364,64 @@ main () return 0; } _ACEOF @@ -23603,7 +23457,7 @@ Index: libffi/configure /* end confdefs.h. */ asm (".register %g2, #scratch"); int -@@ -12351,27 +14418,50 @@ main () +@@ -12365,27 +14432,50 @@ main () return 0; } _ACEOF @@ -23660,7 +23514,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else -@@ -12382,18 +14472,20 @@ else +@@ -12396,18 +14486,20 @@ else fi fi @@ -23685,7 +23539,7 @@ Index: libffi/configure $as_echo_n "(cached) " >&6 else -@@ -12410,35 +14502,41 @@ else +@@ -12424,35 +14516,41 @@ else rm -f conftest.* fi @@ -23736,7 +23590,7 @@ Index: libffi/configure if grep '\.hidden.*foo' conftest.s >/dev/null; then libffi_cv_hidden_visibility_attribute=yes fi -@@ -12446,11 +14544,13 @@ else +@@ -12460,11 +14558,13 @@ else rm -f conftest.* fi @@ -23752,7 +23606,7 @@ Index: libffi/configure fi -@@ -12461,41 +14561,50 @@ fi +@@ -12475,41 +14575,50 @@ fi @@ -23811,7 +23665,7 @@ Index: libffi/configure fi fi -@@ -12531,7 +14640,7 @@ ac_config_commands="$ac_config_commands +@@ -12545,7 +14654,7 @@ ac_config_commands="$ac_config_commands ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h" @@ -23820,7 +23674,7 @@ Index: libffi/configure cat >confcache <<\_ACEOF -@@ -12561,13 +14670,13 @@ _ACEOF +@@ -12575,13 +14684,13 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -23836,7 +23690,7 @@ Index: libffi/configure esac ;; esac done -@@ -12575,8 +14684,8 @@ $as_echo "$as_me: WARNING: cache variabl +@@ -12589,8 +14698,8 @@ $as_echo "$as_me: WARNING: cache variabl (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -23847,7 +23701,7 @@ Index: libffi/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -12599,11 +14708,11 @@ $as_echo "$as_me: WARNING: cache variabl +@@ -12613,11 +14722,11 @@ $as_echo "$as_me: WARNING: cache variabl if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -23861,7 +23715,7 @@ Index: libffi/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -12623,8 +14732,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" +@@ -12637,8 +14746,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. @@ -23872,7 +23726,7 @@ Index: libffi/configure done LIBOBJS=$ac_libobjs -@@ -12640,124 +14749,214 @@ else +@@ -12654,128 +14763,221 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -24064,6 +23918,15 @@ Index: libffi/configure +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } fi + if test -z "${AVR32_TRUE}" && test -z "${AVR32_FALSE}"; then +- as_fn_error "conditional \"AVR32\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++ { { $as_echo "$as_me:$LINENO: error: conditional \"AVR32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"AVR32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } + fi if test -z "${LIBFFI_CRIS_TRUE}" && test -z "${LIBFFI_CRIS_FALSE}"; then - as_fn_error "conditional \"LIBFFI_CRIS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -24147,7 +24010,7 @@ Index: libffi/configure fi -@@ -12765,10 +14964,9 @@ fi +@@ -12783,10 +14985,9 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -24160,7 +24023,7 @@ Index: libffi/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -12778,18 +14976,17 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write +@@ -12796,18 +14997,17 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write debug=false ac_cs_recheck=false ac_cs_silent=false @@ -24186,7 +24049,7 @@ Index: libffi/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -12797,15 +14994,23 @@ if test -n "${ZSH_VERSION+set}" && (emul +@@ -12815,15 +15015,23 @@ if test -n "${ZSH_VERSION+set}" && (emul alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -24215,7 +24078,7 @@ Index: libffi/configure as_nl=' ' export as_nl -@@ -12813,13 +15018,7 @@ export as_nl +@@ -12831,13 +15039,7 @@ export as_nl as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -24230,7 +24093,7 @@ Index: libffi/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -12830,7 +15029,7 @@ else +@@ -12848,7 +15050,7 @@ else as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -24239,7 +24102,7 @@ Index: libffi/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -12853,6 +15052,13 @@ if test "${PATH_SEPARATOR+set}" != set; +@@ -12871,6 +15073,13 @@ if test "${PATH_SEPARATOR+set}" != set; } fi @@ -24253,7 +24116,7 @@ Index: libffi/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -12862,15 +15068,15 @@ fi +@@ -12880,15 +15089,15 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -24272,7 +24135,7 @@ Index: libffi/configure IFS=$as_save_IFS ;; -@@ -12882,16 +15088,12 @@ if test "x$as_myself" = x; then +@@ -12900,16 +15109,12 @@ if test "x$as_myself" = x; then fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -24293,7 +24156,7 @@ Index: libffi/configure done PS1='$ ' PS2='> ' -@@ -12903,89 +15105,7 @@ export LC_ALL +@@ -12921,89 +15126,7 @@ export LC_ALL LANGUAGE=C export LANGUAGE @@ -24384,7 +24247,7 @@ Index: libffi/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -12999,12 +15119,8 @@ else +@@ -13017,12 +15140,8 @@ else as_basename=false fi @@ -24398,7 +24261,7 @@ Index: libffi/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -13024,25 +15140,76 @@ $as_echo X/"$0" | +@@ -13042,25 +15161,76 @@ $as_echo X/"$0" | } s/.*/./; q'` @@ -24486,7 +24349,7 @@ Index: libffi/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -13071,56 +15238,8 @@ fi +@@ -13089,56 +15259,8 @@ fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -24544,7 +24407,7 @@ Index: libffi/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -13139,10 +15258,10 @@ else +@@ -13157,10 +15279,10 @@ else if test -d "$1"; then test -d "$1/."; else @@ -24557,7 +24420,7 @@ Index: libffi/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -13157,19 +15276,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr +@@ -13175,19 +15297,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr exec 6>&1 @@ -24575,12 +24438,12 @@ Index: libffi/configure ac_log=" -This file was extended by libffi $as_me 3.0.8, which was -generated by GNU Autoconf 2.64. Invocation command line was -+This file was extended by libffi $as_me 3.0.9rc6, which was ++This file was extended by libffi $as_me 3.0.9rc7, which was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -13202,11 +15315,10 @@ _ACEOF +@@ -13220,11 +15336,10 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -24595,7 +24458,7 @@ Index: libffi/configure -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit -@@ -13231,16 +15343,16 @@ $config_links +@@ -13249,16 +15364,16 @@ $config_links Configuration commands: $config_commands @@ -24607,7 +24470,7 @@ Index: libffi/configure ac_cs_version="\\ -libffi config.status 3.0.8 -configured by $0, generated by GNU Autoconf 2.64, -+libffi config.status 3.0.9rc6 ++libffi config.status 3.0.9rc7 +configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -24616,7 +24479,7 @@ Index: libffi/configure This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -13283,19 +15395,20 @@ do +@@ -13301,19 +15416,20 @@ do case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac @@ -24641,7 +24504,7 @@ Index: libffi/configure --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -13303,10 +15416,11 @@ Try \`$0 --help' for more information."; +@@ -13321,10 +15437,11 @@ Try \`$0 --help' for more information."; ac_cs_silent=: ;; # This is an error. @@ -24656,7 +24519,7 @@ Index: libffi/configure ac_need_defaults=false ;; esac -@@ -13347,20 +15461,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ +@@ -13365,20 +15482,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ # # INIT-COMMANDS # @@ -24677,7 +24540,7 @@ Index: libffi/configure AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -@@ -13371,143 +15471,131 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac +@@ -13389,143 +15492,131 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' @@ -24940,7 +24803,7 @@ Index: libffi/configure GREP \ EGREP \ FGREP \ -@@ -13531,6 +15619,8 @@ lt_cv_sys_global_symbol_pipe \ +@@ -13549,6 +15640,8 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ @@ -24949,7 +24812,7 @@ Index: libffi/configure lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_wl \ lt_prog_compiler_pic \ -@@ -13560,13 +15650,12 @@ variables_saved_for_relink \ +@@ -13578,13 +15671,12 @@ variables_saved_for_relink \ libname_spec \ library_names_spec \ soname_spec \ @@ -24965,7 +24828,7 @@ Index: libffi/configure ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -13593,9 +15682,9 @@ postuninstall_cmds \ +@@ -13611,9 +15703,9 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec; do @@ -24977,7 +24840,7 @@ Index: libffi/configure ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -13603,6 +15692,12 @@ sys_lib_dlsearch_path_spec; do +@@ -13621,6 +15713,12 @@ sys_lib_dlsearch_path_spec; do esac done @@ -24990,7 +24853,7 @@ Index: libffi/configure ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' -@@ -13633,7 +15728,6 @@ for ac_config_target in $ac_config_targe +@@ -13651,7 +15749,6 @@ for ac_config_target in $ac_config_targe do case $ac_config_target in "fficonfig.h") CONFIG_HEADERS="$CONFIG_HEADERS fficonfig.h" ;; @@ -24998,7 +24861,7 @@ Index: libffi/configure "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;; -@@ -13644,8 +15738,11 @@ do +@@ -13662,8 +15759,11 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; @@ -25011,7 +24874,7 @@ Index: libffi/configure esac done -@@ -13673,7 +15770,7 @@ $debug || +@@ -13691,7 +15791,7 @@ $debug || trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -25020,7 +24883,7 @@ Index: libffi/configure } # Create a (secure) tmp directory for tmp files. -@@ -13684,7 +15781,11 @@ $debug || +@@ -13702,7 +15802,11 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -25033,7 +24896,7 @@ Index: libffi/configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -13692,16 +15793,10 @@ $debug || +@@ -13710,16 +15814,10 @@ $debug || if test -n "$CONFIG_FILES"; then @@ -25052,7 +24915,7 @@ Index: libffi/configure else ac_cs_awk_cr=$ac_cr fi -@@ -13715,18 +15810,24 @@ _ACEOF +@@ -13733,18 +15831,24 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -25080,7 +24943,7 @@ Index: libffi/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -13815,7 +15916,9 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n +@@ -13833,7 +15937,9 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ @@ -25091,7 +24954,7 @@ Index: libffi/configure _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -13856,7 +15959,9 @@ for ac_last_try in false false :; do +@@ -13874,7 +15980,9 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then @@ -25102,7 +24965,7 @@ Index: libffi/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -13941,7 +16046,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ +@@ -13959,7 +16067,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -25113,7 +24976,7 @@ Index: libffi/configure fi # test -n "$CONFIG_HEADERS" -@@ -13954,7 +16061,9 @@ do +@@ -13972,7 +16082,9 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -25124,7 +24987,7 @@ Index: libffi/configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -13982,10 +16091,12 @@ do +@@ -14000,10 +16112,12 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -25139,7 +25002,7 @@ Index: libffi/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -13996,7 +16107,7 @@ do +@@ -14014,7 +16128,7 @@ do `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -25148,7 +25011,7 @@ Index: libffi/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -14009,7 +16120,9 @@ $as_echo "$as_me: creating $ac_file" >&6 +@@ -14027,7 +16141,9 @@ $as_echo "$as_me: creating $ac_file" >&6 case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ @@ -25159,7 +25022,7 @@ Index: libffi/configure esac ;; esac -@@ -14037,7 +16150,47 @@ $as_echo X"$ac_file" | +@@ -14055,7 +16171,47 @@ $as_echo X"$ac_file" | q } s/.*/./; q'` @@ -25208,7 +25071,7 @@ Index: libffi/configure ac_builddir=. case "$ac_dir" in -@@ -14094,6 +16247,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri +@@ -14112,6 +16268,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= @@ -25216,7 +25079,7 @@ Index: libffi/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -14103,11 +16257,12 @@ ac_sed_dataroot=' +@@ -14121,11 +16278,12 @@ ac_sed_dataroot=' /@docdir@/p /@infodir@/p /@localedir@/p @@ -25231,7 +25094,7 @@ Index: libffi/configure $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -14117,7 +16272,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ +@@ -14135,7 +16293,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -25240,7 +25103,7 @@ Index: libffi/configure esac _ACEOF -@@ -14146,12 +16301,14 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t +@@ -14164,12 +16322,14 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -25257,7 +25120,7 @@ Index: libffi/configure which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} -@@ -14161,7 +16318,9 @@ which seems to be undefined. Please mak +@@ -14179,7 +16339,9 @@ which seems to be undefined. Please mak -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ @@ -25268,7 +25131,7 @@ Index: libffi/configure ;; :H) # -@@ -14172,19 +16331,25 @@ which seems to be undefined. Please mak +@@ -14190,19 +16352,25 @@ which seems to be undefined. Please mak $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ @@ -25298,7 +25161,7 @@ Index: libffi/configure fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" -@@ -14234,11 +16399,13 @@ $as_echo X"$_am_arg" | +@@ -14252,11 +16420,13 @@ $as_echo X"$_am_arg" | ac_source=$srcdir/$ac_source fi @@ -25314,7 +25177,7 @@ Index: libffi/configure fi rm -f "$ac_file" -@@ -14250,24 +16417,18 @@ $as_echo "$as_me: linking $ac_source to +@@ -14268,24 +16438,18 @@ $as_echo "$as_me: linking $ac_source to ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || ln "$ac_source" "$ac_file" 2>/dev/null || cp -p "$ac_source" "$ac_file" || @@ -25343,7 +25206,7 @@ Index: libffi/configure "depfiles":C) test x"$AMDEP_TRUE" != x"" || { # Autoconf 2.62 quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval -@@ -14356,7 +16517,47 @@ $as_echo X"$file" | +@@ -14374,7 +16538,47 @@ $as_echo X"$file" | q } s/.*/./; q'` @@ -25392,7 +25255,7 @@ Index: libffi/configure # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done -@@ -14384,7 +16585,7 @@ $as_echo X"$file" | +@@ -14402,7 +16606,7 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -25401,7 +25264,7 @@ Index: libffi/configure # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. -@@ -14432,12 +16633,6 @@ pic_mode=$pic_mode +@@ -14450,12 +16654,6 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install @@ -25414,7 +25277,7 @@ Index: libffi/configure # The host system. host_alias=$host_alias host=$host -@@ -14487,6 +16682,10 @@ SP2NL=$lt_lt_SP2NL +@@ -14505,6 +16703,10 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP @@ -25425,7 +25288,7 @@ Index: libffi/configure # An object symbol dumper. OBJDUMP=$lt_OBJDUMP -@@ -14508,9 +16707,6 @@ RANLIB=$lt_RANLIB +@@ -14526,9 +16728,6 @@ RANLIB=$lt_RANLIB old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds @@ -25435,7 +25298,7 @@ Index: libffi/configure # A C compiler. LTCC=$lt_CC -@@ -14532,6 +16728,12 @@ global_symbol_to_c_name_address_lib_pref +@@ -14550,6 +16749,12 @@ global_symbol_to_c_name_address_lib_pref # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -25448,7 +25311,7 @@ Index: libffi/configure # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD -@@ -14594,9 +16796,6 @@ library_names_spec=$lt_library_names_spe +@@ -14612,9 +16817,6 @@ library_names_spec=$lt_library_names_spe # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec @@ -25458,7 +25321,7 @@ Index: libffi/configure # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds -@@ -14636,10 +16835,6 @@ striplib=$lt_striplib +@@ -14654,10 +16856,6 @@ striplib=$lt_striplib # The linker used to build libraries. LD=$lt_LD @@ -25469,7 +25332,7 @@ Index: libffi/configure # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds -@@ -14899,7 +17094,7 @@ _LT_EOF +@@ -14917,7 +17115,7 @@ _LT_EOF func_dirname () { # Extract subdirectory from the argument. @@ -25478,7 +25341,7 @@ Index: libffi/configure if test "X$func_dirname_result" = "X${1}"; then func_dirname_result="${3}" else -@@ -14910,7 +17105,7 @@ func_dirname () +@@ -14928,7 +17126,7 @@ func_dirname () # func_basename file func_basename () { @@ -25487,7 +25350,7 @@ Index: libffi/configure } -@@ -14923,8 +17118,10 @@ func_basename () +@@ -14941,8 +17139,10 @@ func_basename () func_stripname () { case ${2} in @@ -25500,7 +25363,7 @@ Index: libffi/configure esac } -@@ -14935,20 +17132,20 @@ my_sed_long_arg='1s/^-[^=]*=//' +@@ -14953,20 +17153,20 @@ my_sed_long_arg='1s/^-[^=]*=//' # func_opt_split func_opt_split () { @@ -25525,7 +25388,7 @@ Index: libffi/configure } # func_arith arithmetic-term... -@@ -15012,12 +17209,15 @@ test -d src/$TARGETDIR || mkdir src/$TAR +@@ -15030,12 +17230,15 @@ test -d src/$TARGETDIR || mkdir src/$TAR done # for ac_tag @@ -25543,7 +25406,7 @@ Index: libffi/configure # configure is writing to config.log, and then calls config.status. -@@ -15038,10 +17238,10 @@ if test "$no_create" != yes; then +@@ -15056,10 +17259,10 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -25567,7 +25430,7 @@ Index: libffi/configure.ac +AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.8], [http://gcc.gnu.org/bugs.html]) -+AC_INIT([libffi], [3.0.9rc6], [http://gcc.gnu.org/bugs.html]) ++AC_INIT([libffi], [3.0.9rc7], [http://gcc.gnu.org/bugs.html]) AC_CONFIG_HEADERS([fficonfig.h]) -AM_ENABLE_MULTILIB(, ..) @@ -25601,8 +25464,8 @@ Index: libffi/configure.ac + TARGET=X86_64; TARGETDIR=x86 ;; - cris-*-*) -@@ -381,6 +384,6 @@ test -d src/$TARGETDIR || mkdir src/$TAR + avr32*-*-*) +@@ -386,6 +389,6 @@ test -d src/$TARGETDIR || mkdir src/$TAR AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h) @@ -26226,7 +26089,7 @@ Index: libffi/include/Makefile.in CONFIG_HEADER = $(top_builddir)/fficonfig.h CONFIG_CLEAN_FILES = ffi.h ffitarget.h CONFIG_CLEAN_VPATH_FILES = -@@ -76,14 +70,15 @@ am__nobase_list = $(am__nobase_strip_set +@@ -76,8 +70,8 @@ am__nobase_list = $(am__nobase_strip_set am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' @@ -26237,14 +26100,7 @@ Index: libffi/include/Makefile.in ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ -+AM_LTLDFLAGS = @AM_LTLDFLAGS@ - AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ -@@ -138,7 +133,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -138,7 +132,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -26252,7 +26108,7 @@ Index: libffi/include/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -@@ -185,9 +179,9 @@ libdir = @libdir@ +@@ -185,9 +178,9 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -26263,7 +26119,7 @@ Index: libffi/include/Makefile.in oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ -@@ -210,11 +204,8 @@ top_srcdir = @top_srcdir@ +@@ -210,11 +203,8 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign DISTCLEANFILES = ffitarget.h EXTRA_DIST = ffi.h.in ffi_common.h @@ -26277,7 +26133,7 @@ Index: libffi/include/Makefile.in all: all-am .SUFFIXES: -@@ -256,26 +247,26 @@ mostlyclean-libtool: +@@ -256,26 +246,26 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -26313,7 +26169,7 @@ Index: libffi/include/Makefile.in ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -@@ -363,7 +354,7 @@ check-am: all-am +@@ -363,7 +353,7 @@ check-am: all-am check: check-am all-am: Makefile $(HEADERS) installdirs: @@ -26322,7 +26178,7 @@ Index: libffi/include/Makefile.in test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -412,7 +403,7 @@ info: info-am +@@ -412,7 +402,7 @@ info: info-am info-am: @@ -26331,7 +26187,7 @@ Index: libffi/include/Makefile.in install-dvi: install-dvi-am -@@ -456,7 +447,7 @@ ps: ps-am +@@ -456,7 +446,7 @@ ps: ps-am ps-am: @@ -26340,7 +26196,7 @@ Index: libffi/include/Makefile.in .MAKE: install-am install-strip -@@ -466,13 +457,12 @@ uninstall-am: uninstall-toollibffiHEADER +@@ -466,13 +456,12 @@ uninstall-am: uninstall-toollibffiHEADER html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ @@ -35172,15 +35028,7 @@ Index: libffi/man/Makefile.in CONFIG_HEADER = $(top_builddir)/fficonfig.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -82,6 +76,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE - ACLOCAL = @ACLOCAL@ - ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ -+AM_LTLDFLAGS = @AM_LTLDFLAGS@ - AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ -@@ -136,7 +131,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -136,7 +130,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -35188,7 +35036,7 @@ Index: libffi/man/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -@@ -183,9 +177,9 @@ libdir = @libdir@ +@@ -183,9 +176,9 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -35794,15 +35642,7 @@ Index: libffi/testsuite/Makefile.in CONFIG_HEADER = $(top_builddir)/fficonfig.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -@@ -59,6 +53,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE - ACLOCAL = @ACLOCAL@ - ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ -+AM_LTLDFLAGS = @AM_LTLDFLAGS@ - AM_RUNTESTFLAGS = - AR = @AR@ - AUTOCONF = @AUTOCONF@ -@@ -113,7 +108,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -113,7 +107,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -35810,7 +35650,7 @@ Index: libffi/testsuite/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ -@@ -160,9 +154,9 @@ libdir = @libdir@ +@@ -160,9 +153,9 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -35821,7 +35661,7 @@ Index: libffi/testsuite/Makefile.in oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ -@@ -194,6 +188,70 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja +@@ -194,6 +187,70 @@ RUNTEST = `if [ -f $(top_srcdir)/../deja else echo runtest; fi` CLEANFILES = *.exe core* *.log *.sum diff --git a/src/.svn/entries b/src/.svn/entries index 1e70c89..b9d5721 100644 --- a/src/.svn/entries +++ b/src/.svn/entries @@ -1,15 +1,15 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src svn+ssh://green@gcc.gnu.org/svn/gcc -2009-12-14T02:42:18.232982Z -155205 -danglin +2009-12-26T04:59:25.888276Z +155470 +green @@ -118,6 +118,9 @@ aph frv dir +avr32 +dir + s390 dir diff --git a/src/alpha/.svn/entries b/src/alpha/.svn/entries index bac3892..b281e72 100644 --- a/src/alpha/.svn/entries +++ b/src/alpha/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/alpha svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/arm/.svn/entries b/src/arm/.svn/entries index 0ebf9f8..ecf1c54 100644 --- a/src/arm/.svn/entries +++ b/src/arm/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/arm svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/avr32/.svn/entries b/src/avr32/.svn/entries new file mode 100644 index 0000000..93bffc4 --- /dev/null +++ b/src/avr32/.svn/entries @@ -0,0 +1,130 @@ +10 + +dir +155472 +svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/avr32 +svn+ssh://green@gcc.gnu.org/svn/gcc + + + +2009-12-26T04:21:07.255800Z +155469 +green + + + + + + + + + + + + + + +138bc75d-0d04-0410-961f-82ee72b054a4 + +ffitarget.h +file + + + + +2009-12-26T03:57:14.102225Z +97c80ed302cb9613e2e501a162651ea7 +2009-12-26T04:21:07.255800Z +155469 +green + + + + + + + + + + + + + + + + + + + + + +1823 + +ffi.c +file + + + + +2009-12-26T03:57:14.066978Z +9ee26077d6b37d391bb6275be0437144 +2009-12-26T04:21:07.255800Z +155469 +green + + + + + + + + + + + + + + + + + + + + + +12330 + +sysv.S +file + + + + +2009-12-26T03:57:14.102225Z +808bd4aa64c30850292f3ffe35d19ea5 +2009-12-26T04:21:07.255800Z +155469 +green + + + + + + + + + + + + + + + + + + + + + +4840 + diff --git a/src/avr32/.svn/text-base/ffi.c.svn-base b/src/avr32/.svn/text-base/ffi.c.svn-base new file mode 100644 index 0000000..39fba2b --- /dev/null +++ b/src/avr32/.svn/text-base/ffi.c.svn-base @@ -0,0 +1,421 @@ +/* ----------------------------------------------------------------------- + ffi.c - Copyright (c) 2009 Bradley Smith <brad@brad-smith.co.uk> + + AVR32 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> +#include <unistd.h> +#include <asm/unistd.h> + +/* #define DEBUG */ + +extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, + unsigned int, unsigned int, unsigned int*, unsigned int, + void (*fn)(void)); +extern void ffi_closure_SYSV (ffi_closure *); + +unsigned int pass_struct_on_stack(ffi_type *type) +{ + if(type->type != FFI_TYPE_STRUCT) + return 0; + + if(type->alignment < type->size && + !(type->size == 4 || type->size == 8) && + !(type->size == 8 && type->alignment >= 4)) + return 1; + + if(type->size == 3 || type->size == 5 || type->size == 6 || + type->size == 7) + return 1; + + return 0; +} + +/* ffi_prep_args is called by the assembly routine once stack space + * has been allocated for the function's arguments + * + * This is annoyingly complex since we need to keep track of used + * registers. + */ + +void ffi_prep_args(char *stack, extended_cif *ecif) +{ + unsigned int i; + void **p_argv; + ffi_type **p_arg; + char *reg_base = stack; + char *stack_base = stack + 20; + unsigned int stack_offset = 0; + unsigned int reg_mask = 0; + + p_argv = ecif->avalue; + + /* If cif->flags is struct then we know it's not passed in registers */ + if(ecif->cif->flags == FFI_TYPE_STRUCT) + { + *(void**)reg_base = ecif->rvalue; + reg_mask |= 1; + } + + for(i = 0, p_arg = ecif->cif->arg_types; i < ecif->cif->nargs; + i++, p_arg++) + { + size_t z = (*p_arg)->size; + int alignment = (*p_arg)->alignment; + int type = (*p_arg)->type; + char *addr = 0; + + if(z % 4 != 0) + z += (4 - z % 4); + + if(reg_mask != 0x1f) + { + if(pass_struct_on_stack(*p_arg)) + { + addr = stack_base + stack_offset; + stack_offset += z; + } + else if(z == sizeof(int)) + { + char index = 0; + + while((reg_mask >> index) & 1) + index++; + + addr = reg_base + (index * 4); + reg_mask |= (1 << index); + } + else if(z == 2 * sizeof(int)) + { + if(!((reg_mask >> 1) & 1)) + { + addr = reg_base + 4; + reg_mask |= (3 << 1); + } + else if(!((reg_mask >> 3) & 1)) + { + addr = reg_base + 12; + reg_mask |= (3 << 3); + } + } + } + + if(!addr) + { + addr = stack_base + stack_offset; + stack_offset += z; + } + + if(type == FFI_TYPE_STRUCT && (*p_arg)->elements[1] == NULL) + type = (*p_arg)->elements[0]->type; + + switch(type) + { + case FFI_TYPE_UINT8: + *(unsigned int *)addr = (unsigned int)*(UINT8 *)(*p_argv); + break; + case FFI_TYPE_SINT8: + *(signed int *)addr = (signed int)*(SINT8 *)(*p_argv); + break; + case FFI_TYPE_UINT16: + *(unsigned int *)addr = (unsigned int)*(UINT16 *)(*p_argv); + break; + case FFI_TYPE_SINT16: + *(signed int *)addr = (signed int)*(SINT16 *)(*p_argv); + break; + default: + memcpy(addr, *p_argv, z); + } + + p_argv++; + } + +#ifdef DEBUG + /* Debugging */ + for(i = 0; i < 5; i++) + { + if((reg_mask & (1 << i)) == 0) + printf("r%d: (unused)\n", 12 - i); + else + printf("r%d: 0x%08x\n", 12 - i, ((unsigned int*)reg_base)[i]); + } + + for(i = 0; i < stack_offset / 4; i++) + { + printf("sp+%d: 0x%08x\n", i*4, ((unsigned int*)stack_base)[i]); + } +#endif +} + +/* Perform machine dependent cif processing */ +ffi_status ffi_prep_cif_machdep(ffi_cif *cif) +{ + /* Round the stack up to a multiple of 8 bytes. This isn't needed + * everywhere, but it is on some platforms, and it doesn't harm + * anything when it isn't needed. */ + cif->bytes = (cif->bytes + 7) & ~7; + + /* Flag to indicate that he return value is in fact a struct */ + cif->rstruct_flag = 0; + + /* Set the return type flag */ + switch(cif->rtype->type) + { + case FFI_TYPE_SINT8: + case FFI_TYPE_UINT8: + cif->flags = (unsigned)FFI_TYPE_UINT8; + break; + case FFI_TYPE_SINT16: + case FFI_TYPE_UINT16: + cif->flags = (unsigned)FFI_TYPE_UINT16; + break; + case FFI_TYPE_FLOAT: + case FFI_TYPE_SINT32: + case FFI_TYPE_UINT32: + case FFI_TYPE_POINTER: + cif->flags = (unsigned)FFI_TYPE_UINT32; + break; + case FFI_TYPE_DOUBLE: + case FFI_TYPE_SINT64: + case FFI_TYPE_UINT64: + cif->flags = (unsigned)FFI_TYPE_UINT64; + break; + case FFI_TYPE_STRUCT: + cif->rstruct_flag = 1; + if(!pass_struct_on_stack(cif->rtype)) + { + if(cif->rtype->size <= 1) + cif->flags = (unsigned)FFI_TYPE_UINT8; + else if(cif->rtype->size <= 2) + cif->flags = (unsigned)FFI_TYPE_UINT16; + else if(cif->rtype->size <= 4) + cif->flags = (unsigned)FFI_TYPE_UINT32; + else if(cif->rtype->size <= 8) + cif->flags = (unsigned)FFI_TYPE_UINT64; + else + cif->flags = (unsigned)cif->rtype->type; + } + else + cif->flags = (unsigned)cif->rtype->type; + break; + default: + cif->flags = (unsigned)cif->rtype->type; + break; + } + + return FFI_OK; +} + +void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue) +{ + extended_cif ecif; + + unsigned int size = 0, i = 0; + ffi_type **p_arg; + + ecif.cif = cif; + ecif.avalue = avalue; + + for(i = 0, p_arg = cif->arg_types; i < cif->nargs; i++, p_arg++) + size += (*p_arg)->size + (4 - (*p_arg)->size % 4); + + /* If the return value is a struct and we don't have a return value + * address then we need to make one */ + + /* If cif->flags is struct then it's not suitable for registers */ + if((rvalue == NULL) && (cif->flags == FFI_TYPE_STRUCT)) + ecif.rvalue = alloca(cif->rtype->size); + else + ecif.rvalue = rvalue; + + switch(cif->abi) + { + case FFI_SYSV: + ffi_call_SYSV(ffi_prep_args, &ecif, size, cif->flags, + ecif.rvalue, cif->rstruct_flag, fn); + break; + default: + FFI_ASSERT(0); + break; + } +} + +static void ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, + void **avalue, ffi_cif *cif) +{ + register unsigned int i, reg_mask = 0; + register void **p_argv; + register ffi_type **p_arg; + register char *reg_base = stack; + register char *stack_base = stack + 20; + register unsigned int stack_offset = 0; + +#ifdef DEBUG + /* Debugging */ + for(i = 0; i < cif->nargs + 7; i++) + { + printf("sp+%d: 0x%08x\n", i*4, ((unsigned int*)stack)[i]); + } +#endif + + /* If cif->flags is struct then we know it's not passed in registers */ + if(cif->flags == FFI_TYPE_STRUCT) + { + *rvalue = *(void **)reg_base; + reg_mask |= 1; + } + + p_argv = avalue; + + for(i = 0, p_arg = cif->arg_types; i < cif->nargs; i++, p_arg++) + { + size_t z = (*p_arg)->size; + int alignment = (*p_arg)->alignment; + + *p_argv = 0; + + if(z % 4 != 0) + z += (4 - z % 4); + + if(reg_mask != 0x1f) + { + if(pass_struct_on_stack(*p_arg)) + { + *p_argv = (void*)stack_base + stack_offset; + stack_offset += z; + } + else if(z <= sizeof(int)) + { + char index = 0; + + while((reg_mask >> index) & 1) + index++; + + *p_argv = (void*)reg_base + (index * 4); + reg_mask |= (1 << index); + } + else if(z == 2 * sizeof(int)) + { + if(!((reg_mask >> 1) & 1)) + { + *p_argv = (void*)reg_base + 4; + reg_mask |= (3 << 1); + } + else if(!((reg_mask >> 3) & 1)) + { + *p_argv = (void*)reg_base + 12; + reg_mask |= (3 << 3); + } + } + } + + if(!*p_argv) + { + *p_argv = (void*)stack_base + stack_offset; + stack_offset += z; + } + + if((*p_arg)->type != FFI_TYPE_STRUCT || + (*p_arg)->elements[1] == NULL) + { + if(alignment == 1) + **(unsigned int**)p_argv <<= 24; + else if(alignment == 2) + **(unsigned int**)p_argv <<= 16; + } + + p_argv++; + } + +#ifdef DEBUG + /* Debugging */ + for(i = 0; i < cif->nargs; i++) + { + printf("sp+%d: 0x%08x\n", i*4, *(((unsigned int**)avalue)[i])); + } +#endif +} + +/* This function is jumped to by the trampoline */ + +unsigned int ffi_closure_SYSV_inner(ffi_closure *closure, void **respp, + void *args) +{ + ffi_cif *cif; + void **arg_area; + unsigned int i, size = 0; + ffi_type **p_arg; + + cif = closure->cif; + + for(i = 0, p_arg = cif->arg_types; i < cif->nargs; i++, p_arg++) + size += (*p_arg)->size + (4 - (*p_arg)->size % 4); + + arg_area = (void **)alloca(size); + + /* this call will initialize ARG_AREA, such that each element in that + * array points to the corresponding value on the stack; and if the + * function returns a structure, it will re-set RESP to point to the + * structure return address. */ + + ffi_prep_incoming_args_SYSV(args, respp, arg_area, cif); + + (closure->fun)(cif, *respp, arg_area, closure->user_data); + + return cif->flags; +} + +ffi_status ffi_prep_closure_loc(ffi_closure* closure, ffi_cif* cif, + void (*fun)(ffi_cif*, void*, void**, void*), void *user_data, + void *codeloc) +{ + FFI_ASSERT(cif->abi == FFI_SYSV); + + unsigned char *__tramp = (unsigned char*)(&closure->tramp[0]); + unsigned int __fun = (unsigned int)(&ffi_closure_SYSV); + unsigned int __ctx = (unsigned int)(codeloc); + unsigned int __rstruct_flag = (unsigned int)(cif->rstruct_flag); + unsigned int __inner = (unsigned int)(&ffi_closure_SYSV_inner); + *(unsigned int*) &__tramp[0] = 0xebcd1f00; /* pushm r8-r12 */ + *(unsigned int*) &__tramp[4] = 0xfefc0010; /* ld.w r12, pc[16] */ + *(unsigned int*) &__tramp[8] = 0xfefb0010; /* ld.w r11, pc[16] */ + *(unsigned int*) &__tramp[12] = 0xfefa0010; /* ld.w r10, pc[16] */ + *(unsigned int*) &__tramp[16] = 0xfeff0010; /* ld.w pc, pc[16] */ + *(unsigned int*) &__tramp[20] = __ctx; + *(unsigned int*) &__tramp[24] = __rstruct_flag; + *(unsigned int*) &__tramp[28] = __inner; + *(unsigned int*) &__tramp[32] = __fun; + syscall(__NR_cacheflush, 0, (&__tramp[0]), 36); + + closure->cif = cif; + closure->user_data = user_data; + closure->fun = fun; + + return FFI_OK; +} + diff --git a/src/avr32/.svn/text-base/ffitarget.h.svn-base b/src/avr32/.svn/text-base/ffitarget.h.svn-base new file mode 100644 index 0000000..1c799b1 --- /dev/null +++ b/src/avr32/.svn/text-base/ffitarget.h.svn-base @@ -0,0 +1,50 @@ +/* -----------------------------------------------------------------*-C-*- + ffitarget.h - Copyright (c) 2009 Bradley Smith <brad@brad-smith.co.uk> + Target configuration macros for AVR32. + + 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_DEFAULT_ABI = FFI_SYSV, + FFI_LAST_ABI = FFI_DEFAULT_ABI + 1 +} ffi_abi; +#endif + +#define FFI_EXTRA_CIF_FIELDS unsigned int rstruct_flag + +/* Definitions for closures */ + +#define FFI_CLOSURES 1 +#define FFI_TRAMPOLINE_SIZE 36 +#define FFI_NATIVE_RAW_API 0 + +#endif diff --git a/src/avr32/.svn/text-base/sysv.S.svn-base b/src/avr32/.svn/text-base/sysv.S.svn-base new file mode 100644 index 0000000..a984b3c --- /dev/null +++ b/src/avr32/.svn/text-base/sysv.S.svn-base @@ -0,0 +1,208 @@ +/* ----------------------------------------------------------------------- + sysv.S - Copyright (c) 2009 Bradley Smith <brad@brad-smith.co.uk> + + AVR32 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> + + /* r12: ffi_prep_args + * r11: &ecif + * r10: size + * r9: cif->flags + * r8: ecif.rvalue + * sp+0: cif->rstruct_flag + * sp+4: fn */ + + .text + .align 1 + .globl ffi_call_SYSV + .type ffi_call_SYSV, @function +ffi_call_SYSV: + stm --sp, r0,r1,lr + stm --sp, r8-r12 + mov r0, sp + + /* Make room for all of the new args. */ + sub sp, r10 + /* Pad to make way for potential skipped registers */ + sub sp, 20 + + /* Call ffi_prep_args(stack, &ecif). */ + /* r11 already set */ + mov r1, r12 + mov r12, sp + icall r1 + + /* Save new argument size */ + mov r1, r12 + + /* Move first 5 parameters in registers. */ + ldm sp++, r8-r12 + + /* call (fn) (...). */ + ld.w r1, r0[36] + icall r1 + + /* Remove the space we pushed for the args. */ + mov sp, r0 + + /* Load r1 with the rstruct flag. */ + ld.w r1, sp[32] + + /* Load r9 with the return type code. */ + ld.w r9, sp[12] + + /* Load r8 with the return value pointer. */ + ld.w r8, sp[16] + + /* If the return value pointer is NULL, assume no return value. */ + cp.w r8, 0 + breq .Lend + + /* Check if return type is actually a struct */ + cp.w r1, 0 + breq 1f + + /* Return 8bit */ + cp.w r9, FFI_TYPE_UINT8 + breq .Lstore8 + + /* Return 16bit */ + cp.w r9, FFI_TYPE_UINT16 + breq .Lstore16 + +1: + /* Return 32bit */ + cp.w r9, FFI_TYPE_UINT32 + breq .Lstore32 + cp.w r9, FFI_TYPE_UINT16 + breq .Lstore32 + cp.w r9, FFI_TYPE_UINT8 + breq .Lstore32 + + /* Return 64bit */ + cp.w r9, FFI_TYPE_UINT64 + breq .Lstore64 + + /* Didn't match anything */ + bral .Lend + +.Lstore64: + st.w r8[0], r11 + st.w r8[4], r10 + bral .Lend + +.Lstore32: + st.w r8[0], r12 + bral .Lend + +.Lstore16: + st.h r8[0], r12 + bral .Lend + +.Lstore8: + st.b r8[0], r12 + bral .Lend + +.Lend: + sub sp, -20 + ldm sp++, r0,r1,pc + + .size ffi_call_SYSV, . - ffi_call_SYSV + + + /* r12: __ctx + * r11: __rstruct_flag + * r10: __inner */ + + .align 1 + .globl ffi_closure_SYSV + .type ffi_closure_SYSV, @function +ffi_closure_SYSV: + stm --sp, r0,lr + mov r0, r11 + mov r8, r10 + sub r10, sp, -8 + sub sp, 12 + st.w sp[8], sp + sub r11, sp, -8 + icall r8 + + /* Check if return type is actually a struct */ + cp.w r0, 0 + breq 1f + + /* Return 8bit */ + cp.w r12, FFI_TYPE_UINT8 + breq .Lget8 + + /* Return 16bit */ + cp.w r12, FFI_TYPE_UINT16 + breq .Lget16 + +1: + /* Return 32bit */ + cp.w r12, FFI_TYPE_UINT32 + breq .Lget32 + cp.w r12, FFI_TYPE_UINT16 + breq .Lget32 + cp.w r12, FFI_TYPE_UINT8 + breq .Lget32 + + /* Return 64bit */ + cp.w r12, FFI_TYPE_UINT64 + breq .Lget64 + + /* Didn't match anything */ + bral .Lclend + +.Lget64: + ld.w r11, sp[0] + ld.w r10, sp[4] + bral .Lclend + +.Lget32: + ld.w r12, sp[0] + bral .Lclend + +.Lget16: + ld.uh r12, sp[0] + bral .Lclend + +.Lget8: + ld.ub r12, sp[0] + bral .Lclend + +.Lclend: + sub sp, -12 + ldm sp++, r0,lr + sub sp, -20 + mov pc, lr + + .size ffi_closure_SYSV, . - ffi_closure_SYSV + +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif diff --git a/src/cris/.svn/entries b/src/cris/.svn/entries index 699b0cb..9c3fefa 100644 --- a/src/cris/.svn/entries +++ b/src/cris/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/cris svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/frv/.svn/entries b/src/frv/.svn/entries index d038e03..c1f8f47 100644 --- a/src/frv/.svn/entries +++ b/src/frv/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/frv svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/ia64/.svn/entries b/src/ia64/.svn/entries index d2f8b91..c1f48d0 100644 --- a/src/ia64/.svn/entries +++ b/src/ia64/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/ia64 svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/m32r/.svn/entries b/src/m32r/.svn/entries index b91893d..c1b1489 100644 --- a/src/m32r/.svn/entries +++ b/src/m32r/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/m32r svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/m68k/.svn/entries b/src/m68k/.svn/entries index d6d99a2..ca61271 100644 --- a/src/m68k/.svn/entries +++ b/src/m68k/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/m68k svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/mips/.svn/entries b/src/mips/.svn/entries index c929ed7..10692d9 100644 --- a/src/mips/.svn/entries +++ b/src/mips/.svn/entries @@ -1,15 +1,15 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/mips svn+ssh://green@gcc.gnu.org/svn/gcc -2009-09-15T17:15:33.045042Z -151726 -daney +2009-12-26T04:59:25.888276Z +155470 +green @@ -32,11 +32,11 @@ file -2009-12-20T06:01:55.707555Z -fdf13476bd3e53815092fde3494d8fc9 -2009-09-15T17:15:33.045042Z -151726 -daney +2009-12-26T04:53:55.604975Z +a48654d49076d07b6bc757bfa1c81c94 +2009-12-26T04:59:25.888276Z +155470 +green @@ -58,7 +58,7 @@ daney -5878 +6205 n32.S file @@ -66,11 +66,11 @@ file -2009-12-20T06:01:55.708555Z -142328c284156e2c2ea05bbcbf19a163 -2009-09-15T17:15:33.045042Z -151726 -daney +2009-12-26T04:53:55.605975Z +673e7f68577075b8b9f6a9da7fc13913 +2009-12-26T04:59:25.888276Z +155470 +green @@ -92,7 +92,7 @@ daney -14437 +14490 o32.S file @@ -134,11 +134,11 @@ file -2009-12-20T06:01:55.709555Z -8ab6839e93489a8417539b6953934de1 -2009-09-15T17:15:33.045042Z -151726 -daney +2009-12-26T04:53:55.604975Z +d86a1ed07159fae7554dcb68210ad136 +2009-12-26T04:59:25.888276Z +155470 +green @@ -160,5 +160,5 @@ daney -25747 +26147 diff --git a/src/mips/.svn/text-base/ffi.c.svn-base b/src/mips/.svn/text-base/ffi.c.svn-base index 3143dcf..d714cc9 100644 --- a/src/mips/.svn/text-base/ffi.c.svn-base +++ b/src/mips/.svn/text-base/ffi.c.svn-base @@ -625,7 +625,7 @@ void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue) { rvalue_copy = alloca (8); copy_rvalue = 1; -#ifdef __MIPSEB__ +#if defined(__MIPSEB__) || defined(_MIPSEB) copy_offset = 4; #endif } @@ -772,9 +772,10 @@ ffi_closure_mips_inner_O32 (ffi_closure *closure, { if (i < 2 && !seen_int && (arg_types[i]->type == FFI_TYPE_FLOAT || - arg_types[i]->type == FFI_TYPE_DOUBLE)) + arg_types[i]->type == FFI_TYPE_DOUBLE || + arg_types[i]->type == FFI_TYPE_LONGDOUBLE)) { -#ifdef __MIPSEB__ +#if defined(__MIPSEB__) || defined(_MIPSEB) if (arg_types[i]->type == FFI_TYPE_FLOAT) avaluep[i] = ((char *) &fpr[i]) + sizeof (float); else @@ -931,10 +932,16 @@ ffi_closure_mips_inner_N32 (ffi_closure *closure, while (i < avn) { if (arg_types[i]->type == FFI_TYPE_FLOAT - || arg_types[i]->type == FFI_TYPE_DOUBLE) + || arg_types[i]->type == FFI_TYPE_DOUBLE + || arg_types[i]->type == FFI_TYPE_LONGDOUBLE) { argp = (argn >= 8 || soft_float) ? ar + argn : fpr + argn; -#ifdef __MIPSEB__ + if ((arg_types[i]->type == FFI_TYPE_LONGDOUBLE) && ((unsigned)argp & (arg_types[i]->alignment-1))) + { + argp=(ffi_arg*)ALIGN(argp,arg_types[i]->alignment); + argn++; + } +#if defined(__MIPSEB__) || defined(_MIPSEB) if (arg_types[i]->type == FFI_TYPE_FLOAT && argn < 8) avaluep[i] = ((char *) argp) + sizeof (float); else diff --git a/src/mips/.svn/text-base/ffitarget.h.svn-base b/src/mips/.svn/text-base/ffitarget.h.svn-base index dd3fe73..c5f4e05 100644 --- a/src/mips/.svn/text-base/ffitarget.h.svn-base +++ b/src/mips/.svn/text-base/ffitarget.h.svn-base @@ -28,7 +28,10 @@ #define LIBFFI_TARGET_H #ifdef linux -#include <asm/sgidefs.h> +# include <asm/sgidefs.h> +#else +# include <sgidefs.h> +#endif # ifndef _ABIN32 # define _ABIN32 _MIPS_SIM_NABI32 # endif @@ -38,7 +41,6 @@ # ifndef _ABIO32 # define _ABIO32 _MIPS_SIM_ABI32 # endif -#endif #if !defined(_MIPS_SIM) -- something is very wrong -- @@ -154,7 +156,8 @@ # endif /* _MIPS_SIM==_ABI64 */ #endif /* !FFI_MIPS_O32 */ #else /* !LIBFFI_ASM */ -#ifdef FFI_MIPS_O32 +# ifdef __GNUC__ +# ifdef FFI_MIPS_O32 /* O32 stack frames have 32bit integer args */ typedef unsigned int ffi_arg __attribute__((__mode__(__SI__))); typedef signed int ffi_sarg __attribute__((__mode__(__SI__))); @@ -162,7 +165,18 @@ typedef signed int ffi_sarg __attribute__((__mode__(__SI__))); /* N32 and N64 frames have 64bit integer args */ typedef unsigned int ffi_arg __attribute__((__mode__(__DI__))); typedef signed int ffi_sarg __attribute__((__mode__(__DI__))); -#endif +# endif +# else +# ifdef FFI_MIPS_O32 +/* O32 stack frames have 32bit integer args */ +typedef __uint32_t ffi_arg; +typedef __int32_t ffi_sarg; +# else +/* N32 and N64 frames have 64bit integer args */ +typedef __uint64_t ffi_arg; +typedef __int64_t ffi_sarg; +# endif +# endif /* __GNUC__ */ typedef enum ffi_abi { FFI_FIRST_ABI = 0, diff --git a/src/mips/.svn/text-base/n32.S.svn-base b/src/mips/.svn/text-base/n32.S.svn-base index 6f0f4c6..81e81bc 100644 --- a/src/mips/.svn/text-base/n32.S.svn-base +++ b/src/mips/.svn/text-base/n32.S.svn-base @@ -40,7 +40,9 @@ #define SIZEOF_FRAME ( 8 * FFI_SIZEOF_ARG ) +#ifdef linux .abicalls +#endif .text .align 2 .globl ffi_call_N32 @@ -527,6 +529,7 @@ cls_epilogue: .LFE2: .end ffi_closure_N32 +#ifdef linux .section .eh_frame,"aw",@progbits .Lframe1: .4byte .LECIE1-.LSCIE1 # length @@ -583,5 +586,6 @@ cls_epilogue: .uleb128 (SIZEOF_FRAME2 - RA_OFF2)/4 .align EH_FRAME_ALIGN .LEFDE3: +#endif /* linux */ #endif diff --git a/src/pa/.svn/entries b/src/pa/.svn/entries index 9476278..c98c10c 100644 --- a/src/pa/.svn/entries +++ b/src/pa/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/pa svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/powerpc/.svn/entries b/src/powerpc/.svn/entries index 142c2d3..1f52202 100644 --- a/src/powerpc/.svn/entries +++ b/src/powerpc/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/powerpc svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/s390/.svn/entries b/src/s390/.svn/entries index 3d007ae..014d10c 100644 --- a/src/s390/.svn/entries +++ b/src/s390/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/s390 svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/sh/.svn/entries b/src/sh/.svn/entries index e3fde24..6ff1c7b 100644 --- a/src/sh/.svn/entries +++ b/src/sh/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sh svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/sh64/.svn/entries b/src/sh64/.svn/entries index 3e18a4f..b0be66c 100644 --- a/src/sh64/.svn/entries +++ b/src/sh64/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sh64 svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/sparc/.svn/entries b/src/sparc/.svn/entries index bb12126..086bf61 100644 --- a/src/sparc/.svn/entries +++ b/src/sparc/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/sparc svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/src/x86/.svn/entries b/src/x86/.svn/entries index 096115b..1d986af 100644 --- a/src/x86/.svn/entries +++ b/src/x86/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/src/x86 svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/testsuite/.svn/entries b/testsuite/.svn/entries index 2100c42..1d3bf30 100644 --- a/testsuite/.svn/entries +++ b/testsuite/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite svn+ssh://green@gcc.gnu.org/svn/gcc @@ -32,7 +32,7 @@ file -2009-12-20T06:01:58.004568Z +2009-12-26T04:20:27.164225Z df80bf4b915a2a2ea84b85d1004cd2b6 2009-12-05T17:18:53.298892Z 155012 diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index a954696..698c461 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -53,7 +53,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMTAR = @AMTAR@ -AM_LTLDFLAGS = @AM_LTLDFLAGS@ AM_RUNTESTFLAGS = AR = @AR@ AUTOCONF = @AUTOCONF@ diff --git a/testsuite/config/.svn/entries b/testsuite/config/.svn/entries index dff40c7..11125ab 100644 --- a/testsuite/config/.svn/entries +++ b/testsuite/config/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/config svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/testsuite/lib/.svn/entries b/testsuite/lib/.svn/entries index 97579b7..acd42b9 100644 --- a/testsuite/lib/.svn/entries +++ b/testsuite/lib/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/lib svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/testsuite/libffi.call/.svn/entries b/testsuite/libffi.call/.svn/entries index ad267ff..b3073d8 100644 --- a/testsuite/libffi.call/.svn/entries +++ b/testsuite/libffi.call/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/libffi.call svn+ssh://green@gcc.gnu.org/svn/gcc diff --git a/testsuite/libffi.call/cls_double_va.c b/testsuite/libffi.call/cls_double_va.c index dfbfd1e..45ce9bd 100644 --- a/testsuite/libffi.call/cls_double_va.c +++ b/testsuite/libffi.call/cls_double_va.c @@ -4,7 +4,7 @@ PR: none. Originator: Blake Chaffin 6/6/2007 */ -/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */ +/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */ #include "ffitest.h" static void diff --git a/testsuite/libffi.call/cls_longdouble.c b/testsuite/libffi.call/cls_longdouble.c index 52af6cf..2f50b36 100644 --- a/testsuite/libffi.call/cls_longdouble.c +++ b/testsuite/libffi.call/cls_longdouble.c @@ -5,7 +5,7 @@ Originator: Blake Chaffin */ /* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */ -/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */ +/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */ /* { dg-options -mlong-double-128 { target powerpc64*-*-* } } */ /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */ diff --git a/testsuite/libffi.call/cls_longdouble_va.c b/testsuite/libffi.call/cls_longdouble_va.c index a72944b..4914f32 100644 --- a/testsuite/libffi.call/cls_longdouble_va.c +++ b/testsuite/libffi.call/cls_longdouble_va.c @@ -4,7 +4,7 @@ PR: none. Originator: Blake Chaffin 6/6/2007 */ -/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */ +/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */ /* { dg-output "" { xfail x86_64-*-mingw* } } */ #include "ffitest.h" diff --git a/testsuite/libffi.call/cls_pointer.c b/testsuite/libffi.call/cls_pointer.c index 651a003..34e4209 100644 --- a/testsuite/libffi.call/cls_pointer.c +++ b/testsuite/libffi.call/cls_pointer.c @@ -4,7 +4,7 @@ PR: none. Originator: Blake Chaffin 6/6/2007 */ -/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */ +/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */ #include "ffitest.h" void* cls_pointer_fn(void* a1, void* a2) diff --git a/testsuite/libffi.call/cls_pointer_stack.c b/testsuite/libffi.call/cls_pointer_stack.c index ab48571..dd59c6b 100644 --- a/testsuite/libffi.call/cls_pointer_stack.c +++ b/testsuite/libffi.call/cls_pointer_stack.c @@ -4,7 +4,7 @@ PR: none. Originator: Blake Chaffin 6/7/2007 */ -/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */ +/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */ #include "ffitest.h" static long dummyVar; diff --git a/testsuite/libffi.special/.svn/entries b/testsuite/libffi.special/.svn/entries index f006abc..5bc62b3 100644 --- a/testsuite/libffi.special/.svn/entries +++ b/testsuite/libffi.special/.svn/entries @@ -1,7 +1,7 @@ 10 dir -155452 +155472 svn+ssh://green@gcc.gnu.org/svn/gcc/trunk/libffi/testsuite/libffi.special svn+ssh://green@gcc.gnu.org/svn/gcc |