Merge branch 'master' based on ksjogo/libffi

  Added a tvOS target in Xcode project. Misc Xcode project cleanup.
  Fix macOS build target in Xcode project.

# Conflicts:
#	src/aarch64/ffi.c
#	src/x86/ffi64.c

diff --cc src/aarch64/ffi.c
index c4a6151,ed303ea..4400b61
--- 1/src/aarch64/ffi.c
--- 2/src/aarch64/ffi.c
+++ b/src/aarch64/ffi.c
@@@ -528,7 -528,7 +528,7 @@@ ffi_prep_cif_machdep (ffi_cif *cif
        }
  
    /* Round the stack up to a multiple of the stack alignment requirement. */
-   cif->bytes = FFI_ALIGN(bytes, 16);
 -  cif->bytes = (unsigned) ALIGN(bytes, 16);
++  cif->bytes = (unsigned) FFI_ALIGN(bytes, 16);
    cif->flags = flags;
  #if defined (__APPLE__)
    cif->aarch64_nfixedargs = 0;

diff --cc src/closures.c
Simple merge

diff --cc src/x86/ffi64.c
index 757930b,4019599..646fb5a
--- 1/src/x86/ffi64.c
--- 2/src/x86/ffi64.c
+++ b/src/x86/ffi64.c
@@@ -542,7 -543,7 +543,7 @@@ ffi_prep_cif_machdep (ffi_cif *cif
      flags |= UNIX64_FLAG_XMM_ARGS;
  
    cif->flags = flags;
-   cif->bytes = FFI_ALIGN (bytes, 8);
 -  cif->bytes = (unsigned) ALIGN (bytes, 8);
++  cif->bytes = (unsigned) FFI_ALIGN (bytes, 8);
  
    return FFI_OK;
  }