diff options
| author | Jean-Luc Jumpertz <jean-luc@celedev.eu> | 2017-10-23 15:02:29 +0200 |
|---|---|---|
| committer | Jean-Luc Jumpertz <jean-luc@celedev.eu> | 2017-10-23 15:02:29 +0200 |
| commit | 181fc4cc9ca211f3bc8209cecf3b2348b0674e21 (patch) | |
| tree | 323df740d66f719277797c976687c460d3265b25 /src/aarch64 | |
| parent | 8d26e8c6da23b10331181a4bbf837f479ce5d7d2 (diff) | |
| parent | 54529ba1db9974b5efcbd2e893c44b6b01b0b2c8 (diff) | |
| download | libffi-181fc4cc9ca211f3bc8209cecf3b2348b0674e21.tar.gz | |
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
Diffstat (limited to 'src/aarch64')
| -rw-r--r-- | src/aarch64/ffi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/aarch64/ffi.c b/src/aarch64/ffi.c index c4a6151..4400b61 100644 --- a/src/aarch64/ffi.c +++ b/src/aarch64/ffi.c @@ -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; |