libffi upstream and gcc libffi are out of sync. I'm doing a two-way merge. Please don't commit patches to either repo for the next few days. Thanks, Andrew.