Fix for AArch64. Release as 3.2.1.

atgreen · atgreen · commit 20562ac0427c · 2014-11-12T07:00:59.000-05:00
diff --git a/README b/README
@@ -1,7 +1,7 @@
 Status
 ======
 
-libffi-3.2 was released on November 11, 2014.  Check the libffi web
+libffi-3.2.1 was released on November 12, 2014.  Check the libffi web
 page for updates: <URL:http://sourceware.org/libffi/>.
 
 
@@ -182,6 +182,9 @@ History
 
 See the git log for details at http://github.com/atgreen/libffi.
 
+3.2.1 Nov-12-14
+        Build fix for non-iOS AArch64 targets.
+
 3.2 Nov-11-14
         Add C99 Complex Type support (currently only supported on
           s390).
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure
 
 AC_PREREQ(2.68)
 
-AC_INIT([libffi], [3.2], [http://github.com/atgreen/libffi/issues])
+AC_INIT([libffi], [3.2.1], [http://github.com/atgreen/libffi/issues])
 AC_CONFIG_HEADERS([fficonfig.h])
 
 AC_CANONICAL_SYSTEM
diff --git a/doc/version.texi b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 8 November 2014
 @set UPDATED-MONTH November 2014
-@set EDITION 3.2
-@set VERSION 3.2
+@set EDITION 3.2.1
+@set VERSION 3.2.1
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,9 @@ ffi_prep_cif_machdep (ffi_cif *cif)`
`782`	`782`	`}`
`783`	`783`	`}`
`784`	`784`
	`785`	`+#if defined (__APPLE__)`
`785`	`786`	`cif->aarch64_nfixedargs = 0;`
	`787`	`+#endif`
`786`	`788`
`787`	`789`	`return FFI_OK;`
`788`	`790`	`}`