ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix powerpc breakage from 6e8a4460

Browse Source 
* 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.
This commit is contained in:
Alan Modra
2014-11-10 13:50:05 +10:30
parent 9ca43706f9
commit d3d06f4c94
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/powerpc/ffitarget.h
View File

@@ -142,19 +142,30 @@ typedef enum ffi_abi {
# define FFI_EXTRA_CIF_FIELDS unsigned nfixedargs # define FFI_EXTRA_CIF_FIELDS unsigned nfixedargs
#endif #endif
/* For additional types like the below, take care about the order in /* ppc_closure.S and linux64_closure.S expect this. */
ppc_closures.S. They must follow after the FFI_TYPE_LAST. */ #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. */ /* 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. */ /* 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. */ /* Used by ELFv2 for homogenous structure returns. */
#define FFI_V2_TYPE_FLOAT_HOMOG (FFI_TYPE_LAST + 1) #define FFI_V2_TYPE_FLOAT_HOMOG (FFI_PPC_TYPE_LAST + 1)
#define FFI_V2_TYPE_DOUBLE_HOMOG (FFI_TYPE_LAST + 2) #define FFI_V2_TYPE_DOUBLE_HOMOG (FFI_PPC_TYPE_LAST + 2)
#define FFI_V2_TYPE_SMALL_STRUCT (FFI_TYPE_LAST + 3) #define FFI_V2_TYPE_SMALL_STRUCT (FFI_PPC_TYPE_LAST + 3)
#if _CALL_ELF == 2 #if _CALL_ELF == 2
# define FFI_TRAMPOLINE_SIZE 32 # define FFI_TRAMPOLINE_SIZE 32