[PATCH] Fix compile failure on AArch64 Linux builds

[PATCH] Fix compile failure on AArch64 Linux builds

[Alan Lawrence]

[-- Attachment #1: Type: text/plain, Size: 672 bytes --]

Hi,

commit 5df384077f3633ec8cf2e08f9199e5a44994dbad (Merge pull request #129 from 
frida/fix/darwin-aarch64-cif-prep // Fix non-variadic CIF initialization for 
Apple/ARM64) breaks building libffi on aarch64 linux (e.g. 
aarch64-none-linux-gnu), with error:

../src/aarch64/ffi.c: In function 'ffi_prep_cif_machdep':
../src/aarch64/ffi.c:785:6: error: 'ffi_cif' has no member named 
'aarch64_nfixedargs'
    cif->aarch64_nfixedargs = 0;
       ^
make[3]: *** [src/aarch64/ffi.lo] Error 1

Attached patch is a simple fix, tested on aarch64-none-linux-gnu. Is this OK for 
trunk (and if so, can someone with write access please commit)?

Thanks, Alan



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: libffi_aarch64_nfixedargs.patch --]
[-- Type: text/x-patch; name=libffi_aarch64_nfixedargs.patch, Size: 307 bytes --]

diff --git a/src/aarch64/ffi.c b/src/aarch64/ffi.c
index 5369ea4..cdb7816 100644
--- a/src/aarch64/ffi.c
+++ b/src/aarch64/ffi.c
@@ -782,7 +782,9 @@ ffi_prep_cif_machdep (ffi_cif *cif)
           }
     }
 
+#if defined (__APPLE__)
   cif->aarch64_nfixedargs = 0;
+#endif
 
   return FFI_OK;
 }