diff options
Diffstat (limited to 'ld/emultempl')
-rw-r--r-- | ld/emultempl/pe.em | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em index c7cb96c..92af07e 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em @@ -1369,24 +1369,33 @@ gld_${EMULATION_NAME}_open_dynamic_archive (arch, search, entry) string = (char *) xmalloc (strlen (search->name) + strlen (filename) - + sizeof "/lib.dll" + + sizeof "/lib.a.dll" + 1); - /* Try "foo.dll" first. */ - sprintf (string, "%s/%s.dll", search->name, filename); + /* Try "libfoo.dll.a" first (preferred explicit import library for dll's */ + sprintf (string, "%s/lib%s.dll.a", search->name, filename); if (! ldfile_try_open_bfd (string, entry)) { - /* Try "libfoo.dll" next. */ - sprintf (string, "%s/lib%s.dll", search->name, filename); - + /* 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)) { - free (string); - return false; + /* Try "libfoo.dll" (preferred dll name) */ + 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)) + { + free (string); + return false; + } + } } } - + entry->filename = string; return true; |