re PR libffi/64572 (r219477 breaks bootstrap on x86_64 darwin)

PR libffi/64572

        * include/ffi.h.in (FFI_TYPE_LAST): Set to COMPLEX only if complex
        numbers are supported by the backend.

From-SVN: r219688

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 6893ac5e9769446fbf99fde11c14f130c6c1acb6..562e5383b7db628434e49547708d74ea4d12d140 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-15  Richard Henderson  <rth@redhat.com>
+
+       PR libffi/64572
+       * include/ffi.h.in (FFI_TYPE_LAST): Set to COMPLEX only if complex
+       numbers are supported by the backend.
+
 2015-01-13  Kaz Kojima  <kkojima@gcc.gnu.org>
 
        * configure.host: Remove extra brackets for sh.

diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in
index c43d52fd51faf0e9c68805675d3846821109395e..191aef7bd3fd9d02dcc18652feba146d29653f2c 100644 (file)
--- a/libffi/include/ffi.h.in
+++ b/libffi/include/ffi.h.in
@@ -494,7 +494,13 @@ void ffi_call(ffi_cif *cif,
 #define FFI_TYPE_COMPLEX    15
 
 /* This should always refer to the last type code (for sanity checks) */
-#define FFI_TYPE_LAST       FFI_TYPE_COMPLEX
+/* ??? Ideally, anyway.  There are assembly files that still depend
+   on this not including COMPLEX.  */
+#ifdef FFI_TARGET_HAS_COMPLEX_TYPE
+# define FFI_TYPE_LAST      FFI_TYPE_COMPLEX
+#else
+# define FFI_TYPE_LAST      FFI_TYPE_POINTER
+#endif
 
 #ifdef __cplusplus
 }