libffi: Sync with libffi 3.4.2

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

diff --git a/libffi/src/cris/ffi.c b/libffi/src/cris/ffi.c
index aaca5b1cbaa4d17732a0b3d8c8b612d8be9e1f64..9011fdec03a877521536ac8c2a64d0afe60d0816 100644 (file)
--- a/libffi/src/cris/ffi.c
+++ b/libffi/src/cris/ffi.c
@@ -29,7 +29,7 @@
 #include <ffi.h>
 #include <ffi_common.h>
 
-#define STACK_ARG_SIZE(x) ALIGN(x, FFI_SIZEOF_ARG)
+#define STACK_ARG_SIZE(x) FFI_ALIGN(x, FFI_SIZEOF_ARG)
 
 static ffi_status
 initialize_aggregate_packed_struct (ffi_type * arg)
@@ -190,7 +190,7 @@ ffi_prep_cif_core (ffi_cif * cif,
       FFI_ASSERT_VALID_TYPE (*ptr);
 
       if (((*ptr)->alignment - 1) & bytes)
-       bytes = ALIGN (bytes, (*ptr)->alignment);
+       bytes = FFI_ALIGN (bytes, (*ptr)->alignment);
       if ((*ptr)->type == FFI_TYPE_STRUCT)
        {
          if ((*ptr)->size > 8)