Commit: 34a30b6758db4fe53b2872d7bd3824c778f6118c - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revision: 34a30b6758db4fe53b2872d7bd3824c778f6118c (tree)
• Time: 2019-09-06 01:37:38
• Author: Eric Botcazou <ebotcazou@gcc....>
• Commiter: Eric Botcazou

Log Message

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.

Change Summary

• modified: ld/ChangeLog
• modified: ld/pe-dll.c

Incremental Difference

--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
[phone]  Eric Botcazou  <[e-mail]>
+
+	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-05-17  Alan Modra  <[e-mail]>
 
 	PR 24567

--- 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;