Patch adapted from Sage. Allows building ECL on libffi 3.3.
diff --git a/src/c/ffi.d b/src/c/ffi.d
index 8861303e..8a959c23 100644
--- a/src/c/ffi.d
+++ b/src/c/ffi.d
@@ -133,8 +133,8 @@ static struct {
 #elif defined(X86_WIN64)
   {@':win64', FFI_WIN64},
 #elif defined(X86_ANY) || defined(X86) || defined(X86_64)
-  {@':cdecl', FFI_SYSV},
-  {@':sysv', FFI_SYSV},
+  {@':cdecl', FFI_UNIX64},
+  {@':sysv', FFI_UNIX64},
   {@':unix64', FFI_UNIX64},
 #endif
 };
koszko.org/cgit-static/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/'>index</a> : <a href='/guix/'>guix</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='39c2b883c0687265893d522c5ad11a24fbcb3e6b'/><input type='hidden' name='showmsg' value='1'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b'>refs</a><a class='active' href='/guix/log/gnu/installer/record.scm?showmsg=1'>log</a><a href='/guix/tree/gnu/installer/record.scm?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b'>tree</a><a href='/guix/commit/gnu/installer/record.scm?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b'>commit</a><a href='/guix/diff/gnu/installer/record.scm?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/record.scm'>
<input type='hidden' name='id' value='39c2b883c0687265893d522c5ad11a24fbcb3e6b'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/installer?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b&amp;showmsg=1'>installer</a>/<a href='/guix/log/gnu/installer/record.scm?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b&amp;showmsg=1'>record.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/installer/record.scm?id=39c2b883c0687265893d522c5ad11a24fbcb3e6b'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2020-12-11 21:37:07 +0100'>2020-12-11</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/record.scm?id=8361817bf693742757b096468198626f297bb09e'>install: Discover local substitute servers.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/installer/substitutes.scm: New file.
* gnu/installer/newt/substitutes.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add them.
* po/guix/POTFILES.in: Add gnu/installer/newt/substitutes.scm.
* gnu/installer/proxy.scm (with-silent-shepherd): Move to ...
* gnu/installer/utils.scm: ... here.
* gnu/installer/record.scm (&lt;installer&gt;)[substitutes-page]: New field.
* gnu/installer/newt.scm (substitutes-page): New procedure,
(newt-installer): register it.
* gnu/installer.scm (installer-steps): Add "substitutes-page" step.
* gnu/system/install.scm (%installation-services): Add avahi-service-type and
enable substitute server discover in guix-service-type.
[&lt;name-service-switch&gt;]: Set it to %mdns-host-lookup-nss.


</td></tr>
<tr class='logheader'><td><span title='2020-04-09 02:42:54 +0000'>2020-04-09</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/record.scm?id=91c231a2223440081426929828a23c7baa0214fd'>installer: Allow Alt+Shift toggle from non-Latin keyboard layouts.</a></td><td>Florian Pelz</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/40493&gt;.

* gnu/installer/newt/keymap.scm (%non-latin-layouts): New variable.
(%non-latin-variants): New variable.
(%latin-layout+variants): New variable.
(toggleable-latin-layout): New procedure to compute combined layouts.
(run-keymap-page): Use it.
(keyboard-layout-&gt;configuration): Apply it in config.scm.
(run-layout-page): Mention Alt+Shift.
* gnu/installer/keymap.scm (kmscon-update-keymap): Pass on XKB options.
* gnu/installer/record.scm (&lt;installer&gt;): Adjust code comments.
* gnu/installer.scm (apply-keymap): Pass on XKB options.
(installer-steps): Adjust code comments.
* gnu/packages/patches/kmscon-runtime-keymap-switch.patch: Apply XKB options.


</td></tr>
<tr class='logheader'><td><span title='2020-04-08 10:24:02 +0200'>2020-04-08</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/record.scm?id=07a53bd512530d8f87e076263227216c467727bb'>installer: Turn help menu into parameters menu.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/local.mk (INSTALLER_MODULES): Rename help.scm into parameters.scm.
* po/guix/POTFILES.in: Ditto.
* gnu/installer/record.scm (&lt;installer&gt;): Rename help-menu into parameter-menu
and help-page into parameters-page.
* gnu/installer/newt/parameters.scm: Renamed from help.scm. Update information
messages.
* gnu/installer/newt.scm: Update accordingly.
* gnu/installer/newt/keymap.scm: Ditto.


</td></tr>
<tr class='logheader'><td><span title='2020-04-06 15:06:03 +0200'>2020-04-06</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/record.scm?id=786c9c39bc0826737e99f0c750ea30033cdbc202'>installer: Add a help page.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/installer/newt/help.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add it.
* po/guix/POTFILES.in: Add it.
* gnu/installer/record.scm (&lt;installer&gt;): Add 'help-menu' and 'help-page'
 fields,
 (installer-help-menu, installer-help-page): new exported procedures.
 * gnu/installer/newt.scm (init): Set the help line,
 (help-menu, help-page): new procedures used ...
 (newt-installer): ... here.
 * gnu/installer/newt/keymap.scm (run-layout-page): Add a context argument to
 differenciate the help context from the main one,
 (run-keymap-page): add a context argument and pass it to run-layout-page.
 * gnu/installer.scm (compute-keymap-step): Add a context argument and pass it
 to 'installer-keymap-page',
 (installer-steps): set the help menu and pass the appropriate context to
 compute-keymap-step calls,
 (guile-newt): update to revision 2.


</td></tr>