On Apr 3, 2017, at 4:14 PM, Daniel Santos <daniel.san...@pobox.com> wrote: > > We currently have two copies of target-libpath.exp in the tree under > gcc/testsuite/lib and libffi/testsuite/lib. It was originally pulled > into the libffi project from downstream gcc in 2009 > (https://github.com/libffi/libffi/commit/5cbe2058c128e848446ae79fe15ee54260a90559). > Then in 2012, Anthony Green (from libffi) modified it to correct this > Windows problem (thank you! > https://github.com/libffi/libffi/commit/bd78c9c3311244dd5f877c915b0dff91621dd253). > In 2015, this file got pulled from upstream libffi back into gcc, thus > beginning two separate development paths > (https://github.com/gcc-mirror/gcc/commit/89d8a412de548b218cf7c967e65ad98bceb1ed4e). > > This patch merges the changes from libffi upstream which correctly solve > the Windows DLL load path problem and removes the duplicate from > libffi/testsuite/lib. This fixes most of bug #79867, implementing > correct behaviour for set_ld_library_path_env_vars and > restore_ld_library_path_env_vars. However, there is still incorrect > behaviour in DejaGNU's unix_load that should eventually be adddressed, > although I cannot yet point to a specific failure that it is causing. > > gcc/ChangeLog: > 2017-04-03 Daniel Santos <daniel.san...@pobox.com> > > PR testsuite/79867 > * testsuite/lib/target-libpath.exp (set_ld_library_path_env_vars, > restore_ld_library_path_env_vars): Merge changes from libffi upstream, > correcting DLL load path problems on Windows.
These are Ok. > libffi/ChangeLog: > 2017-04-03 Daniel Santos <daniel.san...@pobox.com> > > PR testsuite/79867 > * testsuite/lib/target-libpath.exp: Remove. > * testsuite/Makefile.in: Remove target-libpath.exp. > * testsuite/Makefile.am: Regenerated. I don't think the libffi project wants to remove that file. There is little point being different from them in this regard. The dup should not hurt. https://gcc.gnu.org/codingconventions.html seems like it should be updated to list libffi. Not sure why it wasn't. I just point it out if someone wants to contribute a patch for it.