Commit aa5d8db0 by Uros Bizjak Committed by Uros Bizjak

ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, just return FFI_BAD_ABI when things are wrong.

	* src/s390/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test,
	just return FFI_BAD_ABI when things are wrong.

From-SVN: r190230
parent 6b4a85ad
2012-08-08 Uros Bizjak <ubizjak@gmail.com>
* src/s390/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test,
just return FFI_BAD_ABI when things are wrong.
2012-07-18 H.J. Lu <hongjiu.lu@intel.com> 2012-07-18 H.J. Lu <hongjiu.lu@intel.com>
PR libffi/53982 PR libffi/53982
......
...@@ -750,7 +750,8 @@ ffi_prep_closure_loc (ffi_closure *closure, ...@@ -750,7 +750,8 @@ ffi_prep_closure_loc (ffi_closure *closure,
void *user_data, void *user_data,
void *codeloc) void *codeloc)
{ {
FFI_ASSERT (cif->abi == FFI_SYSV); if (cif->abi != FFI_SYSV)
return FFI_BAD_ABI;
#ifndef __s390x__ #ifndef __s390x__
*(short *)&closure->tramp [0] = 0x0d10; /* basr %r1,0 */ *(short *)&closure->tramp [0] = 0x0d10; /* basr %r1,0 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment