Updated copyright notices for most files.

[deliverable/binutils-gdb.git] / gdb / glibc-tdep.c

diff --git a/gdb/glibc-tdep.c b/gdb/glibc-tdep.c
index a37be98b99f69835998d2ee27e5b0fa3fe0437bf..0ae303b78be66f7771d82cb8a7740f323b8825d0 100644 (file)
--- a/gdb/glibc-tdep.c
+++ b/gdb/glibc-tdep.c
@@ -1,12 +1,12 @@
 /* Target-dependent code for the GNU C Library (glibc).
 
 /* Target-dependent code for the GNU C Library (glibc).
 

-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2007, 2008 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
 
    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,
    (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
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "frame.h"
 
 #include "defs.h"
 #include "frame.h"


@@ -90,8 +88,13 @@ glibc_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc)
 
   if (resolver)
     {
 
   if (resolver)
     {

+      /* The dynamic linker began using this name in early 2005.  */

       struct minimal_symbol *fixup
       struct minimal_symbol *fixup

-       = lookup_minimal_symbol ("fixup", NULL, objfile);
+       = lookup_minimal_symbol ("_dl_fixup", NULL, objfile);
+      
+      /* This is the name used in older versions.  */
+      if (! fixup)
+        fixup = lookup_minimal_symbol ("fixup", NULL, objfile);

 
       if (fixup && SYMBOL_VALUE_ADDRESS (fixup) == pc)
        return frame_pc_unwind (get_current_frame ());
 
       if (fixup && SYMBOL_VALUE_ADDRESS (fixup) == pc)
        return frame_pc_unwind (get_current_frame ());