Pick e42520c for libffi

See also libffi/libffi#577
fkistner · Nov 30, 2020 · 9bd29b4 · 9bd29b4
1 parent 0c0d5c6
commit 9bd29b4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/native/libffi/src/aarch64/ffi.c b/native/libffi/src/aarch64/ffi.c
@@ -646,12 +646,13 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *orig_rvalue,
 		state.ngrn = N_X_ARG_REG;
 		/* Note that the default abi extends each argument
 		   to a full 64-bit slot, while the iOS abi allocates
-		   only enough space. */
+		   only enough space, except for variadic arguments. */
 #ifdef __APPLE__
-		memcpy(d, a, s);
-#else
-		*(ffi_arg *)d = ext;
+		if (!state.allocating_variadic)
+		  memcpy(d, a, s);
+		else
 #endif
+		  *(ffi_arg *)d = ext;
 	      }
 	  }
 	  break;