This is the mail archive of the
libffi-discuss@sourceware.org
mailing list for the libffi project.
Re: libffi doesn't keep the stack aligned to 16 bytes
Hi Anthony,
Anthony Green <green@redhat.com> wrote:
> Here's how my workflow goes...
>
> libffi patches go in either the GCC SVN tree via the GCC hackers, or
> into the libffi git tree by me. Patches that go into the libffi GIT
> tree are managed with quilt. This lets me easily un-apply all of the
> patches and rebase from the GCC SVN tree. This re-basing happens on
> an ad-hoc basis. Conversely, the libffi GIT tree patches are
> periodically merged, one by one, into the GCC tree.
Ah, I see. I didn't realise there was this complicated system in
place. I suppose these kind of merge commits are unavoidable in that
case.
> There may be some simple change to my workflow that will give you want
> you want, but I don't know what it is yet. My git skills are pretty
> limited. Suggestions?
I can't think of any helpful suggestions apart from to beg the GCC
developers to switch to Git unfortunately. Potentially you might be able
to do something with a git-svn clone of the GCC SVN repo and then git
format-patch the range of commits you want to export and import them
into your repo with git am -p2. That would at least keep the commits
separated. However it's not much use for preserving the commit message
if the GCC maintainers themselves throw it away when they merge a patch
into SVN.
Thanks for taking the time to explain.
Regards,
- Neil