Mercurial > cpython-lru_cache-weakref

annotate Modules/_ctypes/libffi.diff @ 81343:3a7cd8efc19f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#16852: merge with 3.3.
author Ezio Melotti <ezio.melotti@gmail.com>
date Thu, 10 Jan 2013 03:29:45 +0200
parents 25421e1c48bb
children f23274357fc8 7727be7613f9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
1 --- libffi.orig/configure.ac 2012-04-12 05:10:51.000000000 +0200
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
2 +++ libffi/configure.ac 2012-06-26 15:42:42.477498938 +0200
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
3 @@ -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
4 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
5 +#
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
6 +# file from libffi - slightly patched for ctypes
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
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
8
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
9 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
10
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
11 @@ -114,6 +117,9 @@
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
12 i?86-*-solaris2.1[[0-9]]*)
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
13 TARGET=X86_64; 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
14 ;;
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
15 + 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
16 + 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
17 + ;;
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
18 i?86-*-*)
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
19 TARGET=X86_64; 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
20 ;;
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
21 @@ -131,12 +137,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
22 ;;
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
23
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
24 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
25 - 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
26 + 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
27 ;;
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
28 mips*-*-linux* | mips*-*-openbsd*)
59636
db379a90b46e Merged revisions 78968-78969 via svnmerge from
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
29 # Support 128-bit long double for NewABI.
db379a90b46e Merged revisions 78968-78969 via svnmerge from
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
30 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
31 - TARGET=MIPS; TARGETDIR=mips
59636
db379a90b46e Merged revisions 78968-78969 via svnmerge from
Matthias Klose <doko@ubuntu.com>
parents: 53920
diff changeset
32 + 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
33 ;;
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
34
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
35 moxie-*-*)
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
36 @@ -212,7 +218,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
37 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
38 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
39
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
40 -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
41 +AM_CONDITIONAL(MIPS,[expr x$TARGET : 'xMIPS' > /dev/null])
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
42 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
43 AM_CONDITIONAL(X86, test x$TARGET = xX86)
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
44 AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
45 @@ -499,4 +505,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
46
59725
91431b058478 Merged revisions 79098 via svnmerge from
Matthias Klose <doko@ubuntu.com>
parents: 59636
diff changeset
47 AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc)
91431b058478 Merged revisions 79098 via svnmerge from
Matthias Klose <doko@ubuntu.com>
parents: 59636
diff changeset
48
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
49 +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
50 +
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
51 +AC_CONFIG_FILES(fficonfig.py)
59725
91431b058478 Merged revisions 79098 via svnmerge from
Matthias Klose <doko@ubuntu.com>
parents: 59636
diff changeset
52 +
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
53 AC_OUTPUT
77807
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
54 --- 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: 59729
diff changeset
55 +++ 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: 59729
diff changeset
56 @@ -0,0 +1,35 @@
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
57 +ffi_sources = """
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
58 +src/prep_cif.c
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
59 +src/closures.c
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
60 +src/dlmalloc.c
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
61 +""".split()
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
62 +
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
63 +ffi_platforms = {
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
64 + '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: 59729
diff changeset
65 + '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: 59729
diff changeset
66 + 'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
67 + '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: 59729
diff changeset
68 + '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: 59729
diff changeset
69 + '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: 59729
diff changeset
70 + 'ALPHA': ['src/alpha/ffi.c', 'src/alpha/osf.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
71 + 'IA64': ['src/ia64/ffi.c', 'src/ia64/unix.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
72 + 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
73 + 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
74 + '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: 59729
diff changeset
75 + '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: 59729
diff changeset
76 + '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: 59729
diff changeset
77 + 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
78 + '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: 59729
diff changeset
79 + 'FRV': ['src/frv/eabi.S', 'src/frv/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
80 + 'S390': ['src/s390/sysv.S', 'src/s390/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
81 + '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: 59729
diff changeset
82 + 'SH': ['src/sh/sysv.S', 'src/sh/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
83 + 'SH64': ['src/sh64/sysv.S', 'src/sh64/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
84 + 'PA': ['src/pa/linux.S', 'src/pa/ffi.c'],
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
85 + '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: 59729
diff changeset
86 + '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: 59729
diff changeset
87 +}
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
88 +
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
89 +ffi_sources += ffi_platforms['@TARGET@']
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
90 +
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
91 +ffi_cflags = '@CFLAGS@'
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
92 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: 59729
diff changeset
93 --- 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: 59729
diff changeset
94 +++ 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: 59729
diff changeset
95 @@ -457,6 +457,11 @@
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
96 #define LACKS_ERRNO_H
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
97 #define MALLOC_FAILURE_ACTION
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
98 #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: 59729
diff changeset
99 +#elif !defined _GNU_SOURCE
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
100 +/* mremap() on Linux requires this via sys/mman.h
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
101 + * See roundup issue 10309
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
102 + */
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
103 +#define _GNU_SOURCE 1
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
104 #endif /* WIN32 */
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
105
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
106 #ifdef __OS2__
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
107 diff -urN libffi-3.0.11/src/sparc/v8.S libffi/src/sparc/v8.S
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
108 --- libffi-3.0.11/src/sparc/v8.S 2012-04-12 04:46:06.000000000 +0200
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
109 +++ libffi/src/sparc/v8.S 2011-03-13 05:15:04.000000000 +0100
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
110 @@ -213,6 +213,10 @@
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
111 be,a done1
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
112 ldd [%fp-8], %i0
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
113
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
114 + cmp %o0, FFI_TYPE_UINT64
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
115 + be,a done1
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
116 + ldd [%fp-8], %i0
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
117 +
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
118 ld [%fp-8], %i0
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
119 done1:
25421e1c48bb - Issue #15194: Update libffi to the 3.0.11 release.
doko@ubuntu.com
parents: 59729
diff changeset
120 jmp %i7+8