[Python-3000-checkins] r62155 - in python/branches/py3k: Misc/NEWS Modules/_ctypes/libffi/README Modules/_ctypes/libffi/configure Modules/_ctypes/libffi/configure.ac Modules/_ctypes/libffi/include/ffi.h.in Modules/_ctypes/libffi/libffi.pc.in Modules/_ctypes/libffi/src/pa/hpux32.S Modules/_ctypes/libffi/src/x86/darwin64.S Modules/_ctypes/libffi/src/x86/ffi.c Modules/_ctypes/libffi/src/x86/freebsd.S

thomas.heller python-3000-checkins at python.org
Fri Apr 4 21:53:14 CEST 2008 

Author: thomas.heller
Date: Fri Apr  4 21:53:14 2008
New Revision: 62155

Added:
   python/branches/py3k/Modules/_ctypes/libffi/src/pa/hpux32.S
      - copied unchanged from r62149, python/trunk/Modules/_ctypes/libffi/src/pa/hpux32.S
   python/branches/py3k/Modules/_ctypes/libffi/src/x86/darwin64.S
      - copied unchanged from r62149, python/trunk/Modules/_ctypes/libffi/src/x86/darwin64.S
   python/branches/py3k/Modules/_ctypes/libffi/src/x86/freebsd.S
      - copied unchanged from r62149, python/trunk/Modules/_ctypes/libffi/src/x86/freebsd.S
Removed:
   python/branches/py3k/Modules/_ctypes/libffi/libffi.pc.in
Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/_ctypes/libffi/README
   python/branches/py3k/Modules/_ctypes/libffi/configure
   python/branches/py3k/Modules/_ctypes/libffi/configure.ac
   python/branches/py3k/Modules/_ctypes/libffi/include/ffi.h.in
   python/branches/py3k/Modules/_ctypes/libffi/src/x86/ffi.c
Log:
Merged revisions 62149, 62153, 62154 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

Sync with files from the just released libffi 3.0.5 version.

More files from libffi 3.0.5.
Removed libffi.pc.in because it is not needed for ctypes.

News entry for: Sync with files from the just released libffi 3.0.5 version.


Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Apr  4 21:53:14 2008
@@ -18,6 +18,10 @@
 Library
 -------
 
+- The bundled libffi copy is now in sync with the recently released
+  libffi3.0.5 version, apart from some small changes to
+  Modules/_ctypes/libffi/configure.ac.
+
 Build
 -----
 

Modified: python/branches/py3k/Modules/_ctypes/libffi/README
==============================================================================
--- python/branches/py3k/Modules/_ctypes/libffi/README	(original)
+++ python/branches/py3k/Modules/_ctypes/libffi/README	Fri Apr  4 21:53:14 2008
@@ -1,7 +1,7 @@
 Status
 ======
 
-libffi-3.0.4 was released on February 24, 2008. Check the libffi web
+libffi-3.0.5 was released on April 3, 2008. Check the libffi web
 page for updates: <URL:http://sourceware.org/libffi/>.
 
 
@@ -158,6 +158,11 @@
 History
 =======
 
+3.0.5 Apr-3-08
+        Fix libffi.pc file.
+	Fix #define ARM for IcedTea users.
+	Fix x86 closure bug.
+
 3.0.4 Feb-24-08
         Fix x86 OpenBSD configury.
 

Modified: python/branches/py3k/Modules/_ctypes/libffi/configure
==============================================================================
--- python/branches/py3k/Modules/_ctypes/libffi/configure	(original)
+++ python/branches/py3k/Modules/_ctypes/libffi/configure	Fri Apr  4 21:53:14 2008
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libffi 3.0.4.
+# Generated by GNU Autoconf 2.61 for libffi 3.0.5.
 #
 # Report bugs to <http://gcc.gnu.org/bugs.html>.
 #
@@ -728,8 +728,8 @@
 # Identity of this package.
 PACKAGE_NAME='libffi'
 PACKAGE_TARNAME='libffi'
-PACKAGE_VERSION='3.0.4'
-PACKAGE_STRING='libffi 3.0.4'
+PACKAGE_VERSION='3.0.5'
+PACKAGE_STRING='libffi 3.0.5'
 PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html'
 
 # Factoring default headers for most tests.
@@ -1459,7 +1459,7 @@
   # 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.4 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1530,7 +1530,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libffi 3.0.4:";;
+     short | recursive ) echo "Configuration of libffi 3.0.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1640,7 +1640,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libffi configure 3.0.4
+libffi configure 3.0.5
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1654,7 +1654,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libffi $as_me 3.0.4, which was
+It was created by libffi $as_me 3.0.5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2477,7 +2477,7 @@
 
 # Define the identity of the package.
  PACKAGE='libffi'
- VERSION='3.0.4'
+ VERSION='3.0.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23327,7 +23327,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libffi $as_me 3.0.4, which was
+This file was extended by libffi $as_me 3.0.5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23384,7 +23384,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libffi config.status 3.0.4
+libffi config.status 3.0.5
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: python/branches/py3k/Modules/_ctypes/libffi/configure.ac
==============================================================================
--- python/branches/py3k/Modules/_ctypes/libffi/configure.ac	(original)
+++ python/branches/py3k/Modules/_ctypes/libffi/configure.ac	Fri Apr  4 21:53:14 2008
@@ -1,8 +1,11 @@
 dnl Process this with autoconf to create configure
+#
+# file from libffi - slightly patched for ctypes
+#
 
 AC_PREREQ(2.59)
 
-AC_INIT([libffi], [3.0.4], [http://gcc.gnu.org/bugs.html])
+AC_INIT([libffi], [3.0.5], [http://gcc.gnu.org/bugs.html])
 AC_CONFIG_HEADERS([fficonfig.h])
 
 AC_CANONICAL_SYSTEM

Modified: python/branches/py3k/Modules/_ctypes/libffi/include/ffi.h.in
==============================================================================
--- python/branches/py3k/Modules/_ctypes/libffi/include/ffi.h.in	(original)
+++ python/branches/py3k/Modules/_ctypes/libffi/include/ffi.h.in	Fri Apr  4 21:53:14 2008
@@ -57,7 +57,9 @@
 #endif
 
 /* Specify which architecture libffi is configured for. */
+#ifndef @TARGET@
 #define @TARGET@
+#endif
 
 /* ---- System configuration information --------------------------------- */
 

Deleted: /python/branches/py3k/Modules/_ctypes/libffi/libffi.pc.in
==============================================================================
--- /python/branches/py3k/Modules/_ctypes/libffi/libffi.pc.in	Fri Apr  4 21:53:14 2008
+++ (empty file)
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=${libdir}/@PACKAGE_NAME at -@PACKAGE_VERSION@/include
-
-Name: @PACKAGE_NAME@
-Description: Library supporting Foreign Function Interfaces
-Version: @PACKAGE_VERSION@
-Libs: -lffi
-Cflags: -I${includedir}

Modified: python/branches/py3k/Modules/_ctypes/libffi/src/x86/ffi.c
==============================================================================
--- python/branches/py3k/Modules/_ctypes/libffi/src/x86/ffi.c	(original)
+++ python/branches/py3k/Modules/_ctypes/libffi/src/x86/ffi.c	Fri Apr  4 21:53:14 2008
@@ -349,14 +349,14 @@
     {
       FFI_INIT_TRAMPOLINE (&closure->tramp[0],
                            &ffi_closure_SYSV,
-                           (void*)closure);
+                           (void*)codeloc);
     }
 #ifdef X86_WIN32
   else if (cif->abi == FFI_STDCALL)
     {
       FFI_INIT_TRAMPOLINE_STDCALL (&closure->tramp[0],
                                    &ffi_closure_STDCALL,
-                                   (void*)closure, cif->bytes);
+                                   (void*)codeloc, cif->bytes);
     }
 #endif
   else

More information about the Python-3000-checkins mailing list