libffi: Sync with libffi 3.4.2

[thirdparty/gcc.git] / libffi / src / arc / ffi.c

diff --git a/libffi/src/arc/ffi.c b/libffi/src/arc/ffi.c
index 32f82a7d5bb54fcb674c43590f4d9bfa646e69ad..4d10b21a5d95d9a7a4ec1fa2991d2dd2680d8b97 100644 (file)
--- a/libffi/src/arc/ffi.c
+++ b/libffi/src/arc/ffi.c
@@ -46,12 +46,10 @@ void
 ffi_prep_args (char *stack, extended_cif * ecif)
 {
   unsigned int i;
-  int tmp;
   void **p_argv;
   char *argp;
   ffi_type **p_arg;
 
-  tmp = 0;
   argp = stack;
 
   if (ecif->cif->rtype->type == FFI_TYPE_STRUCT)
@@ -73,7 +71,7 @@ ffi_prep_args (char *stack, extended_cif * ecif)
 
       /* Align if necessary.  */
       if ((alignment - 1) & (unsigned) argp)
-       argp = (char *) ALIGN (argp, alignment);
+       argp = (char *) FFI_ALIGN (argp, alignment);
 
       z = (*p_arg)->size;
       if (z < sizeof (int))
@@ -225,7 +223,7 @@ ffi_closure_inner_ARCompact (ffi_closure * closure, void *rvalue,
 
       /* Align if necessary.  */
       if ((alignment - 1) & (unsigned) argp)
-       argp = (char *) ALIGN (argp, alignment);
+       argp = (char *) FFI_ALIGN (argp, alignment);
 
       z = (*p_argt)->size;
       *p_argv = (void *) argp;