samsonium/libffi
1
0
Fork 0
mirror of https://github.com/partic2/libffi synced 2026-11-10 18:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' based on ksjogo/libffi

Browse Source 
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
This commit is contained in:
Jean-Luc Jumpertz
2017-10-23 15:02:29 +02:00
parent 8d26e8c6da 54529ba1db
commit 181fc4cc9c
5 changed files with 394 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aarch64/ffi.c
+2 -2
View File
@@ -231,7 +231,7 @@ is_vfp_type (const ffi_type *ty)
/* All tests succeeded. Encode the result. */
done:
return candidate * 4 + (4 - ele_count);
return candidate * 4 + (4 - (int)ele_count);
}
/* Representation of the procedure call argument marshalling
@@ -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) FFI_ALIGN(bytes, 16);
cif->flags = flags;
#if defined (__APPLE__)
cif->aarch64_nfixedargs = 0;