summaryrefslogtreecommitdiffstats
path: root/libffi/src/sh
diff options
context:
space:
mode:
authorkkojima <kkojima@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-13 22:50:16 +0000
committerkkojima <kkojima@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-13 22:50:16 +0000
commit6f3435086d894523ecee2acd2fc2b07de9e8fbe5 (patch)
treed9bc825e34f48648ec69abf6928f0e84af830b89 /libffi/src/sh
parent8e4de83abc921c9bc22852bf52bc6c6fea162e99 (diff)
downloadppe42-gcc-6f3435086d894523ecee2acd2fc2b07de9e8fbe5.tar.gz
ppe42-gcc-6f3435086d894523ecee2acd2fc2b07de9e8fbe5.zip
* src/sh/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test,
just return FFI_BAD_ABI when things are wrong. * src/sh64/ffi.c (ffi_prep_closure_loc): Ditto. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185361 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi/src/sh')
-rw-r--r--libffi/src/sh/ffi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libffi/src/sh/ffi.c b/libffi/src/sh/ffi.c
index 69bd025fb8f..3515b91b1d0 100644
--- a/libffi/src/sh/ffi.c
+++ b/libffi/src/sh/ffi.c
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------
- ffi.c - Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Kaz Kojima
+ ffi.c - Copyright (c) 2002-2008, 2012 Kaz Kojima
Copyright (c) 2008 Red Hat, Inc.
SuperH Foreign Function Interface
@@ -463,7 +463,8 @@ ffi_prep_closure_loc (ffi_closure* closure,
unsigned int *tramp;
unsigned int insn;
- FFI_ASSERT (cif->abi == FFI_GCC_SYSV);
+ if (cif->abi != FFI_SYSV)
+ return FFI_BAD_ABI;
tramp = (unsigned int *) &closure->tramp[0];
/* Set T bit if the function returns a struct pointed with R2. */
OpenPOWER on IntegriCloud