int found_file = -1;
char *temp_pathname = NULL;
int gdb_sysroot_is_empty;
+ const char *solib_symbols_extension
+ = gdbarch_solib_symbols_extension (target_gdbarch);
+
+ /* If solib_symbols_extension is set, replace the file's
+ extension. */
+ if (solib_symbols_extension)
+ {
+ char *p = in_pathname + strlen (in_pathname);
+ while (p > in_pathname && *p != '.')
+ p--;
+
+ if (*p == '.')
+ {
+ char *new_pathname;
+
+ new_pathname = alloca (p - in_pathname + 1
+ + strlen (solib_symbols_extension) + 1);
+ memcpy (new_pathname, in_pathname, p - in_pathname + 1);
+ strcpy (new_pathname + (p - in_pathname) + 1,
+ solib_symbols_extension);
+
+ in_pathname = new_pathname;
+ }
+ }
gdb_sysroot_is_empty = (gdb_sysroot == NULL || *gdb_sysroot == 0);
/* If not found, next search the inferior's $PATH environment variable. */
if (found_file < 0 && gdb_sysroot_is_empty)
- found_file = openp (get_in_environ (inferior_environ, "PATH"),
+ found_file = openp (get_in_environ (current_inferior ()->environment,
+ "PATH"),
OPF_TRY_CWD_FIRST, in_pathname, O_RDONLY | O_BINARY,
&temp_pathname);
/* If not found, next search the inferior's $LD_LIBRARY_PATH
environment variable. */
if (found_file < 0 && gdb_sysroot_is_empty)
- found_file = openp (get_in_environ (inferior_environ, "LD_LIBRARY_PATH"),
+ found_file = openp (get_in_environ (current_inferior ()->environment,
+ "LD_LIBRARY_PATH"),
OPF_TRY_CWD_FIRST, in_pathname, O_RDONLY | O_BINARY,
&temp_pathname);
/* Search for shared library file. */
found_pathname = solib_find (pathname, &found_file);
if (found_pathname == NULL)
- perror_with_name (pathname);
+ {
+ /* Return failure if the file could not be found, so that we can
+ accumulate messages about missing libraries. */
+ if (errno == ENOENT)
+ return NULL;
+
+ perror_with_name (pathname);
+ }
/* Open bfd for shared library. */
abfd = solib_bfd_fopen (found_pathname, found_file);
*/
static int
-solib_map_sections (void *arg)
+solib_map_sections (struct so_list *so)
{
- struct so_list *so = (struct so_list *) arg; /* catch_errors bogon */
struct target_so_ops *ops = solib_ops (target_gdbarch);
char *filename;
struct target_section *p;
abfd = ops->bfd_open (filename);
do_cleanups (old_chain);
+ if (abfd == NULL)
+ return 0;
+
/* Leave bfd open, core_xfer_memory and "info files" need it. */
so->abfd = gdb_bfd_ref (abfd);
}
}
- return (1);
+ /* Add the shared object's sections to the current set of file
+ section tables. Do this immediately after mapping the object so
+ that later nodes in the list can query this object, as is needed
+ in solib-osf.c. */
+ add_target_sections (so->sections, so->sections_end);
+
+ return 1;
+}
+
+/* Free symbol-file related contents of SO. If we have opened a BFD
+ for SO, close it. If we have placed SO's sections in some target's
+ section table, the caller is responsible for removing them.
+
+ This function doesn't mess with objfiles at all. If there is an
+ objfile associated with SO that needs to be removed, the caller is
+ responsible for taking care of that. */
+
+static void
+free_so_symbols (struct so_list *so)
+{
+ char *bfd_filename = 0;
+
+ if (so->sections)
+ {
+ xfree (so->sections);
+ so->sections = so->sections_end = NULL;
+ }
+
+ gdb_bfd_unref (so->abfd);
+ so->abfd = NULL;
+
+ /* Our caller closed the objfile, possibly via objfile_purge_solibs. */
+ so->symbols_loaded = 0;
+ so->objfile = NULL;
+
+ so->addr_low = so->addr_high = 0;
+
+ /* Restore the target-supplied file name. SO_NAME may be the path
+ of the symbol file. */
+ strcpy (so->so_name, so->so_original_name);
}
/* LOCAL FUNCTION
{
struct target_so_ops *ops = solib_ops (target_gdbarch);
- if (so->sections)
- xfree (so->sections);
-
- gdb_bfd_unref (so->abfd);
-
+ free_so_symbols (so);
ops->free_so (so);
xfree (so);
return so_list_head;
}
-static void
-symbol_add_stub (struct so_list *so, int flags)
-{
- struct section_addr_info *sap;
-
- /* Have we already loaded this shared object? */
- ALL_OBJFILES (so->objfile)
- {
- if (strcmp (so->objfile->name, so->so_name) == 0)
- return;
- }
-
- sap = build_section_addr_info_from_section_table (so->sections,
- so->sections_end);
-
- so->objfile = symbol_file_add_from_bfd (so->abfd, flags, sap, OBJF_SHARED);
- free_section_addr_info (sap);
-
- return;
-}
-
/* Read in symbols for shared object SO. If SYMFILE_VERBOSE is set in FLAGS,
be chatty about it. Return non-zero if any symbols were actually
loaded. */
if (so->symbols_loaded)
{
- if (from_tty || info_verbose)
- printf_unfiltered (_("Symbols already loaded for %s\n"), so->so_name);
+ /* If needed, we've already warned in our caller. */
}
else if (so->abfd == NULL)
{
- if (from_tty || info_verbose)
- printf_unfiltered (_("Symbol file not found for %s\n"), so->so_name);
+ /* We've already warned about this library, when trying to open
+ it. */
}
else
{
- volatile struct gdb_exception exception;
- TRY_CATCH (exception, RETURN_MASK_ALL)
- {
- symbol_add_stub (so, flags);
- }
- if (exception.reason != 0)
- {
- exception_fprintf (gdb_stderr, exception,
- "Error while reading shared library symbols:\n");
- return 0;
- }
- if (from_tty || info_verbose)
- printf_unfiltered (_("Loaded symbols for %s\n"), so->so_name);
- so->symbols_loaded = 1;
+ volatile struct gdb_exception e;
+
+ TRY_CATCH (e, RETURN_MASK_ERROR)
+ {
+ struct section_addr_info *sap;
+
+ /* Have we already loaded this shared object? */
+ ALL_OBJFILES (so->objfile)
+ {
+ if (strcmp (so->objfile->name, so->so_name) == 0)
+ break;
+ }
+ if (so->objfile != NULL)
+ break;
+
+ sap = build_section_addr_info_from_section_table (so->sections,
+ so->sections_end);
+ so->objfile = symbol_file_add_from_bfd (so->abfd,
+ flags, sap, OBJF_SHARED);
+ free_section_addr_info (sap);
+ }
+
+ if (e.reason < 0)
+ {
+ if (from_tty)
+ exception_fprintf
+ (gdb_stderr, e,
+ _("Error while reading shared library symbols:\n"));
+ }
+ else
+ {
+ if (from_tty || info_verbose)
+ printf_unfiltered (_("Loaded symbols for %s\n"), so->so_name);
+ so->symbols_loaded = 1;
+ }
return 1;
}
to GDB's shared object list. */
if (inferior)
{
+ int not_found = 0;
+ const char *not_found_filename = NULL;
+
struct so_list *i;
/* Add the new shared objects to GDB's list. */
/* Fill in the rest of each of the `struct so_list' nodes. */
for (i = inferior; i; i = i->next)
{
- i->from_tty = from_tty;
+ volatile struct gdb_exception e;
+
i->pspace = current_program_space;
- /* Fill in the rest of the `struct so_list' node. */
- catch_errors (solib_map_sections, i,
- "Error while mapping shared library sections:\n",
- RETURN_MASK_ALL);
+ TRY_CATCH (e, RETURN_MASK_ERROR)
+ {
+ /* Fill in the rest of the `struct so_list' node. */
+ if (!solib_map_sections (i))
+ {
+ not_found++;
+ if (not_found_filename == NULL)
+ not_found_filename = i->so_original_name;
+ }
+ }
- /* Add the shared object's sections to the current set of
- file section tables. Do this immediately after mapping
- the object so that later nodes in the list can query this
- object, as is needed in solib-osf.c. */
- add_target_sections (i->sections, i->sections_end);
+ if (e.reason < 0)
+ exception_fprintf (gdb_stderr, e, _("\
+Error while mapping shared library sections:\n"));
/* Notify any observer that the shared object has been
- loaded now that we've added it to GDB's tables. */
+ loaded now that we've added it to GDB's tables. */
observer_notify_solib_loaded (i);
}
+
+ /* If a library was not found, issue an appropriate warning
+ message. We have to use a single call to warning in case the
+ front end does something special with warnings, e.g., pop up
+ a dialog box. It Would Be Nice if we could get a "warning: "
+ prefix on each line in the CLI front end, though - it doesn't
+ stand out well. */
+
+ if (not_found == 1)
+ warning (_("\
+Could not load shared library symbols for %s.\n\
+Do you need \"set solib-search-path\" or \"set sysroot\"?"),
+ not_found_filename);
+ else if (not_found > 1)
+ warning (_("\
+Could not load shared library symbols for %d libraries, e.g. %s.\n\
+Use the \"info sharedlibrary\" command to see the complete listing.\n\
+Do you need \"set solib-search-path\" or \"set sysroot\"?"),
+ not_found, not_found_filename);
}
}
(readsyms || libpthread_solib_p (gdb));
any_matches = 1;
- if (add_this_solib && solib_read_symbols (gdb, flags))
- loaded_any_symbols = 1;
+ if (add_this_solib)
+ {
+ if (gdb->symbols_loaded)
+ {
+ /* If no pattern was given, be quiet for shared
+ libraries we have already loaded. */
+ if (pattern && (from_tty || info_verbose))
+ printf_unfiltered (_("Symbols already loaded for %s\n"),
+ gdb->so_name);
+ }
+ else if (solib_read_symbols (gdb, flags))
+ loaded_any_symbols = 1;
+ }
}
if (loaded_any_symbols)
if (! ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ()))
&& so->symbols_loaded
- && !objfile_has_partial_symbols (so->objfile)
- && !objfile_has_full_symbols (so->objfile))
+ && !objfile_has_symbols (so->objfile))
{
so_missing_debug_info = 1;
ui_out_field_string (uiout, "syms-read", "Yes (*)");
SYNOPSIS
- void solib_create_inferior_hook ()
+ void solib_create_inferior_hook (int from_tty)
DESCRIPTION
SOLIB_CREATE_INFERIOR_HOOK. */
void
-solib_create_inferior_hook (void)
+solib_create_inferior_hook (int from_tty)
{
struct target_so_ops *ops = solib_ops (target_gdbarch);
- ops->solib_create_inferior_hook();
+ ops->solib_create_inferior_hook (from_tty);
}
/* GLOBAL FUNCTION
objfile_purge_solibs ();
}
+/* Reload shared libraries, but avoid reloading the same symbol file
+ we already have loaded. */
+
+static void
+reload_shared_libraries_1 (int from_tty)
+{
+ struct so_list *so;
+ struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
+
+ for (so = so_list_head; so != NULL; so = so->next)
+ {
+ char *filename, *found_pathname = NULL;
+ bfd *abfd;
+ int scratch_chan;
+ int was_loaded = so->symbols_loaded;
+ const int flags =
+ SYMFILE_DEFER_BP_RESET | (from_tty ? SYMFILE_VERBOSE : 0);
+
+ filename = tilde_expand (so->so_original_name);
+ abfd = solib_bfd_open (filename);
+ if (abfd != NULL)
+ {
+ found_pathname = xstrdup (bfd_get_filename (abfd));
+ make_cleanup (xfree, found_pathname);
+ gdb_bfd_close_or_warn (abfd);
+ }
+
+ /* If this shared library is no longer associated with its previous
+ symbol file, close that. */
+ if ((found_pathname == NULL && was_loaded)
+ || (found_pathname != NULL
+ && strcmp (found_pathname, so->so_name) != 0))
+ {
+ if (so->objfile && ! (so->objfile->flags & OBJF_USERLOADED))
+ free_objfile (so->objfile);
+ remove_target_sections (so->abfd);
+ free_so_symbols (so);
+ }
+
+ /* If this shared library is now associated with a new symbol
+ file, open it. */
+ if (found_pathname != NULL
+ && (!was_loaded
+ || strcmp (found_pathname, so->so_name) != 0))
+ {
+ volatile struct gdb_exception e;
+
+ TRY_CATCH (e, RETURN_MASK_ERROR)
+ solib_map_sections (so);
+
+ if (e.reason < 0)
+ exception_fprintf (gdb_stderr, e, _("\
+Error while mapping shared library sections:\n"));
+ else if (auto_solib_add || was_loaded || libpthread_solib_p (so))
+ solib_read_symbols (so, flags);
+ }
+ }
+
+ do_cleanups (old_chain);
+}
+
static void
reload_shared_libraries (char *ignored, int from_tty,
struct cmd_list_element *e)
{
- no_shared_libraries (NULL, from_tty);
- solib_add (NULL, from_tty, NULL, auto_solib_add);
+ struct target_so_ops *ops;
+
+ reload_shared_libraries_1 (from_tty);
+
+ ops = solib_ops (target_gdbarch);
+
/* Creating inferior hooks here has two purposes. First, if we reload
shared libraries then the address of solib breakpoint we've computed
previously might be no longer valid. For example, if we forgot to set
about ld.so. */
if (target_has_execution)
{
+ /* Reset or free private data structures not associated with
+ so_list entries. */
+ ops->clear_solib ();
+
+ /* Remove any previous solib event breakpoint. This is usually
+ done in common code, at breakpoint_init_inferior time, but
+ we're not really starting up the inferior here. */
+ remove_solib_event_breakpoints ();
+
#ifdef SOLIB_CREATE_INFERIOR_HOOK
SOLIB_CREATE_INFERIOR_HOOK (PIDGET (inferior_ptid));
#else
- solib_create_inferior_hook ();
+ solib_create_inferior_hook (from_tty);
#endif
}
- /* We have unloaded and then reloaded debug info for all shared libraries.
- However, frames may still reference them, for example a frame's
- unwinder might still point of DWARF FDE structures that are now freed.
- Reinit frame cache to avoid crashing. */
+
+ /* Sometimes the platform-specific hook loads initial shared
+ libraries, and sometimes it doesn't. If it doesn't FROM_TTY will be
+ incorrectly 0 but such solib targets should be fixed anyway. If we
+ made all the inferior hook methods consistent, this call could be
+ removed. Call it only after the solib target has been initialized by
+ solib_create_inferior_hook. */
+
+ solib_add (NULL, 0, NULL, auto_solib_add);
+
+ breakpoint_re_set ();
+
+ /* We may have loaded or unloaded debug info for some (or all)
+ shared libraries. However, frames may still reference them. For
+ example, a frame's unwinder might still point at DWARF FDE
+ structures that are now freed. Also, getting new symbols may
+ change our opinion about what is frameless. */
reinit_frame_cache ();
+
+ ops->special_symbol_handling ();
}
static void
struct symbol *
solib_global_lookup (const struct objfile *objfile,
const char *name,
- const char *linkage_name,
const domain_enum domain)
{
struct target_so_ops *ops = solib_ops (target_gdbarch);
if (ops->lookup_lib_global_symbol != NULL)
- return ops->lookup_lib_global_symbol (objfile, name, linkage_name, domain);
+ return ops->lookup_lib_global_symbol (objfile, name, domain);
return NULL;
}
projects / deliverable / binutils-gdb.git / blobdiff