Fix PR ld/24574

This restores a line that has been dropped when the auto-import feature
of the PE-COFF linker was overhauled about one year.  It is necessary
for GDB to properly resolve extern symbol in DLLs.

ld/ChangeLog
	* pe-dll.c (pe_find_data_imports): Replace again the original name
	of the undefined symbol with the __imp_ prefixed one after it is
	resolved.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0da9e2542da2c5fa8e136f453234855f5cc7ed40..37836aa70a84e13ba9db56e2f564358c3a83dc34 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2019-09-05  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR ld/24574
+       * pe-dll.c (pe_find_data_imports): Replace again the original name of
+       the undefined symbol with the __imp_ prefixed one after it is resolved.
+
 2019-09-05  Alan Modra  <amodra@gmail.com>
 
        * testsuite/ld-powerpc/pcrelopt.s,

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 81ab116c46abce7bcc720b7d40ba313943ed99cd..577b911da8a6ffb5b845fee6c4789da1da169c47 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -1445,6 +1445,11 @@ pe_find_data_imports (const char *symhead,
            undef->u.def.value = sym->u.def.value;
            undef->u.def.section = sym->u.def.section;
 
+           /* We replace the original name with the __imp_ prefixed one, this
+              1) may trash memory 2) leads to duplicate symbols.  But this is
+              better than having a misleading name that can confuse GDB.  */
+           undef->root.string = sym->root.string;
+
            if (link_info.pei386_auto_import == -1)
              {
                static bfd_boolean warned = FALSE;