- Issue #8142: Update libffi to the 3.0.9 release.

-- Diese und die folgenden Zeilen werden ignoriert --

M    Misc/NEWS
A    Modules/_ctypes/libffi/m4
A    Modules/_ctypes/libffi/m4/ltsugar.m4
A    Modules/_ctypes/libffi/m4/libtool.m4
A    Modules/_ctypes/libffi/m4/ltversion.m4
A    Modules/_ctypes/libffi/m4/lt~obsolete.m4
A    Modules/_ctypes/libffi/m4/ltoptions.m4
A    Modules/_ctypes/libffi/ChangeLog.libffi
M    Modules/_ctypes/libffi/configure
M    Modules/_ctypes/libffi/Makefile.in
M    Modules/_ctypes/libffi/fficonfig.h.in
M    Modules/_ctypes/libffi/src/arm/sysv.S
M    Modules/_ctypes/libffi/src/powerpc/ffitarget.h
M    Modules/_ctypes/libffi/src/powerpc/aix.S
M    Modules/_ctypes/libffi/src/powerpc/ffi.c
M    Modules/_ctypes/libffi/src/powerpc/sysv.S
M    Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
M    Modules/_ctypes/libffi/src/powerpc/aix_closure.S
A    Modules/_ctypes/libffi/src/closures.c
D    Modules/_ctypes/libffi/src/darwin/ffitarget.h
M    Modules/_ctypes/libffi/src/sh64/ffi.c
M    Modules/_ctypes/libffi/src/sh64/sysv.S
M    Modules/_ctypes/libffi/src/x86/ffi64.c
M    Modules/_ctypes/libffi/src/x86/ffitarget.h
M    Modules/_ctypes/libffi/src/x86/win32.S
M    Modules/_ctypes/libffi/src/x86/darwin.S
M    Modules/_ctypes/libffi/src/x86/ffi.c
M    Modules/_ctypes/libffi/src/x86/sysv.S
A    Modules/_ctypes/libffi/src/x86/win64.S
M    Modules/_ctypes/libffi/src/x86/unix64.S
A    Modules/_ctypes/libffi/src/types.c
A    Modules/_ctypes/libffi/src/avr32
A    Modules/_ctypes/libffi/src/avr32/ffitarget.h
A    Modules/_ctypes/libffi/src/avr32/ffi.c
A    Modules/_ctypes/libffi/src/avr32/sysv.S
M    Modules/_ctypes/libffi/src/frv/ffi.c
M    Modules/_ctypes/libffi/src/s390/sysv.S
M    Modules/_ctypes/libffi/src/pa/ffi.c
A    Modules/_ctypes/libffi/src/raw_api.c
A    Modules/_ctypes/libffi/src/java_raw_api.c
A    Modules/_ctypes/libffi/src/debug.c
M    Modules/_ctypes/libffi/src/sparc/ffi.c
M    Modules/_ctypes/libffi/src/sparc/v8.S
M    Modules/_ctypes/libffi/src/mips/ffitarget.h
M    Modules/_ctypes/libffi/src/mips/n32.S
M    Modules/_ctypes/libffi/src/mips/o32.S
M    Modules/_ctypes/libffi/src/mips/ffi.c
A    Modules/_ctypes/libffi/src/dlmalloc.c
M    Modules/_ctypes/libffi/src/sh/ffi.c
M    Modules/_ctypes/libffi/src/sh/sysv.S
AM   Modules/_ctypes/libffi/depcomp
AM   Modules/_ctypes/libffi/compile
M    Modules/_ctypes/libffi/config.guess
AM   Modules/_ctypes/libffi/ltmain.sh
M    Modules/_ctypes/libffi/config.sub
AM   Modules/_ctypes/libffi/mdate-sh
M    Modules/_ctypes/libffi/configure.ac
A    Modules/_ctypes/libffi/doc
A    Modules/_ctypes/libffi/doc/libffi.texi
A    Modules/_ctypes/libffi/doc/stamp-vti
A    Modules/_ctypes/libffi/doc/libffi.info
A    Modules/_ctypes/libffi/doc/version.texi
A    Modules/_ctypes/libffi/texinfo.tex
A    Modules/_ctypes/libffi/man
A    Modules/_ctypes/libffi/man/ffi_call.3
A    Modules/_ctypes/libffi/man/Makefile.in
A    Modules/_ctypes/libffi/man/ffi.3
A    Modules/_ctypes/libffi/man/Makefile.am
A    Modules/_ctypes/libffi/man/ffi_prep_cif.3
A    Modules/_ctypes/libffi/ChangeLog.libgcj
M    Modules/_ctypes/libffi/LICENSE
M    Modules/_ctypes/libffi/include/ffi.h.in
M    Modules/_ctypes/libffi/include/Makefile.in
M    Modules/_ctypes/libffi/include/ffi_common.h
M    Modules/_ctypes/libffi/include/Makefile.am
A    Modules/_ctypes/libffi/libtool-version
A    Modules/_ctypes/libffi/ChangeLog
A    Modules/_ctypes/libffi/testsuite
A    Modules/_ctypes/libffi/testsuite/Makefile.in
A    Modules/_ctypes/libffi/testsuite/libffi.call
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_multi_ushort.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/stret_medium.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_uint16.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_uc.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct3.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct5.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/err_bad_abi.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct3.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_7_1_byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct5.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_double.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct7.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_sl.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct7.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct9.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_sint.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct9.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_pointer.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/many_win32.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_20byte1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_multi_sshortchar.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_fl.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_sint64.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/many.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/strlen.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_3byte2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_ldl.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/stret_large.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_multi_schar.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_multi_uchar.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_9byte1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/err_bad_typedef.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_19byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_float.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_fn1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble_split.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/problem1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_fl1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_fn3.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_dbl2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_sshort.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_fl3.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_fn5.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_double.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_2byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/promotion.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/float2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct10.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_ll1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_4byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/float4.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_6byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/huge_struct.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_8byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_multi_sshort.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_uint32.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_sint16.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_double_va.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_sc.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/float.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_20byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_float.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_pointer_stack.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_5_1_byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct4.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_24byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct6.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct4.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_loc_fn0.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/struct8.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct6.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/testclosure.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/nested_struct8.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_64byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_ul.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_uint.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_dbls_struct.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/strlen_win32.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/pyobjc-tc.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/stret_large2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_multi_ushortchar.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_dbl.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_schar.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_uchar.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_uint64.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_longdouble.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_ulonglong.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_1_1byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_ll.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_3_1byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_12byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_4_1byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_3byte1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/ffitest.h
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_6_1_byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_16byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_18byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_fn0.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_9byte2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_longdouble_va.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_dbl1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_fn2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_stdcall.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/return_fl2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/stret_medium2.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_fn4.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/negint.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_ushort.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/call.exp
A    Modules/_ctypes/libffi/testsuite/libffi.call/closure_fn6.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/float1.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/float3.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_5byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_7byte.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_pointer.c
A    Modules/_ctypes/libffi/testsuite/libffi.call/cls_align_sint32.c
A    Modules/_ctypes/libffi/testsuite/config
A    Modules/_ctypes/libffi/testsuite/config/default.exp
A    Modules/_ctypes/libffi/testsuite/lib
A    Modules/_ctypes/libffi/testsuite/lib/target-libpath.exp
A    Modules/_ctypes/libffi/testsuite/lib/wrapper.exp
A    Modules/_ctypes/libffi/testsuite/lib/libffi-dg.exp
A    Modules/_ctypes/libffi/testsuite/Makefile.am
A    Modules/_ctypes/libffi/testsuite/libffi.special
A    Modules/_ctypes/libffi/testsuite/libffi.special/unwindtest_ffi_call.cc
A    Modules/_ctypes/libffi/testsuite/libffi.special/unwindtest.cc
A    Modules/_ctypes/libffi/testsuite/libffi.special/special.exp
A    Modules/_ctypes/libffi/testsuite/libffi.special/ffitestcxx.h
M    Modules/_ctypes/libffi/README
A    Modules/_ctypes/libffi/libffi.pc.in
M    Modules/_ctypes/libffi/Makefile.am
M    Modules/_ctypes/libffi/missing
A    Modules/_ctypes/libffi/ChangeLog.v1
M    Modules/_ctypes/libffi/aclocal.m4
M    Modules/_ctypes/libffi.diff

Misc/NEWS

@@ -45,6 +45,8 @@ Library
 Extension Modules
 -----------------
 
+- Issue #8142: Update libffi to the 3.0.9 release.
+
 - Issue #1530559: When passing a non-integer argument to struct.pack with *any*
   integer format code (one of 'bBhHiIlLqQ'), struct.pack attempts to use the
   argument's __int__ method to convert to an integer before packing.  It also

Modules/_ctypes/libffi.diff

 This file contains the diffs between the files in the libffi
 subdirectory and the 'official' source files from
-ftp://sourceware.org/pub/libffi/libffi-3.0.5.tar.gz
+ftp://sourceware.org/pub/libffi/libffi-3.0.9.tar.gz
 
-Index: libffi/aclocal.m4
-===================================================================
---- libffi/aclocal.m4	(working copy)
-+++ libffi/aclocal.m4	(revision 72475)
-@@ -1155,7 +1155,7 @@
-    test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-    test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
- 
--  # We can hardcode non-existant directories.
-+  # We can hardcode non-existent directories.
-   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-      # If the only mechanism to avoid hardcoding is shlibpath_var, we
-      # have to relink, otherwise we might link with an installed library
-Index: libffi/configure.ac
-===================================================================
---- libffi/configure.ac	(working copy)
-+++ libffi/configure.ac	(revision 72475)
+--- libffi/configure.ac.orig	2009-12-31 13:41:51.000000000 +0100
++++ libffi/configure.ac	2010-02-24 00:39:10.341610848 +0100
 @@ -1,4 +1,7 @@
  dnl Process this with autoconf to create configure
 +#
 +# file from libffi - slightly patched for ctypes
 +#
  
- AC_PREREQ(2.59)
+ AC_PREREQ(2.63)
  
-@@ -83,6 +86,9 @@
+@@ -91,6 +94,9 @@
    i?86-*-solaris2.1[[0-9]]*)
  	TARGET=X86_64; TARGETDIR=x86
  	;;
@@ -37,7 +22,7 @@ Index: libffi/configure.ac
    i?86-*-*)
  	TARGET=X86; TARGETDIR=x86
  	;;
-@@ -100,10 +106,10 @@
+@@ -108,12 +114,12 @@
  	;;
  
    mips-sgi-irix5.* | mips-sgi-irix6.*)
@@ -45,12 +30,14 @@ Index: libffi/configure.ac
 +	TARGET=MIPS_IRIX; TARGETDIR=mips
  	;;
    mips*-*-linux*)
+ 	# Support 128-bit long double for NewABI.
+ 	HAVE_LONG_DOUBLE='defined(__mips64)'
 -	TARGET=MIPS; TARGETDIR=mips
-+	TARGET=MIPS_LINUX; TARGETDIR=mips
++	TARGET=MIPS_IRIX; TARGETDIR=mips
  	;;
  
    powerpc*-*-linux* | powerpc-*-sysv*)
-@@ -156,7 +162,7 @@
+@@ -170,7 +176,7 @@
    AC_MSG_ERROR(["libffi has not been ported to $host."])
  fi
  
@@ -59,59 +46,21 @@ Index: libffi/configure.ac
  AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
  AM_CONDITIONAL(X86, test x$TARGET = xX86)
  AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
-@@ -360,6 +366,10 @@
+@@ -399,6 +405,10 @@
  
  AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
  
 -AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc)
 +AC_CONFIG_FILES(include/ffi.h)
- 
++
 +AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
 +
 +AC_CONFIG_FILES(fficonfig.py)
-+
+ 
  AC_OUTPUT
-Index: libffi/configure
-===================================================================
---- libffi/configure	(working copy)
-+++ libffi/configure	(revision 72475)
-@@ -9546,7 +9546,7 @@
-    test -n "$runpath_var" || \
-    test "X$hardcode_automatic" = "Xyes" ; then
- 
--  # We can hardcode non-existant directories.
-+  # We can hardcode non-existent directories.
-   if test "$hardcode_direct" != no &&
-      # If the only mechanism to avoid hardcoding is shlibpath_var, we
-      # have to relink, otherwise we might link with an installed library
-@@ -13514,7 +13514,7 @@
-    test -n "$runpath_var_CXX" || \
-    test "X$hardcode_automatic_CXX" = "Xyes" ; then
- 
--  # We can hardcode non-existant directories.
-+  # We can hardcode non-existent directories.
-   if test "$hardcode_direct_CXX" != no &&
-      # If the only mechanism to avoid hardcoding is shlibpath_var, we
-      # have to relink, otherwise we might link with an installed library
-@@ -16117,7 +16117,7 @@
-    test -n "$runpath_var_F77" || \
-    test "X$hardcode_automatic_F77" = "Xyes" ; then
- 
--  # We can hardcode non-existant directories.
-+  # We can hardcode non-existent directories.
-   if test "$hardcode_direct_F77" != no &&
-      # If the only mechanism to avoid hardcoding is shlibpath_var, we
-      # have to relink, otherwise we might link with an installed library
-@@ -18720,7 +18720,7 @@
-    test -n "$runpath_var_GCJ" || \
-    test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- 
--  # We can hardcode non-existant directories.
-+  # We can hardcode non-existent directories.
-   if test "$hardcode_direct_GCJ" != no &&
-      # If the only mechanism to avoid hardcoding is shlibpath_var, we
-      # have to relink, otherwise we might link with an installed library
-@@ -20406,6 +20406,9 @@
+--- libffi/configure.orig	2009-12-31 13:41:51.000000000 +0100
++++ libffi/configure	2010-02-24 00:41:59.829608794 +0100
+@@ -12191,6 +12191,9 @@
    i?86-*-solaris2.1[0-9]*)
  	TARGET=X86_64; TARGETDIR=x86
  	;;
@@ -121,7 +70,7 @@ Index: libffi/configure
    i?86-*-*)
  	TARGET=X86; TARGETDIR=x86
  	;;
-@@ -20423,10 +20426,10 @@
+@@ -12208,12 +12211,12 @@
  	;;
  
    mips-sgi-irix5.* | mips-sgi-irix6.*)
@@ -129,12 +78,14 @@ Index: libffi/configure
 +	TARGET=MIPS_IRIX; TARGETDIR=mips
  	;;
    mips*-*-linux*)
+ 	# Support 128-bit long double for NewABI.
+ 	HAVE_LONG_DOUBLE='defined(__mips64)'
 -	TARGET=MIPS; TARGETDIR=mips
-+	TARGET=MIPS_LINUX; TARGETDIR=mips
++	TARGET=MIPS_IRIX; TARGETDIR=mips
  	;;
  
    powerpc*-*-linux* | powerpc-*-sysv*)
-@@ -20481,7 +20484,7 @@
+@@ -12272,7 +12275,7 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -143,24 +94,22 @@ Index: libffi/configure
    MIPS_TRUE=
    MIPS_FALSE='#'
  else
-@@ -22712,9 +22715,15 @@
+@@ -14667,7 +14670,13 @@
  ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h"
  
  
 -ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc"
 +ac_config_files="$ac_config_files include/ffi.h"
- 
- 
-+ac_config_links="$ac_config_links include/ffi_common.h:include/ffi_common.h"
 +
 +
-+ac_config_files="$ac_config_files fficonfig.py"
++ac_config_links="$ac_config_links include/ffi_common.h:include/ffi_common.h"
 +
 +
++ac_config_files="$ac_config_files fficonfig.py"
+ 
+ 
  cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -23498,12 +23507,9 @@
+@@ -15767,12 +15776,9 @@
      "include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;;
      "src") CONFIG_COMMANDS="$CONFIG_COMMANDS src" ;;
      "include/ffitarget.h") CONFIG_LINKS="$CONFIG_LINKS include/ffitarget.h:src/$TARGETDIR/ffitarget.h" ;;
@@ -173,13 +122,22 @@ Index: libffi/configure
 +    "include/ffi_common.h") CONFIG_LINKS="$CONFIG_LINKS include/ffi_common.h:include/ffi_common.h" ;;
 +    "fficonfig.py") CONFIG_FILES="$CONFIG_FILES fficonfig.py" ;;
  
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-Index: libffi/src/x86/ffi.c
-===================================================================
---- libffi/src/x86/ffi.c	(working copy)
-+++ libffi/src/x86/ffi.c	(revision 72475)
-@@ -388,10 +388,10 @@
+   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+--- libffi/src/x86/ffi64.c.orig	2009-12-29 16:22:26.000000000 +0100
++++ libffi/src/x86/ffi64.c	2010-02-24 00:36:46.678610932 +0100
+@@ -52,7 +52,7 @@
+ /* Register class used for passing given 64bit part of the argument.
+    These represent classes as documented by the PS ABI, with the exception
+    of SSESF, SSEDF classes, that are basically SSE class, just gcc will
+-   use SF or DFmode move instead of DImode to avoid reformating penalties.
++   use SF or DFmode move instead of DImode to avoid reformatting penalties.
+ 
+    Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
+    whenever possible (upper half does contain padding).  */
+--- libffi/src/x86/ffi.c.orig	2009-12-29 16:22:26.000000000 +0100
++++ libffi/src/x86/ffi.c	2010-02-24 00:36:46.678610932 +0100
+@@ -594,10 +594,10 @@
      return FFI_BAD_ABI;
    }
  
@@ -192,16 +150,3 @@ Index: libffi/src/x86/ffi.c
  
    for (i = cif->nargs-1; i >= 0; i--)
      {
-Index: libffi/src/x86/ffi64.c
-===================================================================
---- libffi/src/x86/ffi64.c	(working copy)
-+++ libffi/src/x86/ffi64.c	(revision 72475)
-@@ -52,7 +52,7 @@
- /* Register class used for passing given 64bit part of the argument.
-    These represent classes as documented by the PS ABI, with the exception
-    of SSESF, SSEDF classes, that are basically SSE class, just gcc will
--   use SF or DFmode move instead of DImode to avoid reformating penalties.
-+   use SF or DFmode move instead of DImode to avoid reformatting penalties.
- 
-    Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
-    whenever possible (upper half does contain padding).  */

Modules/_ctypes/libffi/ChangeLog.libgcj

+2004-01-14  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure.in: Add in AC_PREREQ(2.13)
+
+2003-02-20  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in: Propagate ORIGINAL_LD_FOR_MULTILIBS to
+	config.status.
+	* configure: Rebuilt.
+
+2002-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST.
+	Remove USE_LIBDIR conditional.
+	* Makefile.am (toolexecdir, toolexeclibdir): Don't override.
+	* Makefile.in, configure: Rebuilt.
+
+Mon Aug  9 18:33:38 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* include/Makefile.in: Rebuilt.
+	* Makefile.in: Rebuilt
+	* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
+	builds.
+	Use USE_LIBDIR.
+
+	* configure: Rebuilt.
+	* configure.in (USE_LIBDIR): Define for native builds.
+	Use lowercase in configure --help explanations.
+
+1999-08-08  Anthony Green  <green@cygnus.com>
+
+	* include/ffi.h.in (FFI_FN): Remove `...'.
+
+1999-08-08  Anthony Green  <green@cygnus.com>
+
+	* Makefile.in: Rebuilt.
+	* Makefile.am (AM_CFLAGS): Compile with -fexceptions.
+
+	* src/x86/sysv.S: Add exception handling metadata.
+

Modules/_ctypes/libffi/LICENSE

-libffi - Copyright (c) 1996-2008  Red Hat, Inc and others.  
+libffi - Copyright (c) 1996-2009  Anthony Green, Red Hat, Inc and others.  
 See source files for details.
 
 Permission is hereby granted, free of charge, to any person obtaining

Modules/_ctypes/libffi/Makefile.am

@@ -7,6 +7,7 @@ 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 \
@@ -25,12 +26,13 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
 	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 \
-	src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \
-	src/x86/freebsd.S \
+	src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/win64.S \
+	src/x86/darwin.S src/x86/freebsd.S \
 	src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \
 	src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \
 	src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
-	libtool-version ChangeLog.libffi
+	libtool-version ChangeLog.libffi m4/libtool.m4 \
+	m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
 
 info_TEXINFOS = doc/libffi.texi
 
@@ -79,6 +81,8 @@ AM_MAKEFLAGS = \
 
 MAKEOVERRIDES=
 
+ACLOCAL_AMFLAGS=$(ACLOCAL_AMFLAGS) -I m4
+
 lib_LTLIBRARIES = libffi.la
 noinst_LTLIBRARIES = libffi_convenience.la
 
@@ -102,6 +106,9 @@ endif
 if X86_WIN32
 nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win32.S
 endif
+if X86_WIN64
+nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win64.S
+endif
 if X86_DARWIN
 nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
 endif
@@ -135,6 +142,9 @@ endif
 if ARM
 nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
 endif
+if AVR32
+nodist_libffi_la_SOURCES += src/avr32/sysv.S src/avr32/ffi.c
+endif
 if LIBFFI_CRIS
 nodist_libffi_la_SOURCES += src/cris/sysv.S src/cris/ffi.c
 endif
@@ -165,7 +175,7 @@ nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
 
 AM_CFLAGS = -Wall -g -fexceptions
 
-libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(AM_LTLDFLAGS)
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)

Modules/_ctypes/libffi/README

 Status
 ======
 
-libffi-3.0.5 was released on April 3, 2008. Check the libffi web
+libffi-3.0.9 was released on December 31, 2009. Check the libffi web
 page for updates: <URL:http://sourceware.org/libffi/>.
 
 
@@ -9,27 +9,27 @@ What is libffi?
 ===============
 
 Compilers for high level languages generate code that follow certain
-conventions.  These conventions are necessary, in part, for separate
-compilation to work.  One such convention is the "calling convention".
-The "calling convention" is a set of assumptions made by the compiler
-about where function arguments will be found on entry to a function.
-A "calling convention" also specifies where the return value for a
-function is found.
+conventions. These conventions are necessary, in part, for separate
+compilation to work. One such convention is the "calling
+convention". The "calling convention" is essentially a set of
+assumptions made by the compiler about where function arguments will
+be found on entry to a function. A "calling convention" also specifies
+where the return value for a function is found.
 
 Some programs may not know at the time of compilation what arguments
-are to be passed to a function.  For instance, an interpreter may be
+are to be passed to a function. For instance, an interpreter may be
 told at run-time about the number and types of arguments used to call
-a given function.  Libffi can be used in such programs to provide a
+a given function. Libffi can be used in such programs to provide a
 bridge from the interpreter program to compiled code.
 
 The libffi library provides a portable, high level programming
-interface to various calling conventions.  This allows a programmer to
+interface to various calling conventions. This allows a programmer to
 call any function specified by a call interface description at run
-time.
+time.  
 
 FFI stands for Foreign Function Interface.  A foreign function
 interface is the popular name for the interface that allows code
-written in one language to call code written in another language.  The
+written in one language to call code written in another language. The
 libffi library really only provides the lowest, machine dependent
 layer of a fully featured foreign function interface. A layer must
 exist above libffi that handles type conversions for values passed
@@ -39,36 +39,56 @@ between the two languages.
 Supported Platforms
 ===================
 
-Libffi has been ported to many different platforms, although this
-release was only tested on:
-
-     arm oabi linux
-     arm eabi linux
-     hppa linux
-     mips o32 linux (little endian)
-     powerpc darwin
-     powerpc64 linux
-     sparc solaris
-     sparc64 solaris
-     x86 cygwin
-     x86 darwin
-     x86 freebsd
-     x86 linux
-     x86 openbsd
-     x86-64 darwin
-     x86-64 linux
-     x86-64 OS X
-     x86-64 freebsd
-     
+Libffi has been ported to many different platforms.
+For specific configuration details and testing status, please
+refer to the wiki page here:
+
+ http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.9
+
+At the time of release, the following basic configurations have been
+tested:
+
+|--------------+------------------|
+| Architecture | Operating System |
+|--------------+------------------|
+| Alpha        | Linux            |
+| ARM          | Linux            |
+| AVR32        | Linux            |
+| HPPA         | HPUX             |
+| IA-64        | Linux            |
+| MIPS         | IRIX             |
+| MIPS         | Linux            |
+| MIPS64       | Linux            |
+| PowerPC      | Linux            |
+| PowerPC      | Mac OSX          |
+| PowerPC      | FreeBSD          |
+| PowerPC64    | Linux            |
+| S390         | Linux            |
+| S390X        | Linux            |
+| SPARC        | Linux            |
+| SPARC        | Solaris          |
+| SPARC64      | Linux            |
+| SPARC64      | FreeBSD          |
+| X86          | FreeBSD          |
+| X86          | kFreeBSD         |
+| X86          | Linux            |
+| X86          | Mac OSX          |
+| X86          | OpenBSD          |
+| X86          | Solaris          |
+| X86          | Windows/Cygwin   |
+| X86          | Windows/MingW    |
+| X86-64       | FreeBSD          |
+| X86-64       | Linux            |
+| X86-64       | OpenBSD          |
+|--------------+------------------|
+
 Please send additional platform test results to
-libffi-discuss@sourceware.org.
+libffi-discuss@sourceware.org and feel free to update the wiki page
+above.
 
 Installing libffi
 =================
 
-[Note: before actually performing any of these installation steps,
- you may wish to read the "Platform Specific Notes" below.]
-
 First you must configure the distribution for your particular
 system. Go to the directory you wish to build libffi in and run the
 "configure" program found in the root directory of the libffi source
@@ -98,65 +118,28 @@ This will require that you have DejaGNU installed.
 To install the library and header files, type "make install".
 
 
-Platform Specific Notes
-=======================
-
-	MIPS - Irix 5.3 & 6.x
-	---------------------
-
-Irix 6.2 and better supports three different calling conventions: o32,
-n32 and n64. Currently, libffi only supports both o32 and n32 under
-Irix 6.x, but only o32 under Irix 5.3. Libffi will automatically be
-configured for whichever calling convention it was built for.
-
-By default, the configure script will try to build libffi with the GNU
-development tools. To build libffi with the SGI development tools, set
-the environment variable CC to either "cc -32" or "cc -n32" before
-running configure under Irix 6.x (depending on whether you want an o32
-or n32 library), or just "cc" for Irix 5.3.
-
-With the n32 calling convention, when returning structures smaller
-than 16 bytes, be sure to provide an RVALUE that is 8 byte aligned.
-Here's one way of forcing this:
-
-	double struct_storage[2];
-	my_small_struct *s = (my_small_struct *) struct_storage;  
-	/* Use s for RVALUE */
-
-If you don't do this you are liable to get spurious bus errors. 
-
-"long long" values are not supported yet.
-
-You must use GNU Make to build libffi on SGI platforms.
-
-
-	PowerPC System V ABI
-	--------------------
-
-There are two `System V ABI's which libffi implements for PowerPC.
-They differ only in how small structures are returned from functions.
+History
+=======
 
-In the FFI_SYSV version, structures that are 8 bytes or smaller are
-returned in registers.  This is what GCC does when it is configured
-for solaris, and is what the System V ABI I have (dated September
-1995) says.
+See the ChangeLog files for details.
 
-In the FFI_GCC_SYSV version, all structures are returned the same way:
-by passing a pointer as the first argument to the function.  This is
-what GCC does when it is configured for linux or a generic sysv
-target.
+3.0.9 Dec-31-09
+        Add AVR32 and win64 ports.  Add ARM softfp support.
+	Many fixes for AIX, Solaris, HP-UX, *BSD.
+	Several PowerPC and x86-64 bug fixes.
+	Build DLL for windows.
 
-EGCS 1.0.1 (and probably other versions of EGCS/GCC) also has a
-inconsistency with the SysV ABI: When a procedure is called with many
-floating-point arguments, some of them get put on the stack.  They are
-all supposed to be stored in double-precision format, even if they are
-only single-precision, but EGCS stores single-precision arguments as
-single-precision anyway.  This causes one test to fail (the `many
-arguments' test).
+3.0.8 Dec-19-08
+        Add *BSD, BeOS, and PA-Linux support.
 
+3.0.7 Nov-11-08
+        Fix for ppc FreeBSD.
+	(thanks to Andreas Tobler)
 
-History
-=======
+3.0.6 Jul-17-08
+        Fix for closures on sh.
+	Mark the sh/sh64 stack as non-executable.
+	(both thanks to Kaz Kojima)
 
 3.0.5 Apr-3-08
         Fix libffi.pc file.

Modules/_ctypes/libffi/compile

+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

Modules/_ctypes/libffi/configure.ac

@@ -3,9 +3,9 @@ dnl Process this with autoconf to create configure
 # file from libffi - slightly patched for ctypes
 #
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.63)
 
-AC_INIT([libffi], [3.0.5], [http://gcc.gnu.org/bugs.html])
+AC_INIT([libffi], [3.0.9], [http://gcc.gnu.org/bugs.html])
 AC_CONFIG_HEADERS([fficonfig.h])
 
 AC_CANONICAL_SYSTEM
@@ -23,6 +23,7 @@ AM_INIT_AUTOMAKE
 m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
 m4_define([_AC_ARG_VAR_PRECIOUS],[])
 AC_PROG_CC
+m4_undefine([_AC_ARG_VAR_PRECIOUS])
 m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
 
 AC_SUBST(CFLAGS)
@@ -30,6 +31,7 @@ AC_SUBST(CFLAGS)
 AM_PROG_AS
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_MAINTAINER_MODE
 
@@ -52,10 +54,14 @@ case "$host" in
 	TARGET=ARM; TARGETDIR=arm
 	;;
 
-  amd64-*-freebsd*)
+  amd64-*-freebsd* | amd64-*-openbsd*)
 	TARGET=X86_64; TARGETDIR=x86
   	;;
 
+  avr32*-*-*)
+	TARGET=AVR32; TARGETDIR=avr32
+	;;
+
   cris-*-*)
 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
 	;;
@@ -74,11 +80,13 @@ case "$host" in
 	TARGET=PA_HPUX; TARGETDIR=pa
 	;;
 
-  i386-*-freebsd* | i386-*-openbsd*)
+  i?86-*-freebsd* | i?86-*-openbsd*)
 	TARGET=X86_FREEBSD; TARGETDIR=x86
 	;;
   i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)
 	TARGET=X86_WIN32; TARGETDIR=x86
+	# All mingw/cygwin/win32 builds require this for sharedlib
+	AM_LTLDFLAGS="-no-undefined"
 	;;
   i?86-*-darwin*)
 	TARGET=X86_DARWIN; TARGETDIR=x86
@@ -109,7 +117,9 @@ case "$host" in
 	TARGET=MIPS_IRIX; TARGETDIR=mips
 	;;
   mips*-*-linux*)
-	TARGET=MIPS_LINUX; TARGETDIR=mips
+	# Support 128-bit long double for NewABI.
+	HAVE_LONG_DOUBLE='defined(__mips64)'
+	TARGET=MIPS_IRIX; TARGETDIR=mips
 	;;
 
   powerpc*-*-linux* | powerpc-*-sysv*)
@@ -149,14 +159,18 @@ case "$host" in
   x86_64-*-darwin*)
 	TARGET=X86_DARWIN; TARGETDIR=x86
 	;;
+
   x86_64-*-cygwin* | x86_64-*-mingw*)
+	TARGET=X86_WIN64; TARGETDIR=x86
 	;;
+
   x86_64-*-*)
 	TARGET=X86_64; TARGETDIR=x86
 	;;
 esac
 
 AC_SUBST(AM_RUNTESTFLAGS)
+AC_SUBST(AM_LTLDFLAGS)
 
 if test $TARGETDIR = unknown; then
   AC_MSG_ERROR(["libffi has not been ported to $host."])
@@ -167,6 +181,7 @@ AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
 AM_CONDITIONAL(X86, test x$TARGET = xX86)
 AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
 AM_CONDITIONAL(X86_WIN32, test x$TARGET = xX86_WIN32)
+AM_CONDITIONAL(X86_WIN64, test x$TARGET = xX86_WIN64)
 AM_CONDITIONAL(X86_DARWIN, test x$TARGET = xX86_DARWIN)
 AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
 AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
@@ -177,6 +192,7 @@ AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX)
 AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN)
 AM_CONDITIONAL(POWERPC_FREEBSD, test x$TARGET = xPOWERPC_FREEBSD)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
+AM_CONDITIONAL(AVR32, test x$TARGET = xAVR32)
 AM_CONDITIONAL(LIBFFI_CRIS, test x$TARGET = xLIBFFI_CRIS)
 AM_CONDITIONAL(FRV, test x$TARGET = xFRV)
 AM_CONDITIONAL(S390, test x$TARGET = xS390)
@@ -251,6 +267,29 @@ if test x$TARGET = xSPARC; then
     fi
 fi
 
+if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
+    AC_CACHE_CHECK([assembler supports pc related relocs],
+	libffi_cv_as_x86_pcrel, [
+	libffi_cv_as_x86_pcrel=yes
+	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
+	if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then
+	    libffi_cv_as_x86_pcrel=no
+	fi
+	])
+    if test "x$libffi_cv_as_x86_pcrel" = xyes; then
+	AC_DEFINE(HAVE_AS_X86_PCREL, 1,
+		  [Define if your assembler supports PC relative relocs.])
+    fi
+fi
+
+case "$target" in
+     *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
+       AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
+                 [Cannot use malloc on this target, so, we revert to
+                   alternative means])
+     ;;
+esac
+
 AC_CACHE_CHECK([whether .eh_frame section should be read-only],
     libffi_cv_ro_eh_frame, [
 	libffi_cv_ro_eh_frame=no

Modules/_ctypes/libffi/doc/stamp-vti

+@set UPDATED 29 December 2009
+@set UPDATED-MONTH December 2009
+@set EDITION 3.0.9
+@set VERSION 3.0.9

Modules/_ctypes/libffi/doc/version.texi

+@set UPDATED 29 December 2009
+@set UPDATED-MONTH December 2009
+@set EDITION 3.0.9
+@set VERSION 3.0.9

Modules/_ctypes/libffi/fficonfig.h.in

 /* fficonfig.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
@@ -14,6 +17,9 @@
 /* Define this if you want extra debugging. */
 #undef FFI_DEBUG
 
+/* Cannot use malloc on this target, so, we revert to alternative means */
+#undef FFI_MMAP_EXEC_WRIT
+
 /* Define this is you do not want support for the raw API. */
 #undef FFI_NO_RAW_API
 
@@ -37,6 +43,9 @@
    */
 #undef HAVE_AS_SPARC_UA_PCREL
 
+/* Define if your assembler supports PC relative relocs. */
+#undef HAVE_AS_X86_PCREL
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -94,6 +103,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 
@@ -139,9 +152,17 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 
 #ifdef HAVE_HIDDEN_VISIBILITY_ATTRIBUTE

Modules/_ctypes/libffi/include/Makefile.am

@@ -6,4 +6,4 @@ DISTCLEANFILES=ffitarget.h
 EXTRA_DIST=ffi.h.in ffi_common.h
 
 includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-nodist_includes_HEADERS = ffi.h ffitarget.h 
+nodist_includes_HEADERS = ffi.h ffitarget.h

Modules/_ctypes/libffi/include/ffi.h.in

@@ -57,9 +57,7 @@ extern "C" {
 #endif
 
 /* Specify which architecture libffi is configured for. */
-#ifndef @TARGET@
 #define @TARGET@
-#endif
 
 /* ---- System configuration information --------------------------------- */
 
@@ -67,6 +65,10 @@ extern "C" {
 
 #ifndef LIBFFI_ASM
 
+#ifdef _MSC_VER
+#define __attribute__(X)
+#endif
+
 #include <stddef.h>
 #include <limits.h>
 
@@ -254,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 *);

Modules/_ctypes/libffi/include/ffi_common.h

@@ -18,7 +18,10 @@ extern "C" {
 /* Do not move this. Some versions of AIX are very picky about where
    this is positioned. */
 #ifdef __GNUC__
+/* mingw64 defines this already in malloc.h. */
+#ifndef alloca
 # define alloca __builtin_alloca
+#endif
 # define MAYBE_UNUSED __attribute__((__unused__))
 #else
 # define MAYBE_UNUSED
@@ -29,7 +32,11 @@ extern "C" {
  #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
+#    ifdef _MSC_VER
+#     define alloca _alloca
+#    else
 char *alloca ();
+#    endif
 #   endif
 #  endif
 # endif
@@ -77,6 +84,22 @@ typedef struct
 } extended_cif;
 
 /* Terse sized type definitions.  */
+#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__)));
 typedef unsigned int UINT16 __attribute__((__mode__(__HI__)));
@@ -85,6 +108,7 @@ typedef unsigned int UINT32 __attribute__((__mode__(__SI__)));
 typedef signed int   SINT32 __attribute__((__mode__(__SI__)));
 typedef unsigned int UINT64 __attribute__((__mode__(__DI__)));
 typedef signed int   SINT64 __attribute__((__mode__(__DI__)));
+#endif
 
 typedef float FLOAT32;
 

Modules/_ctypes/libffi/libffi.pc.in

+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+
+Name: @PACKAGE_NAME@
+Description: Library supporting Foreign Function Interfaces
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lffi
+Cflags: -I${includedir}

Modules/_ctypes/libffi/libtool-version

+# This file is used to maintain libtool version info for libffi.  See
+# the libtool manual to understand the meaning of the fields.  This is
+# a separate file so that version updates don't involve re-running
+# automake.
+#
+# Here are a set of rules to help you update your library version
+# information:
+# 
+# 1. Start with version information of `0:0:0' for each libtool library.
+#
+# 2. Update the version information only immediately before a public
+#    release of your software. More frequent updates are unnecessary,
+#    and only guarantee that the current interface number gets larger
+#    faster.
+#
+# 3. If the library source code has changed at all since the last
+#    update, then increment revision (`c:r:a' becomes `c:r+1:a').
+#
+# 4. If any interfaces have been added, removed, or changed since the
+#    last update, increment current, and set revision to 0.
+#
+# 5. If any interfaces have been added since the last public release,
+#    then increment age.
+#
+# 6. If any interfaces have been removed since the last public
+#    release, then set age to 0.
+#
+# CURRENT:REVISION:AGE
+5:10:0

Modules/_ctypes/libffi/m4/ltversion.m4

+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# Generated from ltversion.in.
+
+# serial 3012 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.2.6])
+m4_define([LT_PACKAGE_REVISION], [1.3012])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.2.6'
+macro_revision='1.3012'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])

Modules/_ctypes/libffi/man/Makefile.am

+## Process this with automake to create Makefile.in
+
+AUTOMAKE_OPTIONS=foreign
+
+EXTRA_DIST = ffi.3 ffi_call.3 ffi_prep_cif.3
+
+man_MANS = ffi.3 ffi_call.3 ffi_prep_cif.3
+

Modules/_ctypes/libffi/man/ffi.3

+.Dd February 15, 2008
+.Dt FFI 3
+.Sh NAME
+.Nm FFI
+.Nd Foreign Function Interface
+.Sh LIBRARY
+libffi, -lffi
+.Sh SYNOPSIS
+.In ffi.h
+.Ft ffi_status
+.Fo ffi_prep_cif
+.Fa "ffi_cif *cif"
+.Fa "ffi_abi abi"
+.Fa "unsigned int nargs"
+.Fa "ffi_type *rtype"
+.Fa "ffi_type **atypes"
+.Fc
+.Ft void
+.Fo ffi_call
+.Fa "ffi_cif *cif"
+.Fa "void (*fn)(void)"
+.Fa "void *rvalue"
+.Fa "void **avalue"
+.Fc
+.Sh DESCRIPTION
+The foreign function interface provides a mechanism by which a function can
+generate a call to another function at runtime without requiring knowledge of
+the called function's interface at compile time.
+.Sh SEE ALSO
+.Xr ffi_prep_cif 3 ,
+.Xr ffi_call 3

Modules/_ctypes/libffi/src/frv/ffi.c

 /* -----------------------------------------------------------------------
    ffi.c - Copyright (C) 2004  Anthony Green
-           Copyright (C) 2007  Free Software Foundation, Inc.
+   Copyright (C) 2007  Free Software Foundation, Inc.
 	   Copyright (C) 2008  Red Hat, Inc.
    
    FR-V Foreign Function Interface 

Modules/_ctypes/libffi/src/pa/ffi.c

@@ -492,6 +492,13 @@ ffi_status ffi_closure_inner_pa32(ffi_closure *closure, UINT32 *stack)
 	  avalue[i] = (void *)(stack - slot);
 	  break;
 
+#ifdef PA_HPUX
+	case FFI_TYPE_LONGDOUBLE:
+	  /* Long doubles are treated like a big structure.  */
+	  avalue[i] = (void *) *(stack - slot);
+	  break;
+#endif
+
 	case FFI_TYPE_STRUCT:
 	  /* Structs smaller or equal than 4 bytes are passed in one
 	     register. Structs smaller or equal 8 bytes are passed in two

Modules/_ctypes/libffi/testsuite/config/default.exp

+load_lib "standard.exp"