summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2014-08-09 21:52:34 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2014-08-09 21:52:34 (GMT)
commit6a66f155dfb759ddbf26195f2f2f68aba09d3a71 (patch)
tree5c7c85fb55b124454aa2787124fcca70e9d02c2e /Modules
parent736a9133219ec75524d90a976d2e35c76d544b6e (diff)
downloadcpython-6a66f155dfb759ddbf26195f2f2f68aba09d3a71.zip
cpython-6a66f155dfb759ddbf26195f2f2f68aba09d3a71.tar.gz
cpython-6a66f155dfb759ddbf26195f2f2f68aba09d3a71.tar.bz2
- Issue #22176: Add src/x86/win32.S for x86 libffi builds.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ctypes/libffi.diff2
-rw-r--r--Modules/_ctypes/libffi/fficonfig.py.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/libffi.diff b/Modules/_ctypes/libffi.diff
index ba8fcdd..9db80d3 100644
--- a/Modules/_ctypes/libffi.diff
+++ b/Modules/_ctypes/libffi.diff
@@ -124,7 +124,7 @@ diff -urN libffi-3.1/fficonfig.py.in libffi/fficonfig.py.in
+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 --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
index 15c349b..d102498 100644
--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -6,7 +6,7 @@ src/closures.c
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'],