public inbox for libffi-discuss@sourceware.org
 help / color / mirror / Atom feed
* [patch] fix build error with -Werror=declaration-after-statement
@ 2014-08-10 13:08 Matthias Klose
  2014-09-20 10:37 ` Anthony Green
  0 siblings, 1 reply; 2+ messages in thread
From: Matthias Klose @ 2014-08-10 13:08 UTC (permalink / raw)
  To: libffi-discuss

seen while merging the 3.1 release into the python sources. The build fails when
built with -Werror=declaration-after-statement

  Matthias

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;

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch] fix build error with -Werror=declaration-after-statement
  2014-08-10 13:08 [patch] fix build error with -Werror=declaration-after-statement Matthias Klose
@ 2014-09-20 10:37 ` Anthony Green
  0 siblings, 0 replies; 2+ messages in thread
From: Anthony Green @ 2014-09-20 10:37 UTC (permalink / raw)
  To: Matthias Klose; +Cc: libffi-discuss

Matthias Klose <doko@ubuntu.com> writes:

> seen while merging the 3.1 release into the python sources. The build fails when
> built with -Werror=declaration-after-statement

Thanks, Matthias.  Committed.


>
>   Matthias
>
> 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;

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-09-20 10:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-10 13:08 [patch] fix build error with -Werror=declaration-after-statement Matthias Klose
2014-09-20 10:37 ` Anthony Green

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).