fix libffi build on AIX (closes #18248)

2d11e190 · Benjamin Peterson · 128fb918 · 2d11e190 · 2d11e190 · 2d11e190
Commit 2d11e190 authored 11 years ago by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Misc/NEWS Misc/NEWS +2 -0

Modules/_ctypes/libffi.diff Modules/_ctypes/libffi.diff +1 -1

Modules/_ctypes/libffi/fficonfig.py.in Modules/_ctypes/libffi/fficonfig.py.in +1 -1

No files found.
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Core and Builtins
 Library
 -------

+- Issue #18248: Fix libffi build on AIX.
+
 - Issue #18259: Declare sethostname in socketmodule.c for AIX

 - Issue #18167: cgi.FieldStorage no more fails to handle multipart/form-data

--- a/Modules/_ctypes/libffi.diff
+++ b/Modules/_ctypes/libffi.diff
@@ -135,7 +135,7 @@ diff -r -N -u libffi.orig/configure.ac libffi/configure.ac
 +    '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'],

--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -16,7 +16,7 @@ ffi_platforms = {
    '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'],