aboutsummaryrefslogtreecommitdiff
path: root/libffi/src
diff options
context:
space:
mode:
authorAndrew Pinski <apinski@cavium.com>2012-08-26 18:29:21 +0000
committerAndrew Pinski <pinskia@gcc.gnu.org>2012-08-26 11:29:21 -0700
commitc5a3fffaab7dbc3e125e6a49d6abaf430da84af9 (patch)
tree4a5265d835ee1144faf4e115e30fb311bae8eb86 /libffi/src
parenta66217a0a7d11f7a524af22cf75a18f95e77d523 (diff)
downloadgcc-c5a3fffaab7dbc3e125e6a49d6abaf430da84af9.zip
gcc-c5a3fffaab7dbc3e125e6a49d6abaf430da84af9.tar.gz
gcc-c5a3fffaab7dbc3e125e6a49d6abaf430da84af9.tar.bz2
re PR libffi/53014 (libffi failures on mips64-linux-gnu with soft-float)
2012-08-26 Andrew Pinski <apinski@cavium.com> PR libffi/53014 * src/mips/ffi.c (ffi_prep_closure_loc): Allow n32 with soft-float and n64 with soft-float. From-SVN: r190696
Diffstat (limited to 'libffi/src')
-rw-r--r--libffi/src/mips/ffi.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/libffi/src/mips/ffi.c b/libffi/src/mips/ffi.c
index 79cff9b..03121e3 100644
--- a/libffi/src/mips/ffi.c
+++ b/libffi/src/mips/ffi.c
@@ -670,9 +670,16 @@ ffi_prep_closure_loc (ffi_closure *closure,
if (cif->abi != FFI_O32 && cif->abi != FFI_O32_SOFT_FLOAT)
return FFI_BAD_ABI;
fn = ffi_closure_O32;
-#else /* FFI_MIPS_N32 */
- if (cif->abi != FFI_N32 && cif->abi != FFI_N64)
+#else
+#if _MIPS_SIM ==_ABIN32
+ if (cif->abi != FFI_N32
+ && cif->abi != FFI_N32_SOFT_FLOAT)
+ return FFI_BAD_ABI;
+#else
+ if (cif->abi != FFI_N64
+ && cif->abi != FFI_N64_SOFT_FLOAT)
return FFI_BAD_ABI;
+#endif
fn = ffi_closure_N32;
#endif /* FFI_MIPS_O32 */