X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fglibc-tdep.c;h=e91421bc4f31d84d9c9a42230a55da5c49d76664;hb=900ac24287a26146a6a5f4b3b9d6610f3b574428;hp=04bb6834ad1373ec79f1e73e8f60e76542986cbb;hpb=bb41a796b6ca26a28ef309814aba7f723ff3b345;p=external%2Fbinutils.git

diff --git a/gdb/glibc-tdep.c b/gdb/glibc-tdep.c
index 04bb683..e91421b 100644
--- a/gdb/glibc-tdep.c
+++ b/gdb/glibc-tdep.c
@@ -1,12 +1,12 @@
 /* Target-dependent code for the GNU C Library (glibc).
 
-   Copyright 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "frame.h"
@@ -29,35 +27,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,17 +53,21 @@ glibc_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc)
      of GNU/Linux will provide a portable, efficient interface for
      debugging programs that use shared libraries.  */
 
-  struct objfile *objfile;
-  struct minimal_symbol *resolver 
-    = find_minsym_and_objfile ("_dl_runtime_resolve", &objfile);
+  struct bound_minimal_symbol resolver 
+    = lookup_bound_minimal_symbol ("_dl_runtime_resolve");
 
-  if (resolver)
+  if (resolver.minsym)
     {
-      struct minimal_symbol *fixup
-	= lookup_minimal_symbol ("fixup", NULL, objfile);
-
-      if (fixup && SYMBOL_VALUE_ADDRESS (fixup) == pc)
-	return frame_pc_unwind (get_current_frame ());
+      /* The dynamic linker began using this name in early 2005.  */
+      struct bound_minimal_symbol fixup
+	= lookup_minimal_symbol ("_dl_fixup", NULL, resolver.objfile);
+      
+      /* This is the name used in older versions.  */
+      if (! fixup.minsym)
+        fixup = lookup_minimal_symbol ("fixup", NULL, resolver.objfile);
+
+      if (fixup.minsym && BMSYMBOL_VALUE_ADDRESS (fixup) == pc)
+	return frame_unwind_caller_pc (get_current_frame ());
     }
 
   return 0;