From 2f652469684d6d2b3e54705294c7e81cffe1341f Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@twiddle.net>
Date: Thu, 11 Dec 2014 14:16:00 -0800
Subject: [PATCH] x86: Handle void arguments as if an empty structure

Since libffi currently doesn't allow empty structures, libgo
currently maps them to ffi_type_void.  Given that we'll abort
on this case, handle it gracefully.
---
 src/x86/ffi64.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/x86/ffi64.c b/src/x86/ffi64.c
index 650f7bb3..cf6b5a56 100644
--- a/src/x86/ffi64.c
+++ b/src/x86/ffi64.c
@@ -233,6 +233,7 @@ classify_argument (ffi_type *type, enum x86_64_reg_class classes[],
 	   signalize memory class, so handle it as special case.  */
 	if (!words)
 	  {
+    case FFI_TYPE_VOID:
 	    classes[0] = X86_64_NO_CLASS;
 	    return 1;
 	  }
@@ -611,6 +612,9 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
 	    {
 	      switch (classes[j])
 		{
+		case X86_64_NO_CLASS:
+		case X86_64_SSEUP_CLASS:
+		  break;
 		case X86_64_INTEGER_CLASS:
 		case X86_64_INTEGERSI_CLASS:
 		  /* Sign-extend integer arguments passed in general