Attachment #211996 for bug #286911

Lines 43-49 Link Here

(-)src/mips/ffitarget.h.orig (-2 / +2 lines)
43	# endif	43	# endif
44		44
45	#if !defined(_MIPS_SIM)	45	#if !defined(_MIPS_SIM)
46	-- something is very wrong --	46	# error -- something is very wrong --
47	#else	47	#else
48	# if (_MIPS_SIM==_ABIN32 && defined(_ABIN32)) \|\| (_MIPS_SIM==_ABI64 && defined(_ABI64))	48	# if (_MIPS_SIM==_ABIN32 && defined(_ABIN32)) \|\| (_MIPS_SIM==_ABI64 && defined(_ABI64))
49	# define FFI_MIPS_N32	49	# define FFI_MIPS_N32
Lines 51-57 Link Here
51	# if (_MIPS_SIM==_ABIO32 && defined(_ABIO32))	51	# if (_MIPS_SIM==_ABIO32 && defined(_ABIO32))
52	# define FFI_MIPS_O32	52	# define FFI_MIPS_O32
53	# else	53	# else
54	-- this is an unsupported platform --	54	# error -- this is an unsupported platform --
55	# endif	55	# endif
56	# endif	56	# endif
57	#endif	57	#endif

Lines 251-256 Link Here

(-)include/ffi.h.in.orig (+6 lines)
251		251
252	#if FFI_CLOSURES	252	#if FFI_CLOSURES
253		253
		254	#ifdef __sgi
		255	# pragma pack 8
		256	#endif
254	typedef struct {	257	typedef struct {
255	char tramp[FFI_TRAMPOLINE_SIZE];	258	char tramp[FFI_TRAMPOLINE_SIZE];
256	ffi_cif *cif;	259	ffi_cif *cif;
Lines 260-265 Link Here
260	} ffi_closure __attribute__((aligned (8)));	263	} ffi_closure __attribute__((aligned (8)));
261	#else	264	#else
262	} ffi_closure;	265	} ffi_closure;
		266	# ifdef __sgi
		267	# pragma pack 0
		268	# endif
263	#endif	269	#endif
264		270
265	void ffi_closure_alloc (size_t size, void *code);	271	void ffi_closure_alloc (size_t size, void *code);

Lines 311-317 Link Here

(-)src/java_raw_api.c.dist (-1 / +1 lines)
311	ffi_raw_closure cl = (ffi_raw_closure)user_data;	311	ffi_raw_closure cl = (ffi_raw_closure)user_data;
312		312
313	ffi_java_ptrarray_to_raw (cif, avalue, raw);	313	ffi_java_ptrarray_to_raw (cif, avalue, raw);
314	(*cl->fun) (cif, rvalue, raw, cl->user_data);	314	(cl->fun) (cif, rvalue, (ffi_raw)raw, cl->user_data);
315	ffi_java_raw_to_rvalue (cif, rvalue);	315	ffi_java_raw_to_rvalue (cif, rvalue);
316	}	316	}
317		317

Return to bug 286911