summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2014-08-09 22:01:04 (GMT)
committerdoko@ubuntu.com <doko@ubuntu.com>2014-08-09 22:01:04 (GMT)
commit3b48af018f6a7e7d1d0ec5acefe2890361dbf832 (patch)
tree1a44253a9ca96ff0829741585963111c9488e17c /Modules
parent6a66f155dfb759ddbf26195f2f2f68aba09d3a71 (diff)
downloadcpython-3b48af018f6a7e7d1d0ec5acefe2890361dbf832.zip
cpython-3b48af018f6a7e7d1d0ec5acefe2890361dbf832.tar.gz
cpython-3b48af018f6a7e7d1d0ec5acefe2890361dbf832.tar.bz2
- Issue #22176: Fix build failure on ARM with -Werror=declaration-after-statement
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ctypes/libffi.diff23
-rw-r--r--Modules/_ctypes/libffi/src/arm/ffi.c6
2 files changed, 26 insertions, 3 deletions
diff --git a/Modules/_ctypes/libffi.diff b/Modules/_ctypes/libffi.diff
index 9db80d3..ffa7baf 100644
--- a/Modules/_ctypes/libffi.diff
+++ b/Modules/_ctypes/libffi.diff
@@ -184,3 +184,26 @@ diff -urN libffi-3.1/src/dlmalloc.c libffi/src/dlmalloc.c
set_lock(m, locked);
}
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;
diff --git a/Modules/_ctypes/libffi/src/arm/ffi.c b/Modules/_ctypes/libffi/src/arm/ffi.c
index 7cd9289..6691ab5 100644
--- a/Modules/_ctypes/libffi/src/arm/ffi.c
+++ b/Modules/_ctypes/libffi/src/arm/ffi.c
@@ -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)
{
- // 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 @@ int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space)
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;