MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ld/emultempl/pe.em: institute the following search order for

Browse Source 
dynamic libraries on pei386: libfoo.dll.a, foo.dll.a (import
libs), libfoo.dll, foo.dll (link direct to dll).  Fall back to
static lib (libfoo.a) if none of the above are found.
This commit is contained in:
DJ Delorie 2000-07-07 20:09:28 +00:00
parent 5f577f7d70
commit 602e90d3d5
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ld/ChangeLog
View File

@ -1,3 +1,10 @@
Wed Jul 05 03:18:00 2000 Charles Wilson <cwilson@ece.gatech.edu>
* ld/emultempl/pe.em: institute the following search order for
dynamic libraries on pei386: libfoo.dll.a, foo.dll.a (import
libs), libfoo.dll, foo.dll (link direct to dll). Fall back to
static lib (libfoo.a) if none of the above are found.
2000-07-07 Mumit Khan <khan@xraylith.wisc.edu> 2000-07-07 Mumit Khan <khan@xraylith.wisc.edu>
* ld/emultempl/pe.em (pe_enable_auto_image_base): New variable. * ld/emultempl/pe.em (pe_enable_auto_image_base): New variable.

19
ld/emultempl/pe.em
View File

@ -1369,23 +1369,32 @@ gld_${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
string = (char *) xmalloc (strlen (search->name) string = (char *) xmalloc (strlen (search->name)
+ strlen (filename) + strlen (filename)
+ sizeof "/lib.dll" + sizeof "/lib.a.dll"
+ 1); + 1);
/* Try "foo.dll" first. */ /* Try "libfoo.dll.a" first (preferred explicit import library for dll's */
sprintf (string, "%s/%s.dll", search->name, filename); sprintf (string, "%s/lib%s.dll.a", search->name, filename);
if (! ldfile_try_open_bfd (string, entry)) if (! ldfile_try_open_bfd (string, entry))
{ {
/* Try "libfoo.dll" next. */ /* Try "foo.dll.a" next (alternate explicit import library for dll's */
sprintf (string, "%s/%s.dll.a", search->name, filename);
if (! ldfile_try_open_bfd (string, entry))
{
/* Try "libfoo.dll" (preferred dll name) */
sprintf (string, "%s/lib%s.dll", search->name, filename); sprintf (string, "%s/lib%s.dll", search->name, filename);
if (! ldfile_try_open_bfd (string, entry))
{
/* Finally, try "foo.dll" (alternate dll name) */
sprintf (string, "%s/%s.dll", search->name, filename);
if (! ldfile_try_open_bfd (string, entry)) if (! ldfile_try_open_bfd (string, entry))
{ {
free (string); free (string);
return false; return false;
} }
} }
}
}
entry->filename = string; entry->filename = string;