mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

- Merge 3.4

Browse source
This commit is contained in:
doko@ubuntu.com 2014-08-10 00:01:21 +02:00
commit a61d058bf9
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modules/_ctypes/libffi.diff
View file

@ -184,3 +184,26 @@ diff -urN libffi-3.1/src/dlmalloc.c libffi/src/dlmalloc.c
set_lock(m, locked); set_lock(m, locked);
} }
return (mspace)m; return (mspace)m;
diff -urN libffi-3.1/src/arm/ffi.c libffi/src/arm/ffi.c
--- libffi-3.1/src/arm/ffi.c Sat Aug 09 23:52:34 2014 +0200
+++ libffi/src/arm/ffi.c Sat Aug 09 23:58:38 2014 +0200
@@ -154,9 +154,6 @@
int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space)
{
- // make sure we are using FFI_VFP
- FFI_ASSERT(ecif->cif->abi == FFI_VFP);
-
register unsigned int i, vi = 0;
register void **p_argv;
register char *argp, *regp, *eo_regp;
@@ -165,6 +162,9 @@
char done_with_regs = 0;
char is_vfp_type;
+ // make sure we are using FFI_VFP
+ FFI_ASSERT(ecif->cif->abi == FFI_VFP);
+
/* the first 4 words on the stack are used for values passed in core
* registers. */
regp = stack;

6
Modules/_ctypes/libffi/src/arm/ffi.c
View file

@ -154,9 +154,6 @@ int ffi_prep_args_SYSV(char *stack, extended_cif *ecif, float *vfp_space)
int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space) int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space)
{ {
// make sure we are using FFI_VFP
FFI_ASSERT(ecif->cif->abi == FFI_VFP);
register unsigned int i, vi = 0; register unsigned int i, vi = 0;
register void **p_argv; register void **p_argv;
register char *argp, *regp, *eo_regp; register char *argp, *regp, *eo_regp;
@ -165,6 +162,9 @@ int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space)
char done_with_regs = 0; char done_with_regs = 0;
char is_vfp_type; char is_vfp_type;
// make sure we are using FFI_VFP
FFI_ASSERT(ecif->cif->abi == FFI_VFP);
/* the first 4 words on the stack are used for values passed in core /* the first 4 words on the stack are used for values passed in core
* registers. */ * registers. */
regp = stack; regp = stack;