Fix #1563807: _ctypes built on AIX fails with ld ffi error.

The contents of ffi_darwin.c must be compiled unless __APPLE__ is
defined and __ppc__ is not.

Will backport.

diff --git a/Misc/NEWS b/Misc/NEWS
index a0403dec0a2f18f3d76efddd7c9e41d6eb4b0b59..b2fbe7ff18b1ca827155633c445b13fe3fdea51b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -101,6 +101,8 @@ Core and builtins
 Library
 -------
 
+- Bug #1563807: _ctypes built on AIX fails with ld ffi error.
+
 - Bug #1598620: A ctypes Structure cannot contain itself.
 
 - Patch #1362975: Rework CodeContext indentation algorithm to

diff --git a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
index 1595b00a5ff1dcfcb7296482aba426db721bbec7..55af70cd8b2d174e059c7acbb2fb364dadd3563d 100644 (file)
--- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
+++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
@@ -1,4 +1,4 @@
-#ifdef __ppc__
+#if !(defined(__APPLE__) && !defined(__ppc__))
 /* -----------------------------------------------------------------------
    ffi.c - Copyright (c) 1998 Geoffrey Keating