Mercurial > cpython-lru_cache-weakref

annotate Modules/_ctypes/libffi.diff @ 84007:dbfbdf2b5c19 3.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix #17967: For ftp urls CWD to target instead of hopping to each directory towards target. This fixes a bug where target is accessible, but parent directories are restricted.
author Senthil Kumaran <senthil@uthcode.com>
date Sat, 01 Jun 2013 08:27:06 -0700
parents f23274357fc8
children 00082406e13f a94b3b4599f1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
1 diff -r -N -u libffi.orig/autom4te.cache/output.0 libffi/autom4te.cache/output.0
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
2 diff -r -N -u libffi.orig/configure libffi/configure
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
3 --- libffi.orig/configure 2013-03-17 15:37:50.000000000 -0700
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
4 +++ libffi/configure 2013-03-18 15:11:39.611575163 -0700
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
5 @@ -13368,6 +13368,10 @@
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
6 fi
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
7 ;;
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
8
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
9 + i*86-*-nto-qnx*)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
10 + TARGET=X86; TARGETDIR=x86
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
11 + ;;
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
12 +
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
13 x86_64-*-darwin*)
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
14 TARGET=X86_DARWIN; TARGETDIR=x86
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
15 ;;
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
16 @@ -13426,12 +13430,12 @@
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
17 ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
18
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
19 mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
20 - TARGET=MIPS; TARGETDIR=mips
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
21 + TARGET=MIPS_IRIX; TARGETDIR=mips
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
22 ;;
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
23 mips*-*-linux* | mips*-*-openbsd*)
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
24 # Support 128-bit long double for NewABI.
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
25 HAVE_LONG_DOUBLE='defined(__mips64)'
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
26 - TARGET=MIPS; TARGETDIR=mips
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
27 + TARGET=MIPS_IRIX; TARGETDIR=mips
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
28 ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
29
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
30 powerpc*-*-linux* | powerpc-*-sysv*)
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
31 @@ -13491,7 +13495,7 @@
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
32 as_fn_error $? "\"libffi has not been ported to $host.\"" "$LINENO" 5
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
33 fi
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
34
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
35 - if test x$TARGET = xMIPS; then
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
36 + if expr x$TARGET : 'xMIPS' > /dev/null; then
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
37 MIPS_TRUE=
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
38 MIPS_FALSE='#'
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
39 else
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
40 @@ -14862,6 +14866,12 @@
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
41 ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc"
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
42
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
43
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
44 +ac_config_links="$ac_config_links include/ffi_common.h:include/ffi_common.h"
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
45 +
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
46 +
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
47 +ac_config_files="$ac_config_files fficonfig.py"
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
48 +
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
49 +
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
50 cat >confcache <<\_ACEOF
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
51 # This file is a shell script that caches the results of configure
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
52 # tests run on this system so they can be shared between configure
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
53 @@ -16047,6 +16057,8 @@
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
54 "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
55 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
56 "libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
57 + "include/ffi_common.h") CONFIG_LINKS="$CONFIG_LINKS include/ffi_common.h:include/ffi_common.h" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
58 + "fficonfig.py") CONFIG_FILES="$CONFIG_FILES fficonfig.py" ;;
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
59
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
60 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
61 esac
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
62 diff -r -N -u libffi.orig/configure.ac libffi/configure.ac
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
63 --- libffi.orig/configure.ac 2013-03-17 15:37:50.000000000 -0700
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
64 +++ libffi/configure.ac 2013-03-18 15:11:11.392989136 -0700
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
65 @@ -1,4 +1,7 @@
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
66 dnl Process this with autoconf to create configure
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
67 +#
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
68 +# file from libffi - slightly patched for Python's ctypes
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
69 +#
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
70
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
71 AC_PREREQ(2.68)
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
72
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
73 @@ -146,6 +149,10 @@
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
74 fi
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
75 ;;
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
76
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
77 + i*86-*-nto-qnx*)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
78 + TARGET=X86; TARGETDIR=x86
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
79 + ;;
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
80 +
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
81 x86_64-*-darwin*)
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
82 TARGET=X86_DARWIN; TARGETDIR=x86
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
83 ;;
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
84 @@ -204,12 +211,12 @@
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
85 ;;
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
86
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
87 mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
88 - TARGET=MIPS; TARGETDIR=mips
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
89 + TARGET=MIPS_IRIX; TARGETDIR=mips
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
90 ;;
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
91 mips*-*-linux* | mips*-*-openbsd*)
59626
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
92 # Support 128-bit long double for NewABI.
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
93 HAVE_LONG_DOUBLE='defined(__mips64)'
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
94 - TARGET=MIPS; TARGETDIR=mips
59626
eefd521f19ce - Issue #8142: Update libffi to the 3.0.9 release.
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
95 + TARGET=MIPS_IRIX; TARGETDIR=mips
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
96 ;;
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
97
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
98 powerpc*-*-linux* | powerpc-*-sysv*)
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
99 @@ -269,7 +276,7 @@
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
100 AC_MSG_ERROR(["libffi has not been ported to $host."])
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
101 fi
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
102
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
103 -AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
104 +AM_CONDITIONAL(MIPS,[expr x$TARGET : 'xMIPS' > /dev/null])
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
105 AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN)
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
106 AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
107 AM_CONDITIONAL(X86, test x$TARGET = xX86)
82786
43e8da639462 Fixes issue #17192: Update the ctypes module's libffi to v3.0.13. This
Gregory P. Smith <greg@krypto.org>
parents: 59727
diff changeset
108 @@ -567,4 +574,8 @@
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
109
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
110 AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc)
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
111
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
112 +AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
113 +
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
114 +AC_CONFIG_FILES(fficonfig.py)
59724
b6387f43cddb Generate libffi's Makefiles again to be able to run the libffi testsuite
Matthias Klose <doko@ubuntu.com>
parents: 59626
diff changeset
115 +
53920
7a9e081ece4c Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
diff changeset
116 AC_OUTPUT
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
117 --- libffi-3.0.11/fficonfig.py.in 1970-01-01 01:00:00.000000000 +0100
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
118 +++ libffi/fficonfig.py.in 2012-03-15 01:04:27.000000000 +0100
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
119 @@ -0,0 +1,35 @@
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
120 +ffi_sources = """
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
121 +src/prep_cif.c
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
122 +src/closures.c
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
123 +src/dlmalloc.c
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
124 +""".split()
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
125 +
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
126 +ffi_platforms = {
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
127 + 'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
128 + 'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
129 + 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
130 + 'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
131 + 'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
132 + 'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
133 + 'ALPHA': ['src/alpha/ffi.c', 'src/alpha/osf.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
134 + 'IA64': ['src/ia64/ffi.c', 'src/ia64/unix.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
135 + 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
136 + 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
137 + 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
138 + 'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
139 + 'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
140 + 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
141 + 'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
142 + 'FRV': ['src/frv/eabi.S', 'src/frv/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
143 + 'S390': ['src/s390/sysv.S', 'src/s390/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
144 + 'X86_64': ['src/x86/ffi64.c', 'src/x86/unix64.S', 'src/x86/ffi.c', 'src/x86/sysv.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
145 + 'SH': ['src/sh/sysv.S', 'src/sh/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
146 + 'SH64': ['src/sh64/sysv.S', 'src/sh64/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
147 + 'PA': ['src/pa/linux.S', 'src/pa/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
148 + 'PA_LINUX': ['src/pa/linux.S', 'src/pa/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
149 + 'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
150 +}
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
151 +
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
152 +ffi_sources += ffi_platforms['@TARGET@']
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
153 +
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
154 +ffi_cflags = '@CFLAGS@'
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
155 diff -urN libffi-3.0.11/src/dlmalloc.c libffi/src/dlmalloc.c
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
156 --- libffi-3.0.11/src/dlmalloc.c 2012-04-12 04:46:06.000000000 +0200
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
157 +++ libffi/src/dlmalloc.c 2012-06-26 15:15:58.949547461 +0200
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
158 @@ -457,6 +457,11 @@
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
159 #define LACKS_ERRNO_H
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
160 #define MALLOC_FAILURE_ACTION
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
161 #define MMAP_CLEARS 0 /* WINCE and some others apparently don't clear */
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
162 +#elif !defined _GNU_SOURCE
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
163 +/* mremap() on Linux requires this via sys/mman.h
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
164 + * See roundup issue 10309
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
165 + */
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
166 +#define _GNU_SOURCE 1
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
167 #endif /* WIN32 */
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
168
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59727
diff changeset
169 #ifdef __OS2__