libffi merge

Dave Korn dave.korn.cygwin@googlemail.com
Fri Jun 5 12:12:00 GMT 2009


Andrew Haley wrote:
> Dave Korn wrote:

>> Refs: http://gcc.gnu.org/ml/gcc-patches/2009-05/msg01473.html
>>       http://gcc.gnu.org/ml/gcc-patches/2009-05/msg01476.html
> 
> OK, I backed out that patch.  I'm awaiting some explanation of what on Earth
> is going on.  I'm guessing that Timothy Wall changed the version upstream but
> not the version in gcc, and then you changed the version in gcc but not the
> version upstream.  So, we have a two sets of changes, and I can't tell which
> is supposed to go where.

  The relevant bit from those links was this:

>   There is currently one difference between our win32.S and upstream libffi
> win32.S, where upstream adds a new entrypoint, _ffi_closure_STDCALL.
>
>   Would it help if I added that function and EH annotations for it to my patch?

  i.e. I already merged (the only difference between) win32.s from libffi->gcc
for you, and thought that you'd just copy the gcc version back across
wholesale when updating libffi.  Sorry for having been AFK for so long, I have
a lot of outside stuff going on this week/weekend.



    cheers,
      DaveK



More information about the Libffi-discuss mailing list