X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fglibc-tdep.c;h=615cb7e905d58a000f4675b3459cafeb15da2e3a;hb=f74656046a5263f1849d9288488d7de73627e1e1;hp=86046a091f3706bef203d1f75a5ae68cbf51ac73;hpb=54af988d1e631ef9f44c83cc23cbc33bdcf12cf5;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/glibc-tdep.c b/gdb/glibc-tdep.c index 86046a091f..615cb7e905 100644 --- a/gdb/glibc-tdep.c +++ b/gdb/glibc-tdep.c @@ -1,6 +1,7 @@ /* Target-dependent code for the GNU C Library (glibc). - Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. This file is part of GDB. @@ -27,35 +28,6 @@ /* Calling functions in shared libraries. */ -/* Find the minimal symbol named NAME, and return both the minsym - struct and its objfile. This probably ought to be in minsym.c, but - everything there is trying to deal with things like C++ and - SOFUN_ADDRESS_MAYBE_TURQUOISE, ... Since this is so simple, it may - be considered too special-purpose for general consumption. */ - -static struct minimal_symbol * -find_minsym_and_objfile (char *name, struct objfile **objfile_p) -{ - struct objfile *objfile; - - ALL_OBJFILES (objfile) - { - struct minimal_symbol *msym; - - ALL_OBJFILE_MSYMBOLS (objfile, msym) - { - if (SYMBOL_LINKAGE_NAME (msym) - && strcmp (SYMBOL_LINKAGE_NAME (msym), name) == 0) - { - *objfile_p = objfile; - return msym; - } - } - } - - return 0; -} - /* See the comments for SKIP_SOLIB_RESOLVER at the top of infrun.c. This function: 1) decides whether a PLT has sent us into the linker to resolve @@ -84,7 +56,7 @@ glibc_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc) struct objfile *objfile; struct minimal_symbol *resolver - = find_minsym_and_objfile ("_dl_runtime_resolve", &objfile); + = lookup_minimal_symbol_and_objfile ("_dl_runtime_resolve", &objfile); if (resolver) {