Tweak map file output for pei386_auto_import

	* ldmain.c (add_archive_element): Handle auto-inport symbols
	when printing map.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d0e75595f8e68b797d85f2637faeea8dc865b38f..bf5441f6954b6198f2f5e863ffd5f17bce09d129 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-19  Alan Modra  <amodra@gmail.com>
+
+       * ldmain.c (add_archive_element): Handle auto-inport symbols
+       when printing map.
+
 2018-09-17  Alan Modra  <amodra@gmail.com>
 
        * testsuite/ld-elf/comm-data5.d: Remove notarget for hppa.

diff --git a/ld/ldmain.c b/ld/ldmain.c
index f31eeb29c3ceac62adb0df73c6f1d08fef8a23ea..aca9b1bb5d00320a9adaab4be67a19fa1d6ecad0 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -850,6 +850,10 @@ add_archive_element (struct bfd_link_info *info,
       int len;
 
       h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
+      if (h == NULL
+         && info->pei386_auto_import
+         && CONST_STRNEQ (name, "__imp_"))
+       h = bfd_link_hash_lookup (info->hash, name + 6, FALSE, FALSE, TRUE);
 
       if (h == NULL)
        from = NULL;