2007-11-07 Markus Deuling <deuling@de.ibm.com>

[deliverable/binutils-gdb.git] / gdb / solib.c

diff --git a/gdb/solib.c b/gdb/solib.c
index 4cdb3a532ccd3f73e5cc731fcb26e654c1aaacfa..f687558180fa9c680b53f4992b1f92250707530f 100644 (file)
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -7,7 +7,7 @@
 
    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,
@@ -16,9 +16,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., 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"
 
@@ -176,6 +174,17 @@ solib_open (char *in_pathname, char **found_pathname)
   /* Now see if we can open it.  */
   found_file = open (temp_pathname, O_RDONLY | O_BINARY, 0);
 
+  /* We try to find the library in various ways.  After each attempt
+     (except for the one above), either found_file >= 0 and
+     temp_pathname is a malloc'd string, or found_file < 0 and
+     temp_pathname does not point to storage that needs to be
+     freed.  */
+
+    if (found_file < 0)
+      temp_pathname = NULL;
+    else
+      temp_pathname = xstrdup (temp_pathname);
+
   /* If the search in gdb_sysroot failed, and the path name is
      absolute at this point, make it relative.  (openp will try and open the
      file according to its absolute path otherwise, which is not what we want.)
@@ -224,8 +233,13 @@ solib_open (char *in_pathname, char **found_pathname)
 
   /* Done.  If not found, tough luck.  Return found_file and 
      (optionally) found_pathname.  */
-  if (found_pathname != NULL && temp_pathname != NULL)
-    *found_pathname = xstrdup (temp_pathname);
+  if (temp_pathname)
+    {
+      if (found_pathname != NULL)
+       *found_pathname = temp_pathname;
+      else
+       xfree (temp_pathname);
+    }
   return found_file;
 }
 
@@ -316,9 +330,15 @@ solib_map_sections (void *arg)
          object's file by the base address to which the object was actually
          mapped. */
       ops->relocate_section_addresses (so, p);
-      if (strcmp (p->the_bfd_section->name, ".text") == 0)
+
+      /* If the target didn't provide information about the address
+        range of the shared object, assume we want the location of
+        the .text section.  */
+      if (so->addr_low == 0 && so->addr_high == 0
+         && strcmp (p->the_bfd_section->name, ".text") == 0)
        {
-         so->textsection = p;
+         so->addr_low = p->addr;
+         so->addr_high = p->endaddr;
        }
     }
 
@@ -742,15 +762,15 @@ info_sharedlibrary_command (char *ignore, int from_tty)
            }
 
          printf_unfiltered ("%-*s", addr_width,
-                            so->textsection != NULL 
+                            so->addr_high != 0
                               ? hex_string_custom (
-                                  (LONGEST) so->textsection->addr,
+                                  (LONGEST) so->addr_low,
                                   addr_width - 4)
                               : "");
          printf_unfiltered ("%-*s", addr_width,
-                            so->textsection != NULL 
+                            so->addr_high != 0
                               ? hex_string_custom (
-                                  (LONGEST) so->textsection->endaddr,
+                                  (LONGEST) so->addr_high,
                                   addr_width - 4)
                               : "");
          printf_unfiltered ("%-12s", so->symbols_loaded ? "Yes" : "No");
@@ -832,7 +852,7 @@ clear_solib (void)
      So: disable breakpoints only if we're using ELF shared libs.  */
   if (exec_bfd != NULL
       && bfd_get_flavour (exec_bfd) != bfd_target_aout_flavour)
-    disable_breakpoints_in_shlibs (1);
+    disable_breakpoints_in_shlibs ();
 
   while (so_list_head)
     {
@@ -955,6 +975,25 @@ show_auto_solib_add (struct ui_file *file, int from_tty,
 }
 
 
+/* Handler for library-specific lookup of global symbol NAME in OBJFILE.  Call
+   the library-specific handler if it is installed for the current target.  */
+
+struct symbol *
+solib_global_lookup (const struct objfile *objfile,
+                    const char *name,
+                    const char *linkage_name,
+                    const domain_enum domain,
+                    struct symtab **symtab)
+{
+  struct target_so_ops *ops = solib_ops (current_gdbarch);
+
+  if (ops->lookup_lib_global_symbol != NULL)
+    return ops->lookup_lib_global_symbol (objfile, name, linkage_name,
+                                         domain, symtab);
+  return NULL;
+}
+
+
 extern initialize_file_ftype _initialize_solib; /* -Wmissing-prototypes */
 
 void