diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/coff-pe-read.c | 4 | ||||
| -rw-r--r-- | gdb/glibc-tdep.c | 2 | ||||
| -rw-r--r-- | gdb/jit.c | 2 | ||||
| -rw-r--r-- | gdb/minsyms.c | 18 | ||||
| -rw-r--r-- | gdb/minsyms.h | 5 | ||||
| -rw-r--r-- | gdb/printcmd.c | 2 |
7 files changed, 15 insertions, 28 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bec4e04e161..ff2f145fb99 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2018-05-29 Weimin Pan <weimin.pan@oracle.com> + + * minsyms.h (lookup_minimal_symbol_and_objfile): Remove declaration. + * minsyms.c (lookup_minimal_symbol_and_objfile): Remove definition. + * coff-pe-read.c (add_pe_forwarded_sym): Replace + lookup_minimal_symbol_and_objfile with lookup_bound_minimal_symbol. + * glibc-tdep.c (glibc_skip_solib_resolver): Likewise. + * jit.c (jit_breakpoint_re_set_internal): Likewise. + * printcmd.c (info_address_command): Likewise. + 2018-05-29 Tom Tromey <tom@tromey.com> * windows-nat.c (handle_exception): Update fall-through comment. diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c index 0e9309e4631..97b646a56bd 100644 --- a/gdb/coff-pe-read.c +++ b/gdb/coff-pe-read.c @@ -220,7 +220,7 @@ add_pe_forwarded_sym (minimal_symbol_reader &reader, forward_func_name); - msymbol = lookup_minimal_symbol_and_objfile (forward_qualified_name); + msymbol = lookup_bound_minimal_symbol (forward_qualified_name); if (!msymbol.minsym) { @@ -228,7 +228,7 @@ add_pe_forwarded_sym (minimal_symbol_reader &reader, 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); + msymbol = lookup_bound_minimal_symbol (forward_qualified_name); } if (!msymbol.minsym) diff --git a/gdb/glibc-tdep.c b/gdb/glibc-tdep.c index 481e4b80f0d..485cd8bbd60 100644 --- a/gdb/glibc-tdep.c +++ b/gdb/glibc-tdep.c @@ -54,7 +54,7 @@ glibc_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc) debugging programs that use shared libraries. */ struct bound_minimal_symbol resolver - = lookup_minimal_symbol_and_objfile ("_dl_runtime_resolve"); + = lookup_bound_minimal_symbol ("_dl_runtime_resolve"); if (resolver.minsym) { diff --git a/gdb/jit.c b/gdb/jit.c index 8cd645cb66e..e6b3cc25ca4 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -1041,7 +1041,7 @@ jit_breakpoint_re_set_internal (struct gdbarch *gdbarch, { /* Lookup the registration symbol. If it is missing, then we assume we are not attached to a JIT. */ - reg_symbol = lookup_minimal_symbol_and_objfile (jit_break_name); + reg_symbol = lookup_bound_minimal_symbol (jit_break_name); if (reg_symbol.minsym == NULL || BMSYMBOL_VALUE_ADDRESS (reg_symbol) == 0) return 1; diff --git a/gdb/minsyms.c b/gdb/minsyms.c index b98f121d5fd..9b2c80041a4 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -990,24 +990,6 @@ static const struct gnu_ifunc_fns stub_gnu_ifunc_fns = const struct gnu_ifunc_fns *gnu_ifunc_fns_p = &stub_gnu_ifunc_fns; -/* See minsyms.h. */ - -struct bound_minimal_symbol -lookup_minimal_symbol_and_objfile (const char *name) -{ - struct bound_minimal_symbol result; - struct objfile *objfile; - - ALL_OBJFILES (objfile) - { - result = lookup_minimal_symbol (name, NULL, objfile); - if (result.minsym != NULL) - return result; - } - - memset (&result, 0, sizeof (result)); - return result; -} /* Return leading symbol character for a BFD. If BFD is NULL, diff --git a/gdb/minsyms.h b/gdb/minsyms.h index 40e69aea87d..f6799ef00ce 100644 --- a/gdb/minsyms.h +++ b/gdb/minsyms.h @@ -202,11 +202,6 @@ struct bound_minimal_symbol lookup_minimal_symbol (const char *, struct bound_minimal_symbol lookup_bound_minimal_symbol (const char *); -/* Find the minimal symbol named NAME, and return both the minsym - struct and its objfile. */ - -struct bound_minimal_symbol lookup_minimal_symbol_and_objfile (const char *); - /* Look through all the current minimal symbol tables and find the first minimal symbol that matches NAME and has text type. If OBJF is non-NULL, limit the search to that objfile. Returns a bound diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 0dfea347533..d0037aec001 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1549,7 +1549,7 @@ info_address_command (const char *exp, int from_tty) { struct bound_minimal_symbol msym; - msym = lookup_minimal_symbol_and_objfile (SYMBOL_LINKAGE_NAME (sym)); + msym = lookup_bound_minimal_symbol (SYMBOL_LINKAGE_NAME (sym)); if (msym.minsym == NULL) printf_filtered ("unresolved"); else |