Allow gdb to find debug symbols file by build-id for PE file format also

[binutils-gdb.git] / gdb / coffread.c

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 28f7b18120f483d2018a1480ef8675570f8c36cd..7722cdbff7b1d6cd6a4651c452ee70f218a09587 100644 (file)
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -41,6 +41,7 @@
 #include "coff-pe-read.h"
 
 #include "psymtab.h"
+#include "build-id.h"
 
 extern void _initialize_coffread (void);
 
@@ -671,20 +672,31 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
             or "_imp_", get rid of the prefix, and search the minimal
             symbol in OBJFILE.  Note that 'maintenance print msymbols'
             shows that type of these "_imp_XXXX" symbols is mst_data.  */
-         if (MSYMBOL_TYPE (msym) == mst_data
-             && (startswith (name, "__imp_")
-                 || startswith (name, "_imp_")))
+         if (MSYMBOL_TYPE (msym) == mst_data)
            {
-             const char *name1 = (name[1] == '_' ? &name[7] : &name[6]);
-             struct bound_minimal_symbol found;
-
-             found = lookup_minimal_symbol (name1, NULL, objfile);
-             /* If found, there are symbols named "_imp_foo" and "foo"
-                respectively in OBJFILE.  Set the type of symbol "foo"
-                as 'mst_solib_trampoline'.  */
-             if (found.minsym != NULL
-                 && MSYMBOL_TYPE (found.minsym) == mst_text)
-               MSYMBOL_TYPE (found.minsym) = mst_solib_trampoline;
+             const char *name1 = NULL;
+
+             if (startswith (name, "_imp_"))
+               name1 = name + 5;
+             else if (startswith (name, "__imp_"))
+               name1 = name + 6;
+             if (name1 != NULL)
+               {
+                 int lead = bfd_get_symbol_leading_char (objfile->obfd);
+                 struct bound_minimal_symbol found;
+
+                  if (lead != '\0' && *name1 == lead)
+                   name1 += 1;
+
+                 found = lookup_minimal_symbol (name1, NULL, objfile);
+
+                 /* If found, there are symbols named "_imp_foo" and "foo"
+                    respectively in OBJFILE.  Set the type of symbol "foo"
+                    as 'mst_solib_trampoline'.  */
+                 if (found.minsym != NULL
+                     && MSYMBOL_TYPE (found.minsym) == mst_text)
+                   MSYMBOL_TYPE (found.minsym) = mst_solib_trampoline;
+               }
            }
        }
     }
@@ -727,7 +739,10 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
     {
       char *debugfile;
 
-      debugfile = find_separate_debug_file_by_debuglink (objfile);
+      debugfile = find_separate_debug_file_by_buildid (objfile);
+
+      if (debugfile == NULL)
+       debugfile = find_separate_debug_file_by_debuglink (objfile);
       make_cleanup (xfree, debugfile);
 
       if (debugfile)