Skip to content

Commit 424b09b

Browse files
author
thomas.heller
committed
Merged changes from libffi3-branch.
The bundled libffi copy is now in sync with the recently released libffi3.0.4 version, apart from some small changes to Modules/_ctypes/libffi/configure.ac. I gave up on using libffi3 files on os x. Instead, static configuration with files from pyobjc is used. git-svn-id: http://svn.python.org/projects/python/trunk@61234 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent abd6eef commit 424b09b

100 files changed

Lines changed: 38818 additions & 3738 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Modules/_ctypes/libffi/LICENSE‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
libffi - Copyright (c) 1996-2003 Red Hat, Inc.
1+
libffi - Copyright (c) 1996-2008 Red Hat, Inc and others.
2+
See source files for details.
23

34
Permission is hereby granted, free of charge, to any person obtaining
45
a copy of this software and associated documentation files (the
@@ -11,10 +12,10 @@ the following conditions:
1112
The above copyright notice and this permission notice shall be included
1213
in all copies or substantial portions of the Software.
1314

14-
THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
15-
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
15+
THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1617
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17-
IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
18-
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20-
OTHER DEALINGS IN THE SOFTWARE.
18+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎Modules/_ctypes/libffi/Makefile.am‎

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
## Process this with automake to create Makefile.in
2+
3+
AUTOMAKE_OPTIONS = foreign subdir-objects
4+
5+
SUBDIRS = include testsuite man
6+
7+
EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
8+
src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
9+
src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
10+
src/cris/ffi.c src/cris/sysv.S src/cris/ffitarget.h \
11+
src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h \
12+
src/ia64/unix.S \
13+
src/mips/ffi.c src/mips/n32.S src/mips/o32.S \
14+
src/mips/ffitarget.h \
15+
src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h \
16+
src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h \
17+
src/powerpc/ffi.c src/powerpc/sysv.S \
18+
src/powerpc/linux64.S src/powerpc/linux64_closure.S \
19+
src/powerpc/ppc_closure.S src/powerpc/asm.h \
20+
src/powerpc/aix.S src/powerpc/darwin.S \
21+
src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
22+
src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h \
23+
src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h \
24+
src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h \
25+
src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h \
26+
src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h \
27+
src/sparc/ffi.c src/x86/darwin64.S \
28+
src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \
29+
src/x86/freebsd.S \
30+
src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \
31+
src/pa/ffitarget.h src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S \
32+
src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
33+
libtool-version ChangeLog.libffi
34+
35+
info_TEXINFOS = doc/libffi.texi
36+
37+
## ################################################################
38+
39+
##
40+
## This section is for make and multilib madness.
41+
##
42+
43+
# Work around what appears to be a GNU make bug handling MAKEFLAGS
44+
# values defined in terms of make variables, as is the case for CC and
45+
# friends when we are called from the top level Makefile.
46+
AM_MAKEFLAGS = \
47+
"AR_FLAGS=$(AR_FLAGS)" \
48+
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
49+
"CFLAGS=$(CFLAGS)" \
50+
"CXXFLAGS=$(CXXFLAGS)" \
51+
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
52+
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
53+
"INSTALL=$(INSTALL)" \
54+
"INSTALL_DATA=$(INSTALL_DATA)" \
55+
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
56+
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
57+
"JC1FLAGS=$(JC1FLAGS)" \
58+
"LDFLAGS=$(LDFLAGS)" \
59+
"LIBCFLAGS=$(LIBCFLAGS)" \
60+
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
61+
"MAKE=$(MAKE)" \
62+
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
63+
"PICFLAG=$(PICFLAG)" \
64+
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
65+
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
66+
"SHELL=$(SHELL)" \
67+
"exec_prefix=$(exec_prefix)" \
68+
"infodir=$(infodir)" \
69+
"libdir=$(libdir)" \
70+
"prefix=$(prefix)" \
71+
"AR=$(AR)" \
72+
"AS=$(AS)" \
73+
"CC=$(CC)" \
74+
"CXX=$(CXX)" \
75+
"LD=$(LD)" \
76+
"NM=$(NM)" \
77+
"RANLIB=$(RANLIB)" \
78+
"DESTDIR=$(DESTDIR)"
79+
80+
MAKEOVERRIDES=
81+
82+
lib_LTLIBRARIES = libffi.la
83+
noinst_LTLIBRARIES = libffi_convenience.la
84+
85+
libffi_la_SOURCES = src/debug.c src/prep_cif.c src/types.c \
86+
src/raw_api.c src/java_raw_api.c src/closures.c
87+
88+
pkgconfigdir = $(libdir)/pkgconfig
89+
pkgconfig_DATA = libffi.pc
90+
91+
nodist_libffi_la_SOURCES =
92+
93+
if MIPS
94+
nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
95+
endif
96+
if X86
97+
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
98+
endif
99+
if X86_FREEBSD
100+
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/freebsd.S
101+
endif
102+
if X86_WIN32
103+
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win32.S
104+
endif
105+
if X86_DARWIN
106+
nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
107+
endif
108+
if SPARC
109+
nodist_libffi_la_SOURCES += src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
110+
endif
111+
if ALPHA
112+
nodist_libffi_la_SOURCES += src/alpha/ffi.c src/alpha/osf.S
113+
endif
114+
if IA64
115+
nodist_libffi_la_SOURCES += src/ia64/ffi.c src/ia64/unix.S
116+
endif
117+
if M32R
118+
nodist_libffi_la_SOURCES += src/m32r/sysv.S src/m32r/ffi.c
119+
endif
120+
if M68K
121+
nodist_libffi_la_SOURCES += src/m68k/ffi.c src/m68k/sysv.S
122+
endif
123+
if POWERPC
124+
nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
125+
endif
126+
if POWERPC_AIX
127+
nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
128+
endif
129+
if POWERPC_DARWIN
130+
nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
131+
endif
132+
if POWERPC_FREEBSD
133+
nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
134+
endif
135+
if ARM
136+
nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
137+
endif
138+
if LIBFFI_CRIS
139+
nodist_libffi_la_SOURCES += src/cris/sysv.S src/cris/ffi.c
140+
endif
141+
if FRV
142+
nodist_libffi_la_SOURCES += src/frv/eabi.S src/frv/ffi.c
143+
endif
144+
if S390
145+
nodist_libffi_la_SOURCES += src/s390/sysv.S src/s390/ffi.c
146+
endif
147+
if X86_64
148+
nodist_libffi_la_SOURCES += src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
149+
endif
150+
if SH
151+
nodist_libffi_la_SOURCES += src/sh/sysv.S src/sh/ffi.c
152+
endif
153+
if SH64
154+
nodist_libffi_la_SOURCES += src/sh64/sysv.S src/sh64/ffi.c
155+
endif
156+
if PA_LINUX
157+
nodist_libffi_la_SOURCES += src/pa/linux.S src/pa/ffi.c
158+
endif
159+
if PA_HPUX
160+
nodist_libffi_la_SOURCES += src/pa/hpux32.S src/pa/ffi.c
161+
endif
162+
163+
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
164+
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
165+
166+
AM_CFLAGS = -Wall -g -fexceptions
167+
168+
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
169+
170+
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
171+
AM_CCASFLAGS = $(AM_CPPFLAGS)
172+
173+
# No install-html or install-pdf support in automake yet
174+
.PHONY: install-html install-pdf
175+
install-html:
176+
install-pdf:
177+

0 commit comments

Comments
 (0)