diff options
Diffstat (limited to 'gdb/coff-pe-read.c')
-rw-r--r-- | gdb/coff-pe-read.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c index 3f06f681d09..8961c781621 100644 --- a/gdb/coff-pe-read.c +++ b/gdb/coff-pe-read.c @@ -202,8 +202,7 @@ add_pe_forwarded_sym (const char *sym_name, const char *forward_dll_name, const char *dll_name, struct objfile *objfile) { CORE_ADDR vma; - struct objfile *forward_objfile; - struct minimal_symbol *msymbol; + struct bound_minimal_symbol msymbol; enum minimal_symbol_type msymtype; char *qualified_name, *bare_name; int forward_dll_name_len = strlen (forward_dll_name); @@ -215,20 +214,18 @@ add_pe_forwarded_sym (const char *sym_name, const char *forward_dll_name, forward_func_name); - msymbol = lookup_minimal_symbol_and_objfile (forward_qualified_name, - &forward_objfile); + msymbol = lookup_minimal_symbol_and_objfile (forward_qualified_name); - if (!msymbol) + if (!msymbol.minsym) { int i; for (i = 0; i < forward_dll_name_len; i++) forward_qualified_name[i] = tolower (forward_qualified_name[i]); - msymbol = lookup_minimal_symbol_and_objfile (forward_qualified_name, - &forward_objfile); + msymbol = lookup_minimal_symbol_and_objfile (forward_qualified_name); } - if (!msymbol) + if (!msymbol.minsym) { if (debug_coff_pe_read) fprintf_unfiltered (gdb_stdlog, _("Unable to find function \"%s\" in" @@ -243,8 +240,8 @@ add_pe_forwarded_sym (const char *sym_name, const char *forward_dll_name, " \"%s\" in dll \"%s\", pointing to \"%s\"\n"), sym_name, dll_name, forward_qualified_name); - vma = SYMBOL_VALUE_ADDRESS (msymbol); - msymtype = MSYMBOL_TYPE (msymbol); + vma = SYMBOL_VALUE_ADDRESS (msymbol.minsym); + msymtype = MSYMBOL_TYPE (msymbol.minsym); /* Generate a (hopefully unique) qualified name using the first part of the dll name, e.g. KERNEL32!AddAtomA. This matches the style |