summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2015-01-15 13:01:21 -0800
committerRichard Henderson <rth@gcc.gnu.org>2015-01-15 13:01:21 -0800
commit58b59d5ee7ac732d67736bc3654b6dc6c9af9e44 (patch)
tree3e581b4c4affc4ef16c9ae5451b149886357f878 /libffi
parent134efa824828834466593e60f7786669da3adb39 (diff)
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
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog6
-rw-r--r--libffi/include/ffi.h.in8
2 files changed, 13 insertions, 1 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 6893ac5e976..562e5383b7d 100644
--- 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 c43d52fd51f..191aef7bd3f 100644
--- 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
}