Add an extra library name template to the list used by the WIN32 targets.

	PR 22948
	* emultempl/pe.em (open_dynamic_archive): Add libXXX.lib template
	to library name list.
	* emultempl/pep.em (open_dynamic_archive): Likewise.
	* ld.texinfo (WIN32): Update documentation.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index be06ae7..330998c 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2018-03-23  Nick Clifton  <nickc@redhat.com>
+
+       PR 22948
+       * emultempl/pe.em (open_dynamic_archive): Add libXXX.lib template
+       to library name list.
+       * emultempl/pep.em (open_dynamic_archive): Likewise.
+       * ld.texinfo (WIN32): Update documentation.
+
 2018-03-20  Roland McGrath  <mcgrathr@google.com>
 
        * testsuite/ld-elf/shared.exp (pr20995-2): XFAIL on aarch64*-*-elf*,

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index ffa8b74..5cc933a 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -2347,6 +2347,8 @@ gld_${EMULATION_NAME}_open_dynamic_archive
       { "lib%s.a", FALSE },
       /* The 'native' spelling of an import lib name is "foo.lib".  */
       { "%s.lib", FALSE },
+      /* PR 22948 - Check for an import library.  */
+      { "lib%s.lib", FALSE },
 #ifdef DLL_SUPPORT
       /* Try "<prefix>foo.dll" (preferred dll name, if specified).  */
       {        "%s%s.dll", TRUE },

diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index cea210c..96942ec 100644 (file)
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -2120,6 +2120,8 @@ gld_${EMULATION_NAME}_open_dynamic_archive
       { "lib%s.a", FALSE },
       /* The 'native' spelling of an import lib name is "foo.lib".  */
       { "%s.lib", FALSE },
+      /* PR 22948 - Check for an import library.  */
+      { "lib%s.lib", FALSE },
 #ifdef DLL_SUPPORT
       /* Try "<prefix>foo.dll" (preferred dll name, if specified).  */
       {        "%s%s.dll", TRUE },

diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index 226e2de..391f52b 100644 (file)
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -8078,6 +8078,7 @@ libxxx.dll.a
 xxx.dll.a
 libxxx.a
 xxx.lib
+libxxx.lib
 cygxxx.dll (*)
 libxxx.dll
 xxx.dll