[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#18248)

Wed Jun 19 18:02:55 CEST 2013

http://hg.python.org/cpython/rev/974d4844d5a7
changeset: 84220:974d4844d5a7
parent: 84218:959f4ce4d590
parent: 84219:00082406e13f
user: Benjamin Peterson <benjamin at python.org>
date: Wed Jun 19 09:01:58 2013 -0700
summary:
 merge 3.3 (#18248)
files:
 Misc/NEWS | 2 ++
 Modules/_ctypes/libffi.diff | 2 +-
 Modules/_ctypes/libffi/fficonfig.py.in | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,8 @@
 Library
 -------
 
+- Issue #18248: Fix libffi build on AIX.
+
 - Issue #18259: Declare sethostname in socketmodule.c for AIX
 
 - Issue #18147: Add diagnostic functions to ssl.SSLContext(). get_ca_list()
diff --git a/Modules/_ctypes/libffi.diff b/Modules/_ctypes/libffi.diff
--- a/Modules/_ctypes/libffi.diff
+++ b/Modules/_ctypes/libffi.diff
@@ -135,7 +135,7 @@
 + 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
 + 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
 + 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'],
-+ 'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
++ 'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
 + 'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
 + 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
 + 'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -16,7 +16,7 @@
 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'],
- 'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
+ 'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
 'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
 'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
-- 
Repository URL: http://hg.python.org/cpython
