commit 4c2206ace07f2fb4bef43cd4bfe952ccb584dcec
author Tom Tromey <tom@tromey.com> Sat Apr 28 04:46:10 2018 -0600
committer Anthony Green <green@moxielogic.com> Sat Apr 28 06:46:10 2018 -0400
tree 2cef032f39cdb1d97325e183c4f93e1fb75b29bb
parent ed3ed4d801a4d417ea304715d4d8ae581a6c6903

Fix two "return" issues in x86/ffi64.c (#431)

Issue #70 pointed out that at least one compiler didn't like:

    return ffi_call_efi64(cif, fn, rvalue, avalue);

... where the return type is "void".  This patch splits the statement
into two.

I also noticed that ffi_call_go here seems to do a double call.  I
suspect a "return" is missing here, so this patch adds it as well.

src/x86/ffi64.c

diff --git a/src/x86/ffi64.c b/src/x86/ffi64.c
index 9d7f701..e46974d 100644
--- a/src/x86/ffi64.c
+++ b/src/x86/ffi64.c
@@ -678,7 +678,10 @@
 {
 #ifndef __ILP32__
   if (cif->abi == FFI_EFI64)
-    return ffi_call_efi64(cif, fn, rvalue, avalue);
+    {
+      ffi_call_efi64(cif, fn, rvalue, avalue);
+      return;
+    }
 #endif
   ffi_call_int (cif, fn, rvalue, avalue, NULL);
 }
@@ -695,7 +698,10 @@
 {
 #ifndef __ILP32__
   if (cif->abi == FFI_EFI64)
-    ffi_call_go_efi64(cif, fn, rvalue, avalue, closure);
+    {
+      ffi_call_go_efi64(cif, fn, rvalue, avalue, closure);
+      return;
+    }
 #endif
   ffi_call_int (cif, fn, rvalue, avalue, closure);
 }