This is the mail archive of the
libffi-discuss@sourceware.org
mailing list for the libffi project.
Fix powerpc breakage from 6e8a4460
- From: Alan Modra <amodra at gmail dot com>
- To: libffi-discuss at sourceware dot org
- Cc: Richard Henderson <rth at redhat dot com>, "Lynn A. Boger" <laboger at linux dot vnet dot ibm dot com>
- Date: Mon, 10 Nov 2014 14:54:42 +1030
- Subject: Fix powerpc breakage from 6e8a4460
- Authentication-results: sourceware.org; auth=none
The addition of FFI_TYPE_COMPLEX broke powerpc libffi, showing up as
four testsuite failures on powerpc64le. This fixes the breakage and
ensures a more spectacular set of failures if something like this
happens again.
* src/powerpc/ffitarget.h: #error on unexpected FFI_TYPE_LAST.
(FFI_PPC_TYPE_LAST): Define.
(FFI_TYPE_UINT128): Define in terms of FFI_PPC_TYPE_LAST.
(FFI_SYSV_TYPE_SMALL_STRUCT, FFI_V2_TYPE_FLOAT_HOMOG): Likewise.
(FFI_V2_TYPE_DOUBLE_HOMOG, FFI_V2_TYPE_SMALL_STRUCT): Likewise.
---
src/powerpc/ffitarget.h | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/powerpc/ffitarget.h b/src/powerpc/ffitarget.h
index b47b0f5..84aa586 100644
--- a/src/powerpc/ffitarget.h
+++ b/src/powerpc/ffitarget.h
@@ -142,19 +142,30 @@ typedef enum ffi_abi {
# define FFI_EXTRA_CIF_FIELDS unsigned nfixedargs
#endif
-/* For additional types like the below, take care about the order in
- ppc_closures.S. They must follow after the FFI_TYPE_LAST. */
+/* ppc_closure.S and linux64_closure.S expect this. */
+#define FFI_PPC_TYPE_LAST FFI_TYPE_POINTER
+
+/* We define additional types below. If generic types are added that
+ must be supported by powerpc libffi then it is likely that
+ FFI_PPC_TYPE_LAST needs increasing *and* the jump tables in
+ ppc_closure.S and linux64_closure.S be extended. */
+
+#if !(FFI_TYPE_LAST == FFI_PPC_TYPE_LAST \
+ || (FFI_TYPE_LAST == FFI_TYPE_COMPLEX \
+ && !defined FFI_TARGET_HAS_COMPLEX_TYPE))
+# error "You likely have a broken powerpc libffi"
+#endif
/* Needed for soft-float long-double-128 support. */
-#define FFI_TYPE_UINT128 (FFI_TYPE_LAST + 1)
+#define FFI_TYPE_UINT128 (FFI_PPC_TYPE_LAST + 1)
/* Needed for FFI_SYSV small structure returns. */
-#define FFI_SYSV_TYPE_SMALL_STRUCT (FFI_TYPE_LAST + 2)
+#define FFI_SYSV_TYPE_SMALL_STRUCT (FFI_PPC_TYPE_LAST + 2)
/* Used by ELFv2 for homogenous structure returns. */
-#define FFI_V2_TYPE_FLOAT_HOMOG (FFI_TYPE_LAST + 1)
-#define FFI_V2_TYPE_DOUBLE_HOMOG (FFI_TYPE_LAST + 2)
-#define FFI_V2_TYPE_SMALL_STRUCT (FFI_TYPE_LAST + 3)
+#define FFI_V2_TYPE_FLOAT_HOMOG (FFI_PPC_TYPE_LAST + 1)
+#define FFI_V2_TYPE_DOUBLE_HOMOG (FFI_PPC_TYPE_LAST + 2)
+#define FFI_V2_TYPE_SMALL_STRUCT (FFI_PPC_TYPE_LAST + 3)
#if _CALL_ELF == 2
# define FFI_TRAMPOLINE_SIZE 32
--
Alan Modra
Australia Development Lab, IBM