merge 3.4.
This commit is contained in:
commit
be1cd50eb1
|
@ -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'],
|
||||
|
|
|
@ -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'],
|
||||
|
|
Loading…
Reference in New Issue