changeset:   92052:269ec4c568bd
branch:      3.4
parent:      92050:f73c8cf6261f
user:        doko@ubuntu.com
date:        Sat Aug 09 23:52:34 2014 +0200
files:       Modules/_ctypes/libffi.diff Modules/_ctypes/libffi/fficonfig.py.in
description:
- Issue #22176: Add src/x86/win32.S for x86 libffi builds.


diff -r f73c8cf6261f -r 269ec4c568bd Modules/_ctypes/libffi.diff
--- a/Modules/_ctypes/libffi.diff	Sat Aug 09 22:36:35 2014 +0200
+++ b/Modules/_ctypes/libffi.diff	Sat Aug 09 23:52:34 2014 +0200
@@ -124,7 +124,7 @@
 +ffi_platforms = {
 +    'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'],
 +    'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'],
-+    'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'],
++    'X86': ['src/x86/ffi.c', 'src/x86/sysv.S', 'src/x86/win32.S'],
 +    'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'],
 +    'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'],
 +    'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'],
diff -r f73c8cf6261f -r 269ec4c568bd Modules/_ctypes/libffi/fficonfig.py.in
--- a/Modules/_ctypes/libffi/fficonfig.py.in	Sat Aug 09 22:36:35 2014 +0200
+++ b/Modules/_ctypes/libffi/fficonfig.py.in	Sat Aug 09 23:52:34 2014 +0200
@@ -6,7 +6,7 @@
 ffi_platforms = {
     'MIPS_IRIX': ['src/mips/ffi.c', 'src/mips/o32.S', 'src/mips/n32.S'],
     'MIPS_LINUX': ['src/mips/ffi.c', 'src/mips/o32.S'],
-    'X86': ['src/x86/ffi.c', 'src/x86/sysv.S'],
+    'X86': ['src/x86/ffi.c', 'src/x86/sysv.S', 'src/x86/win32.S'],
     'X86_FREEBSD': ['src/x86/ffi.c', 'src/x86/freebsd.S'],
     'X86_WIN32': ['src/x86/ffi.c', 'src/x86/win32.S'],
     'SPARC': ['src/sparc/ffi.c', 'src/sparc/v8.S', 'src/sparc/v9.S'],