gdb: add target_ops::supports_displaced_step

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

diff --git a/gdb/solib.c b/gdb/solib.c
index c8138ef7a89ddd3c0783bb3b0041d05930d4bdf0..cd410bb9e3e0998dd7a0a02665fa085693f2f0a8 100644 (file)
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -1,6 +1,6 @@
 /* Handle shared libraries for GDB, the GNU Debugger.
 
 /* Handle shared libraries for GDB, the GNU Debugger.
 

-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -31,21 +31,23 @@
 #include "frame.h"
 #include "gdb_regex.h"
 #include "inferior.h"
 #include "frame.h"
 #include "gdb_regex.h"
 #include "inferior.h"

-#include "environ.h"
+#include "gdbsupport/environ.h"

 #include "language.h"
 #include "gdbcmd.h"
 #include "completer.h"
 #include "filenames.h"         /* for DOSish file names */
 #include "exec.h"
 #include "solist.h"
 #include "language.h"
 #include "gdbcmd.h"
 #include "completer.h"
 #include "filenames.h"         /* for DOSish file names */
 #include "exec.h"
 #include "solist.h"

-#include "observer.h"
-#include "readline/readline.h"
+#include "observable.h"
+#include "readline/tilde.h"

 #include "remote.h"
 #include "solib.h"
 #include "interps.h"
 #include "filesystem.h"
 #include "gdb_bfd.h"
 #include "remote.h"
 #include "solib.h"
 #include "interps.h"
 #include "filesystem.h"
 #include "gdb_bfd.h"

-#include "filestuff.h"
+#include "gdbsupport/filestuff.h"
+#include "source.h"
+#include "cli/cli-style.h"

 
 /* Architecture-specific operations.  */
 
 
 /* Architecture-specific operations.  */
 


@@ -65,7 +67,8 @@ solib_init (struct obstack *obstack)
 static const struct target_so_ops *
 solib_ops (struct gdbarch *gdbarch)
 {
 static const struct target_so_ops *
 solib_ops (struct gdbarch *gdbarch)
 {

-  const struct target_so_ops **ops = gdbarch_data (gdbarch, solib_data);
+  const struct target_so_ops **ops
+    = (const struct target_so_ops **) gdbarch_data (gdbarch, solib_data);

 
   return *ops;
 }
 
   return *ops;
 }


@@ -75,7 +78,8 @@ solib_ops (struct gdbarch *gdbarch)
 void
 set_solib_ops (struct gdbarch *gdbarch, const struct target_so_ops *new_ops)
 {
 void
 set_solib_ops (struct gdbarch *gdbarch, const struct target_so_ops *new_ops)
 {

-  const struct target_so_ops **ops = gdbarch_data (gdbarch, solib_data);
+  const struct target_so_ops **ops
+    = (const struct target_so_ops **) gdbarch_data (gdbarch, solib_data);

 
   *ops = new_ops;
 }
 
   *ops = new_ops;
 }


@@ -87,9 +91,6 @@ set_solib_ops (struct gdbarch *gdbarch, const struct target_so_ops *new_ops)
    configuration needs to call set_solib_ops.  */
 struct target_so_ops *current_target_so_ops;
 
    configuration needs to call set_solib_ops.  */
 struct target_so_ops *current_target_so_ops;
 

-/* List of known shared objects */
-#define so_list_head current_program_space->so_list
-

 /* Local function prototypes */
 
 /* If non-empty, this is a search path for loading non-absolute shared library
 /* Local function prototypes */
 
 /* If non-empty, this is a search path for loading non-absolute shared library


@@ -112,82 +113,73 @@ show_solib_search_path (struct ui_file *file, int from_tty,
 #  define DOS_BASED_FILE_SYSTEM 0
 #endif
 
 #  define DOS_BASED_FILE_SYSTEM 0
 #endif
 

-/* Returns the full pathname of the shared library file, or NULL if
-   not found.  (The pathname is malloc'ed; it needs to be freed by the
-   caller.)  *FD is set to either -1 or an open file handle for the
-   library.
+/* Return the full pathname of a binary file (the main executable or a
+   shared library file), or NULL if not found.  If FD is non-NULL, *FD
+   is set to either -1 or an open file handle for the binary file.

 
    Global variable GDB_SYSROOT is used as a prefix directory
 
    Global variable GDB_SYSROOT is used as a prefix directory

-   to search for shared libraries if they have an absolute path.
+   to search for binary files if they have an absolute path.
+   If GDB_SYSROOT starts with "target:" and target filesystem
+   is the local filesystem then the "target:" prefix will be
+   stripped before the search starts.  This ensures that the
+   same search algorithm is used for local files regardless of
+   whether a "target:" prefix was used.

 
    Global variable SOLIB_SEARCH_PATH is used as a prefix directory
    (or set of directories, as in LD_LIBRARY_PATH) to search for all
 
    Global variable SOLIB_SEARCH_PATH is used as a prefix directory
    (or set of directories, as in LD_LIBRARY_PATH) to search for all

-   shared libraries if not found in GDB_SYSROOT.
+   shared libraries if not found in either the sysroot (if set) or
+   the local filesystem.  SOLIB_SEARCH_PATH is not used when searching
+   for the main executable.

 
    Search algorithm:
 
    Search algorithm:

-   * If there is a gdb_sysroot and path is absolute:
-   *   Search for gdb_sysroot/path.
+   * If a sysroot is set and path is absolute:
+   *   Search for sysroot/path.

    * else
    *   Look for it literally (unmodified).
    * else
    *   Look for it literally (unmodified).

-   * Look in SOLIB_SEARCH_PATH.
-   * If available, use target defined search function.
-   * If gdb_sysroot is NOT set, perform the following two searches:
+   * If IS_SOLIB is non-zero:
+   *   Look in SOLIB_SEARCH_PATH.
+   *   If available, use target defined search function.
+   * If NO sysroot is set, perform the following two searches:

    *   Look in inferior's $PATH.
    *   Look in inferior's $PATH.

-   *   Look in inferior's $LD_LIBRARY_PATH.
+   *   If IS_SOLIB is non-zero:
+   *     Look in inferior's $LD_LIBRARY_PATH.

    *
    *

-   * The last check avoids doing this search when targetting remote
-   * machines since gdb_sysroot will almost always be set.
+   * The last check avoids doing this search when targeting remote
+   * machines since a sysroot will almost always be set.

 */
 
 */
 

-char *
-solib_find (char *in_pathname, int *fd)
+static gdb::unique_xmalloc_ptr<char>
+solib_find_1 (const char *in_pathname, int *fd, bool is_solib)

 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
   int found_file = -1;
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
   int found_file = -1;

-  char *temp_pathname = NULL;
-  int gdb_sysroot_is_empty;
-  const char *solib_symbols_extension
-    = gdbarch_solib_symbols_extension (target_gdbarch ());
+  gdb::unique_xmalloc_ptr<char> temp_pathname;

   const char *fskind = effective_target_file_system_kind ();
   const char *fskind = effective_target_file_system_kind ();

-  struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
-  char *sysroot = NULL;
-
-  /* If solib_symbols_extension is set, replace the file's
-     extension.  */
-  if (solib_symbols_extension)
+  const char *sysroot = gdb_sysroot;
+  int prefix_len, orig_prefix_len;
+
+  /* If the absolute prefix starts with "target:" but the filesystem
+     accessed by the target_fileio_* methods is the local filesystem
+     then we strip the "target:" prefix now and work with the local
+     filesystem.  This ensures that the same search algorithm is used
+     for all local files regardless of whether a "target:" prefix was
+     used.  */
+  if (is_target_filename (sysroot) && target_filesystem_is_local ())
+    sysroot += strlen (TARGET_SYSROOT_PREFIX);
+
+  /* Strip any trailing slashes from the absolute prefix.  */
+  prefix_len = orig_prefix_len = strlen (sysroot);
+
+  while (prefix_len > 0 && IS_DIR_SEPARATOR (sysroot[prefix_len - 1]))
+    prefix_len--;
+
+  std::string sysroot_holder;
+  if (prefix_len == 0)
+    sysroot = NULL;
+  else if (prefix_len != orig_prefix_len)

     {
     {

-      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 (!gdb_sysroot_is_empty)
-    {
-      int prefix_len = strlen (gdb_sysroot);
-
-      /* Remove trailing slashes from absolute prefix.  */
-      while (prefix_len > 0
-            && IS_DIR_SEPARATOR (gdb_sysroot[prefix_len - 1]))
-       prefix_len--;
-
-      sysroot = savestring (gdb_sysroot, prefix_len);
-      make_cleanup (xfree, sysroot);
+      sysroot_holder = std::string (sysroot, prefix_len);
+      sysroot = sysroot_holder.c_str ();

     }
 
   /* If we're on a non-DOS-based system, backslashes won't be
     }
 
   /* If we're on a non-DOS-based system, backslashes won't be


@@ -199,7 +191,7 @@ solib_find (char *in_pathname, int *fd)
       char *p;
 
       /* Avoid clobbering our input.  */
       char *p;
 
       /* Avoid clobbering our input.  */

-      p = alloca (strlen (in_pathname) + 1);
+      p = (char *) alloca (strlen (in_pathname) + 1);

       strcpy (p, in_pathname);
       in_pathname = p;
 
       strcpy (p, in_pathname);
       in_pathname = p;
 


@@ -222,11 +214,11 @@ solib_find (char *in_pathname, int *fd)
        3rd attempt, c:/foo/bar.dll ==> /sysroot/foo/bar.dll
   */
 
        3rd attempt, c:/foo/bar.dll ==> /sysroot/foo/bar.dll
   */
 

-  if (!IS_TARGET_ABSOLUTE_PATH (fskind, in_pathname) || gdb_sysroot_is_empty)
-    temp_pathname = xstrdup (in_pathname);
+  if (!IS_TARGET_ABSOLUTE_PATH (fskind, in_pathname) || sysroot == NULL)
+    temp_pathname.reset (xstrdup (in_pathname));

   else
     {
   else
     {

-      int need_dir_separator;
+      bool need_dir_separator;

 
       /* Concatenate the sysroot and the target reported filename.  We
         may need to glue them with a directory separator.  Cases to
 
       /* Concatenate the sysroot and the target reported filename.  We
         may need to glue them with a directory separator.  Cases to


@@ -236,36 +228,34 @@ solib_find (char *in_pathname, int *fd)
         |-----------------+-----------+----------------|
         | /some/dir       | /         | c:/foo/bar.dll |
         | /some/dir       |           | /foo/bar.dll   |
         |-----------------+-----------+----------------|
         | /some/dir       | /         | c:/foo/bar.dll |
         | /some/dir       |           | /foo/bar.dll   |

-        | remote:         |           | c:/foo/bar.dll |
-        | remote:         |           | /foo/bar.dll   |
-        | remote:some/dir | /         | c:/foo/bar.dll |
-        | remote:some/dir |           | /foo/bar.dll   |
+        | target:         |           | c:/foo/bar.dll |
+        | target:         |           | /foo/bar.dll   |
+        | target:some/dir | /         | c:/foo/bar.dll |
+        | target:some/dir |           | /foo/bar.dll   |

 
        IOW, we don't need to add a separator if IN_PATHNAME already
 
        IOW, we don't need to add a separator if IN_PATHNAME already

-       has one, or when the the sysroot is exactly "remote:".
+       has one, or when the sysroot is exactly "target:".

        There's no need to check for drive spec explicitly, as we only
        get here if IN_PATHNAME is considered an absolute path.  */
       need_dir_separator = !(IS_DIR_SEPARATOR (in_pathname[0])
        There's no need to check for drive spec explicitly, as we only
        get here if IN_PATHNAME is considered an absolute path.  */
       need_dir_separator = !(IS_DIR_SEPARATOR (in_pathname[0])

-                            || strcmp (REMOTE_SYSROOT_PREFIX, sysroot) == 0);
+                            || strcmp (TARGET_SYSROOT_PREFIX, sysroot) == 0);

 
       /* Cat the prefixed pathname together.  */
 
       /* Cat the prefixed pathname together.  */

-      temp_pathname = concat (sysroot,
-                             need_dir_separator ? SLASH_STRING : "",
-                             in_pathname, (char *) NULL);
+      temp_pathname.reset (concat (sysroot,
+                                  need_dir_separator ? SLASH_STRING : "",
+                                  in_pathname, (char *) NULL));

     }
 
     }
 

-  /* Handle remote files.  */
-  if (remote_filename_p (temp_pathname))
+  /* Handle files to be accessed via the target.  */
+  if (is_target_filename (temp_pathname.get ()))

     {
     {

-      *fd = -1;
-      do_cleanups (old_chain);
+      if (fd != NULL)
+       *fd = -1;

       return temp_pathname;
     }
 
   /* Now see if we can open it.  */
       return temp_pathname;
     }
 
   /* Now see if we can open it.  */

-  found_file = gdb_open_cloexec (temp_pathname, O_RDONLY | O_BINARY, 0);
-  if (found_file < 0)
-    xfree (temp_pathname);
+  found_file = gdb_open_cloexec (temp_pathname.get (), O_RDONLY | O_BINARY, 0);

 
   /* If the search in gdb_sysroot failed, and the path name has a
      drive spec (e.g, c:/foo), try stripping ':' from the drive spec,
 
   /* If the search in gdb_sysroot failed, and the path name has a
      drive spec (e.g, c:/foo), try stripping ':' from the drive spec,


@@ -273,49 +263,44 @@ solib_find (char *in_pathname, int *fd)
        c:/foo/bar.dll ==> /sysroot/c/foo/bar.dll.  */
 
   if (found_file < 0
        c:/foo/bar.dll ==> /sysroot/c/foo/bar.dll.  */
 
   if (found_file < 0

-      && !gdb_sysroot_is_empty
+      && sysroot != NULL

       && HAS_TARGET_DRIVE_SPEC (fskind, in_pathname))
     {
       && HAS_TARGET_DRIVE_SPEC (fskind, in_pathname))
     {

-      int need_dir_separator = !IS_DIR_SEPARATOR (in_pathname[2]);
-      char *drive = savestring (in_pathname, 1);
+      bool need_dir_separator = !IS_DIR_SEPARATOR (in_pathname[2]);
+      char drive[2] = { in_pathname[0], '\0' };

 
 

-      temp_pathname = concat (sysroot,
-                             SLASH_STRING,
-                             drive,
-                             need_dir_separator ? SLASH_STRING : "",
-                             in_pathname + 2, (char *) NULL);
-      xfree (drive);
+      temp_pathname.reset (concat (sysroot,
+                                  SLASH_STRING,
+                                  drive,
+                                  need_dir_separator ? SLASH_STRING : "",
+                                  in_pathname + 2, (char *) NULL));

 
 

-      found_file = gdb_open_cloexec (temp_pathname, O_RDONLY | O_BINARY, 0);
+      found_file = gdb_open_cloexec (temp_pathname.get (),
+                                    O_RDONLY | O_BINARY, 0);

       if (found_file < 0)
        {
       if (found_file < 0)
        {

-         xfree (temp_pathname);
-

          /* If the search in gdb_sysroot still failed, try fully
             stripping the drive spec, and trying once more in the
             sysroot before giving up.
 
             c:/foo/bar.dll ==> /sysroot/foo/bar.dll.  */
 
          /* If the search in gdb_sysroot still failed, try fully
             stripping the drive spec, and trying once more in the
             sysroot before giving up.
 
             c:/foo/bar.dll ==> /sysroot/foo/bar.dll.  */
 

-         temp_pathname = concat (sysroot,
-                                 need_dir_separator ? SLASH_STRING : "",
-                                 in_pathname + 2, (char *) NULL);
+         temp_pathname.reset (concat (sysroot,
+                                      need_dir_separator ? SLASH_STRING : "",
+                                      in_pathname + 2, (char *) NULL));

 
 

-         found_file = gdb_open_cloexec (temp_pathname, O_RDONLY | O_BINARY, 0);
-         if (found_file < 0)
-           xfree (temp_pathname);
+         found_file = gdb_open_cloexec (temp_pathname.get (),
+                                        O_RDONLY | O_BINARY, 0);

        }
     }
 
        }
     }
 

-  do_cleanups (old_chain);
-

   /* We try to find the library in various ways.  After each attempt,
      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)
   /* We try to find the library in various ways.  After each attempt,
      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;
+    temp_pathname.reset (NULL);

 
   /* 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
 
   /* 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


@@ -332,95 +317,176 @@ solib_find (char *in_pathname, int *fd)
        in_pathname++;
     }
 
        in_pathname++;
     }
 

-  /* If not found, search the solib_search_path (if any).  */
-  if (found_file < 0 && solib_search_path != NULL)
+  /* If not found, and we're looking for a solib, search the
+     solib_search_path (if any).  */
+  if (is_solib && found_file < 0 && solib_search_path != NULL)

     found_file = openp (solib_search_path,
                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH,
                        in_pathname, O_RDONLY | O_BINARY, &temp_pathname);
 
     found_file = openp (solib_search_path,
                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH,
                        in_pathname, O_RDONLY | O_BINARY, &temp_pathname);
 

-  /* If not found, next search the solib_search_path (if any) for the basename
-     only (ignoring the path).  This is to allow reading solibs from a path
-     that differs from the opened path.  */
-  if (found_file < 0 && solib_search_path != NULL)
+  /* If not found, and we're looking for a solib, next search the
+     solib_search_path (if any) for the basename only (ignoring the
+     path).  This is to allow reading solibs from a path that differs
+     from the opened path.  */
+  if (is_solib && found_file < 0 && solib_search_path != NULL)

     found_file = openp (solib_search_path,
                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH,
                        target_lbasename (fskind, in_pathname),
                        O_RDONLY | O_BINARY, &temp_pathname);
 
     found_file = openp (solib_search_path,
                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH,
                        target_lbasename (fskind, in_pathname),
                        O_RDONLY | O_BINARY, &temp_pathname);
 

-  /* If not found, try to use target supplied solib search method.  */
-  if (found_file < 0 && ops->find_and_open_solib)
+  /* If not found, and we're looking for a solib, try to use target
+     supplied solib search method.  */
+  if (is_solib && found_file < 0 && ops->find_and_open_solib)

     found_file = ops->find_and_open_solib (in_pathname, O_RDONLY | O_BINARY,
                                           &temp_pathname);
 
   /* If not found, next search the inferior's $PATH environment variable.  */
     found_file = ops->find_and_open_solib (in_pathname, O_RDONLY | O_BINARY,
                                           &temp_pathname);
 
   /* 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 (current_inferior ()->environment,
-                                       "PATH"),
+  if (found_file < 0 && sysroot == NULL)
+    found_file = openp (current_inferior ()->environment.get ("PATH"),

                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH, in_pathname,
                        O_RDONLY | O_BINARY, &temp_pathname);
 
                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH, 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 (current_inferior ()->environment,
-                                       "LD_LIBRARY_PATH"),
+  /* If not found, and we're looking for a solib, next search the
+     inferior's $LD_LIBRARY_PATH environment variable.  */
+  if (is_solib && found_file < 0 && sysroot == NULL)
+    found_file = openp (current_inferior ()->environment.get
+                       ("LD_LIBRARY_PATH"),

                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH, in_pathname,
                        O_RDONLY | O_BINARY, &temp_pathname);
 
                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH, in_pathname,
                        O_RDONLY | O_BINARY, &temp_pathname);
 

-  *fd = found_file;
+  if (fd == NULL)
+    {
+      if (found_file >= 0)
+       close (found_file);
+    }
+  else
+    *fd = found_file;
+

   return temp_pathname;
 }
 
   return temp_pathname;
 }
 

-/* Open and return a BFD for the shared library PATHNAME.  If FD is not -1,
-   it is used as file handle to open the file.  Throws an error if the file
-   could not be opened.  Handles both local and remote file access.
-
-   PATHNAME must be malloc'ed by the caller.  It will be freed by this
-   function.  If unsuccessful, the FD will be closed (unless FD was
-   -1).  */
+/* Return the full pathname of the main executable, or NULL if not
+   found.  If FD is non-NULL, *FD is set to either -1 or an open file
+   handle for the main executable.  */

 
 

-bfd *
-solib_bfd_fopen (char *pathname, int fd)
+gdb::unique_xmalloc_ptr<char>
+exec_file_find (const char *in_pathname, int *fd)

 {
 {

-  bfd *abfd;
+  gdb::unique_xmalloc_ptr<char> result;
+  const char *fskind = effective_target_file_system_kind ();
+
+  if (in_pathname == NULL)
+    return NULL;

 
 

-  if (remote_filename_p (pathname))
+  if (*gdb_sysroot != '\0' && IS_TARGET_ABSOLUTE_PATH (fskind, in_pathname))

     {
     {

-      gdb_assert (fd == -1);
-      abfd = remote_bfd_open (pathname, gnutarget);
+      result = solib_find_1 (in_pathname, fd, false);
+
+      if (result == NULL && fskind == file_system_kind_dos_based)
+       {
+         char *new_pathname;
+
+         new_pathname = (char *) alloca (strlen (in_pathname) + 5);
+         strcpy (new_pathname, in_pathname);
+         strcat (new_pathname, ".exe");
+
+         result = solib_find_1 (new_pathname, fd, false);
+       }

     }
   else
     {
     }
   else
     {

-      abfd = gdb_bfd_open (pathname, gnutarget, fd);
+      /* It's possible we don't have a full path, but rather just a
+        filename.  Some targets, such as HP-UX, don't provide the
+        full path, sigh.
+
+        Attempt to qualify the filename against the source path.
+        (If that fails, we'll just fall back on the original
+        filename.  Not much more we can do...)  */
+
+      if (!source_full_path_of (in_pathname, &result))
+       result.reset (xstrdup (in_pathname));
+      if (fd != NULL)
+       *fd = -1;
+    }
+
+  return result;
+}
+
+/* Return the full pathname of a shared library file, or NULL if not
+   found.  If FD is non-NULL, *FD is set to either -1 or an open file
+   handle for the shared library.
+
+   The search algorithm used is described in solib_find_1's comment
+   above.  */
+
+gdb::unique_xmalloc_ptr<char>
+solib_find (const char *in_pathname, int *fd)
+{
+  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 != NULL)
+    {
+      const char *p = in_pathname + strlen (in_pathname);

 
 

-      if (abfd)
-       bfd_set_cacheable (abfd, 1);
+      while (p > in_pathname && *p != '.')
+       p--;
+
+      if (*p == '.')
+       {
+         char *new_pathname;
+
+         new_pathname
+           = (char *) 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;
+       }

     }
 
     }
 

-  if (!abfd)
+  return solib_find_1 (in_pathname, fd, true);
+}
+
+/* Open and return a BFD for the shared library PATHNAME.  If FD is not -1,
+   it is used as file handle to open the file.  Throws an error if the file
+   could not be opened.  Handles both local and remote file access.
+
+   If unsuccessful, the FD will be closed (unless FD was -1).  */
+
+gdb_bfd_ref_ptr
+solib_bfd_fopen (const char *pathname, int fd)
+{
+  gdb_bfd_ref_ptr abfd (gdb_bfd_open (pathname, gnutarget, fd));
+
+  if (abfd != NULL && !gdb_bfd_has_target_filename (abfd.get ()))
+    bfd_set_cacheable (abfd.get (), 1);
+
+  if (abfd == NULL)

     {
     {

-      make_cleanup (xfree, pathname);
+      /* Arrange to free PATHNAME when the error is thrown.  */

       error (_("Could not open `%s' as an executable file: %s"),
             pathname, bfd_errmsg (bfd_get_error ()));
     }
 
       error (_("Could not open `%s' as an executable file: %s"),
             pathname, bfd_errmsg (bfd_get_error ()));
     }
 

-  xfree (pathname);
-

   return abfd;
 }
 
 /* Find shared library PATHNAME and open a BFD for it.  */
 
   return abfd;
 }
 
 /* Find shared library PATHNAME and open a BFD for it.  */
 

-bfd *
-solib_bfd_open (char *pathname)
+gdb_bfd_ref_ptr
+solib_bfd_open (const char *pathname)

 {
 {

-  char *found_pathname;

   int found_file;
   int found_file;

-  bfd *abfd;

   const struct bfd_arch_info *b;
 
   /* Search for shared library file.  */
   const struct bfd_arch_info *b;
 
   /* Search for shared library file.  */

-  found_pathname = solib_find (pathname, &found_file);
+  gdb::unique_xmalloc_ptr<char> found_pathname
+    = solib_find (pathname, &found_file);

   if (found_pathname == NULL)
     {
       /* Return failure if the file could not be found, so that we can
   if (found_pathname == NULL)
     {
       /* Return failure if the file could not be found, so that we can


@@ -432,22 +498,20 @@ solib_bfd_open (char *pathname)
     }
 
   /* Open bfd for shared library.  */
     }
 
   /* Open bfd for shared library.  */

-  abfd = solib_bfd_fopen (found_pathname, found_file);
+  gdb_bfd_ref_ptr abfd (solib_bfd_fopen (found_pathname.get (), found_file));

 
   /* Check bfd format.  */
 
   /* Check bfd format.  */

-  if (!bfd_check_format (abfd, bfd_object))
-    {
-      make_cleanup_bfd_unref (abfd);
-      error (_("`%s': not in executable format: %s"),
-            bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ()));
-    }
+  if (!bfd_check_format (abfd.get (), bfd_object))
+    error (_("`%s': not in executable format: %s"),
+          bfd_get_filename (abfd.get ()), bfd_errmsg (bfd_get_error ()));

 
   /* Check bfd arch.  */
   b = gdbarch_bfd_arch_info (target_gdbarch ());
 
   /* Check bfd arch.  */
   b = gdbarch_bfd_arch_info (target_gdbarch ());

-  if (!b->compatible (b, bfd_get_arch_info (abfd)))
+  if (!b->compatible (b, bfd_get_arch_info (abfd.get ())))

     warning (_("`%s': Shared library architecture %s is not compatible "
     warning (_("`%s': Shared library architecture %s is not compatible "

-               "with target architecture %s."), bfd_get_filename (abfd),
-             bfd_get_arch_info (abfd)->printable_name, b->printable_name);
+              "with target architecture %s."), bfd_get_filename (abfd.get ()),
+            bfd_get_arch_info (abfd.get ())->printable_name,
+            b->printable_name);

 
   return abfd;
 }
 
   return abfd;
 }


@@ -468,21 +532,16 @@ static int
 solib_map_sections (struct so_list *so)
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
 solib_map_sections (struct so_list *so)
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());

-  char *filename;

   struct target_section *p;
   struct target_section *p;

-  struct cleanup *old_chain;
-  bfd *abfd;

 
 

-  filename = tilde_expand (so->so_name);
-  old_chain = make_cleanup (xfree, filename);
-  abfd = ops->bfd_open (filename);
-  do_cleanups (old_chain);
+  gdb::unique_xmalloc_ptr<char> filename (tilde_expand (so->so_name));
+  gdb_bfd_ref_ptr abfd (ops->bfd_open (filename.get ()));

 
   if (abfd == NULL)
     return 0;
 
   /* Leave bfd open, core_xfer_memory and "info files" need it.  */
 
   if (abfd == NULL)
     return 0;
 
   /* Leave bfd open, core_xfer_memory and "info files" need it.  */

-  so->abfd = abfd;
+  so->abfd = abfd.release ();

 
   /* Copy the full path name into so_name, allowing symbol_file_add
      to find it later.  This also affects the =library-loaded GDB/MI
 
   /* Copy the full path name into so_name, allowing symbol_file_add
      to find it later.  This also affects the =library-loaded GDB/MI


@@ -490,14 +549,14 @@ solib_map_sections (struct so_list *so)
      the library's host-side path.  If we let the target dictate
      that objfile's path, and the target is different from the host,
      GDB/MI will not provide the correct host-side path.  */
      the library's host-side path.  If we let the target dictate
      that objfile's path, and the target is different from the host,
      GDB/MI will not provide the correct host-side path.  */

-  if (strlen (bfd_get_filename (abfd)) >= SO_NAME_MAX_PATH_SIZE)
+  if (strlen (bfd_get_filename (so->abfd)) >= SO_NAME_MAX_PATH_SIZE)

     error (_("Shared library file name is too long."));
     error (_("Shared library file name is too long."));

-  strcpy (so->so_name, bfd_get_filename (abfd));
+  strcpy (so->so_name, bfd_get_filename (so->abfd));

 
 

-  if (build_section_table (abfd, &so->sections, &so->sections_end))
+  if (build_section_table (so->abfd, &so->sections, &so->sections_end))

     {
       error (_("Can't find the file sections in `%s': %s"),
     {
       error (_("Can't find the file sections in `%s': %s"),

-            bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ()));
+            bfd_get_filename (so->abfd), bfd_errmsg (bfd_get_error ()));

     }
 
   for (p = so->sections; p < so->sections_end; p++)
     }
 
   for (p = so->sections; p < so->sections_end; p++)


@@ -588,19 +647,11 @@ free_so (struct so_list *so)
 }
 
 
 }
 
 

-/* Return address of first so_list entry in master shared object list.  */
-struct so_list *
-master_so_list (void)
-{
-  return so_list_head;
-}
-

 /* Read in symbols for shared object SO.  If SYMFILE_VERBOSE is set in FLAGS,
 /* 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.  */
+   be chatty about it.  Return true if any symbols were actually loaded.  */

 
 

-int
-solib_read_symbols (struct so_list *so, int flags)
+bool
+solib_read_symbols (struct so_list *so, symfile_add_flags flags)

 {
   if (so->symbols_loaded)
     {
 {
   if (so->symbols_loaded)
     {


@@ -616,83 +667,61 @@ solib_read_symbols (struct so_list *so, int flags)
 
       flags |= current_inferior ()->symfile_flags;
 
 
       flags |= current_inferior ()->symfile_flags;
 

-      TRY
+      try

        {
        {

-         struct section_addr_info *sap;
-

          /* Have we already loaded this shared object?  */
          /* Have we already loaded this shared object?  */

-         ALL_OBJFILES (so->objfile)
+         so->objfile = nullptr;
+         for (objfile *objfile : current_program_space->objfiles ())

            {
            {

-             if (filename_cmp (objfile_name (so->objfile), so->so_name) == 0
-                 && so->objfile->addr_low == so->addr_low)
-               break;
+             if (filename_cmp (objfile_name (objfile), so->so_name) == 0
+                 && objfile->addr_low == so->addr_low)
+               {
+                 so->objfile = objfile;
+                 break;
+               }
+           }
+         if (so->objfile == NULL)
+           {
+             section_addr_info sap
+               = build_section_addr_info_from_section_table (so->sections,
+                                                             so->sections_end);
+             so->objfile = symbol_file_add_from_bfd (so->abfd, so->so_name,
+                                                     flags, &sap,
+                                                     OBJF_SHARED, NULL);
+             so->objfile->addr_low = so->addr_low;

            }
            }

-         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, so->so_name,
-                                                 flags, sap, OBJF_SHARED,
-                                                 NULL);
-         so->objfile->addr_low = so->addr_low;
-         free_section_addr_info (sap);

 
          so->symbols_loaded = 1;
        }
 
          so->symbols_loaded = 1;
        }

-      CATCH (e, RETURN_MASK_ERROR)
+      catch (const gdb_exception_error &e)

        {
          exception_fprintf (gdb_stderr, e, _("Error while reading shared"
                                              " library symbols for %s:\n"),
                             so->so_name);
        }
        {
          exception_fprintf (gdb_stderr, e, _("Error while reading shared"
                                              " library symbols for %s:\n"),
                             so->so_name);
        }

-      END_CATCH

 
 

-      return 1;
+      return true;

     }
 
     }
 

-  return 0;
+  return false;

 }
 
 }
 

-/* Return 1 if KNOWN->objfile is used by any other so_list object in the
-   SO_LIST_HEAD list.  Return 0 otherwise.  */
+/* Return true if KNOWN->objfile is used by any other so_list object
+   in the list of shared libraries.  Return false otherwise.  */

 
 

-static int
+static bool

 solib_used (const struct so_list *const known)
 {
 solib_used (const struct so_list *const known)
 {

-  const struct so_list *pivot;
-
-  for (pivot = so_list_head; pivot != NULL; pivot = pivot->next)
+  for (const struct so_list *pivot : current_program_space->solibs ())

     if (pivot != known && pivot->objfile == known->objfile)
     if (pivot != known && pivot->objfile == known->objfile)

-      return 1;
-  return 0;
+      return true;
+  return false;

 }
 
 }
 

-/* Synchronize GDB's shared object list with inferior's.
-
-   Extract the list of currently loaded shared objects from the
-   inferior, and compare it with the list of shared objects currently
-   in GDB's so_list_head list.  Edit so_list_head to bring it in sync
-   with the inferior's new list.
-
-   If we notice that the inferior has unloaded some shared objects,
-   free any symbolic info GDB had read about those shared objects.
-
-   Don't load symbolic info for any new shared objects; just add them
-   to the list, and leave their symbols_loaded flag clear.
-
-   If FROM_TTY is non-null, feel free to print messages about what
-   we're doing.
-
-   If TARGET is non-null, add the sections of all new shared objects
-   to TARGET's section table.  Note that this doesn't remove any
-   sections for shared objects that have been unloaded, and it
-   doesn't check to see if the new shared objects are already present in
-   the section table.  But we only use this for core files and
-   processes we've just attached to, so that's okay.  */
+/* See solib.h.  */

 
 

-static void
-update_solib_list (int from_tty, struct target_ops *target)
+void
+update_solib_list (int from_tty)

 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
   struct so_list *inferior = ops->current_sos();
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
   struct so_list *inferior = ops->current_sos();


@@ -700,7 +729,7 @@ update_solib_list (int from_tty, struct target_ops *target)
 
   /* We can reach here due to changing solib-search-path or the
      sysroot, before having any inferior.  */
 
   /* We can reach here due to changing solib-search-path or the
      sysroot, before having any inferior.  */

-  if (target_has_execution && !ptid_equal (inferior_ptid, null_ptid))
+  if (target_has_execution && inferior_ptid != null_ptid)

     {
       struct inferior *inf = current_inferior ();
 
     {
       struct inferior *inf = current_inferior ();
 


@@ -708,9 +737,18 @@ update_solib_list (int from_tty, struct target_ops *target)
         have not opened a symbol file, we may be able to get its
         symbols now!  */
       if (inf->attach_flag && symfile_objfile == NULL)
         have not opened a symbol file, we may be able to get its
         symbols now!  */
       if (inf->attach_flag && symfile_objfile == NULL)

-       catch_errors (ops->open_symbol_file_object, &from_tty,
-                     "Error reading attached process's symbol file.\n",
-                     RETURN_MASK_ALL);
+       {
+         try
+           {
+             ops->open_symbol_file_object (from_tty);
+           }
+         catch (const gdb_exception &ex)
+           {
+             exception_fprintf (gdb_stderr, ex,
+                                "Error reading attached "
+                                "process's symbol file.\n");
+           }
+       }

     }
 
   /* GDB and the inferior's dynamic linker each maintain their own
     }
 
   /* GDB and the inferior's dynamic linker each maintain their own


@@ -737,8 +775,8 @@ update_solib_list (int from_tty, struct target_ops *target)
      the time we're done walking GDB's list, the inferior's list
      contains only the new shared objects, which we then add.  */
 
      the time we're done walking GDB's list, the inferior's list
      contains only the new shared objects, which we then add.  */
 

-  gdb = so_list_head;
-  gdb_link = &so_list_head;
+  gdb = current_program_space->so_list;
+  gdb_link = &current_program_space->so_list;

   while (gdb)
     {
       struct so_list *i = inferior;
   while (gdb)
     {
       struct so_list *i = inferior;


@@ -779,17 +817,16 @@ update_solib_list (int from_tty, struct target_ops *target)
        {
          /* Notify any observer that the shared object has been
             unloaded before we remove it from GDB's tables.  */
        {
          /* Notify any observer that the shared object has been
             unloaded before we remove it from GDB's tables.  */

-         observer_notify_solib_unloaded (gdb);
+         gdb::observers::solib_unloaded.notify (gdb);

 
 

-         VEC_safe_push (char_ptr, current_program_space->deleted_solibs,
-                        xstrdup (gdb->so_name));
+         current_program_space->deleted_solibs.push_back (gdb->so_name);

 
          *gdb_link = gdb->next;
 
          /* Unless the user loaded it explicitly, free SO's objfile.  */
          if (gdb->objfile && ! (gdb->objfile->flags & OBJF_USERLOADED)
              && !solib_used (gdb))
 
          *gdb_link = gdb->next;
 
          /* Unless the user loaded it explicitly, free SO's objfile.  */
          if (gdb->objfile && ! (gdb->objfile->flags & OBJF_USERLOADED)
              && !solib_used (gdb))

-           free_objfile (gdb->objfile);
+           gdb->objfile->unlink ();

 
          /* Some targets' section tables might be referring to
             sections from so->abfd; remove them.  */
 
          /* Some targets' section tables might be referring to
             sections from so->abfd; remove them.  */


@@ -818,9 +855,9 @@ update_solib_list (int from_tty, struct target_ops *target)
        {
 
          i->pspace = current_program_space;
        {
 
          i->pspace = current_program_space;

-         VEC_safe_push (so_list_ptr, current_program_space->added_solibs, i);
+         current_program_space->added_solibs.push_back (i);

 
 

-         TRY
+         try

            {
              /* Fill in the rest of the `struct so_list' node.  */
              if (!solib_map_sections (i))
            {
              /* Fill in the rest of the `struct so_list' node.  */
              if (!solib_map_sections (i))


@@ -831,17 +868,16 @@ update_solib_list (int from_tty, struct target_ops *target)
                }
            }
 
                }
            }
 

-         CATCH (e, RETURN_MASK_ERROR)
+         catch (const gdb_exception_error &e)

            {
              exception_fprintf (gdb_stderr, e,
                                 _("Error while mapping shared "
                                   "library sections:\n"));
            }
            {
              exception_fprintf (gdb_stderr, e,
                                 _("Error while mapping shared "
                                   "library sections:\n"));
            }

-         END_CATCH

 
          /* Notify any observer that the shared object has been
             loaded now that we've added it to GDB's tables.  */
 
          /* Notify any observer that the shared object has been
             loaded now that we've added it to GDB's tables.  */

-         observer_notify_solib_loaded (i);
+         gdb::observers::solib_loaded.notify (i);

        }
 
       /* If a library was not found, issue an appropriate warning
        }
 
       /* If a library was not found, issue an appropriate warning


@@ -872,7 +908,7 @@ Do you need \"set solib-search-path\" or \"set sysroot\"?"),
    the file name against "/libpthread".  This can lead to false
    positives, but this should be good enough in practice.  */
 
    the file name against "/libpthread".  This can lead to false
    positives, but this should be good enough in practice.  */
 

-int
+bool

 libpthread_name_p (const char *name)
 {
   return (strstr (name, "/libpthread") != NULL);
 libpthread_name_p (const char *name)
 {
   return (strstr (name, "/libpthread") != NULL);


@@ -880,7 +916,7 @@ libpthread_name_p (const char *name)
 
 /* Return non-zero if SO is the libpthread shared library.  */
 
 
 /* Return non-zero if SO is the libpthread shared library.  */
 

-static int
+static bool

 libpthread_solib_p (struct so_list *so)
 {
   return libpthread_name_p (so->so_name);
 libpthread_solib_p (struct so_list *so)
 {
   return libpthread_name_p (so->so_name);


@@ -893,14 +929,11 @@ libpthread_solib_p (struct so_list *so)
    If READSYMS is 0, defer reading symbolic information until later
    but still do any needed low level processing.
 
    If READSYMS is 0, defer reading symbolic information until later
    but still do any needed low level processing.
 

-   FROM_TTY and TARGET are as described for update_solib_list, above.  */
+   FROM_TTY is described for update_solib_list, above.  */

 
 void
 
 void

-solib_add (const char *pattern, int from_tty,
-          struct target_ops *target, int readsyms)
+solib_add (const char *pattern, int from_tty, int readsyms)

 {
 {

-  struct so_list *gdb;
-

   if (print_symbol_loading_p (from_tty, 0, 0))
     {
       if (pattern != NULL)
   if (print_symbol_loading_p (from_tty, 0, 0))
     {
       if (pattern != NULL)


@@ -922,18 +955,20 @@ solib_add (const char *pattern, int from_tty,
        error (_("Invalid regexp: %s"), re_err);
     }
 
        error (_("Invalid regexp: %s"), re_err);
     }
 

-  update_solib_list (from_tty, target);
+  update_solib_list (from_tty);

 
   /* Walk the list of currently loaded shared libraries, and read
      symbols for any that match the pattern --- or any whose symbols
      aren't already loaded, if no pattern was given.  */
   {
 
   /* Walk the list of currently loaded shared libraries, and read
      symbols for any that match the pattern --- or any whose symbols
      aren't already loaded, if no pattern was given.  */
   {

-    int any_matches = 0;
-    int loaded_any_symbols = 0;
-    const int flags =
-        SYMFILE_DEFER_BP_RESET | (from_tty ? SYMFILE_VERBOSE : 0);
+    bool any_matches = false;
+    bool loaded_any_symbols = false;
+    symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET;
+
+    if (from_tty)
+        add_flags |= SYMFILE_VERBOSE;

 
 

-    for (gdb = so_list_head; gdb; gdb = gdb->next)
+    for (struct so_list *gdb : current_program_space->solibs ())

       if (! pattern || re_exec (gdb->so_name))
        {
           /* Normally, we would read the symbols from that library
       if (! pattern || re_exec (gdb->so_name))
        {
           /* Normally, we would read the symbols from that library


@@ -944,7 +979,7 @@ solib_add (const char *pattern, int from_tty,
           const int add_this_solib =
             (readsyms || libpthread_solib_p (gdb));
 
           const int add_this_solib =
             (readsyms || libpthread_solib_p (gdb));
 

-         any_matches = 1;
+         any_matches = true;

          if (add_this_solib)
            {
              if (gdb->symbols_loaded)
          if (add_this_solib)
            {
              if (gdb->symbols_loaded)


@@ -955,8 +990,8 @@ solib_add (const char *pattern, int from_tty,
                    printf_unfiltered (_("Symbols already loaded for %s\n"),
                                       gdb->so_name);
                }
                    printf_unfiltered (_("Symbols already loaded for %s\n"),
                                       gdb->so_name);
                }

-             else if (solib_read_symbols (gdb, flags))
-               loaded_any_symbols = 1;
+             else if (solib_read_symbols (gdb, add_flags))
+               loaded_any_symbols = true;

            }
        }
 
            }
        }
 


@@ -969,13 +1004,9 @@ solib_add (const char *pattern, int from_tty,
 
     if (loaded_any_symbols)
       {
 
     if (loaded_any_symbols)
       {

-       const struct target_so_ops *ops = solib_ops (target_gdbarch ());
-

        /* Getting new symbols may change our opinion about what is
           frameless.  */
        reinit_frame_cache ();
        /* Getting new symbols may change our opinion about what is
           frameless.  */
        reinit_frame_cache ();

-
-       ops->special_symbol_handling ();

       }
   }
 }
       }
   }
 }


@@ -986,13 +1017,11 @@ solib_add (const char *pattern, int from_tty,
    all.  */
 
 static void
    all.  */
 
 static void

-info_sharedlibrary_command (char *pattern, int from_tty)
+info_sharedlibrary_command (const char *pattern, int from_tty)

 {
 {

-  struct so_list *so = NULL;   /* link map state variable */
-  int so_missing_debug_info = 0;
+  bool so_missing_debug_info = false;

   int addr_width;
   int nr_libs;
   int addr_width;
   int nr_libs;

-  struct cleanup *table_cleanup;

   struct gdbarch *gdbarch = target_gdbarch ();
   struct ui_out *uiout = current_uiout;
 
   struct gdbarch *gdbarch = target_gdbarch ();
   struct ui_out *uiout = current_uiout;
 


@@ -1007,12 +1036,13 @@ info_sharedlibrary_command (char *pattern, int from_tty)
   /* "0x", a little whitespace, and two hex digits per byte of pointers.  */
   addr_width = 4 + (gdbarch_ptr_bit (gdbarch) / 4);
 
   /* "0x", a little whitespace, and two hex digits per byte of pointers.  */
   addr_width = 4 + (gdbarch_ptr_bit (gdbarch) / 4);
 

-  update_solib_list (from_tty, 0);
+  update_solib_list (from_tty);

 
 

-  /* make_cleanup_ui_out_table_begin_end needs to know the number of
-     rows, so we need to make two passes over the libs.  */
+  /* ui_out_emit_table table_emitter needs to know the number of rows,
+     so we need to make two passes over the libs.  */

 
 

-  for (nr_libs = 0, so = so_list_head; so; so = so->next)
+  nr_libs = 0;
+  for (struct so_list *so : current_program_space->solibs ())

     {
       if (so->so_name[0])
        {
     {
       if (so->so_name[0])
        {


@@ -1022,82 +1052,71 @@ info_sharedlibrary_command (char *pattern, int from_tty)
        }
     }
 
        }
     }
 

-  table_cleanup =
-    make_cleanup_ui_out_table_begin_end (uiout, 4, nr_libs,
-                                        "SharedLibraryTable");
-
-  /* The "- 1" is because ui_out adds one space between columns.  */
-  ui_out_table_header (uiout, addr_width - 1, ui_left, "from", "From");
-  ui_out_table_header (uiout, addr_width - 1, ui_left, "to", "To");
-  ui_out_table_header (uiout, 12 - 1, ui_left, "syms-read", "Syms Read");
-  ui_out_table_header (uiout, 0, ui_noalign,
-                      "name", "Shared Object Library");
-
-  ui_out_table_body (uiout);
-
-  for (so = so_list_head; so; so = so->next)
-    {
-      struct cleanup *lib_cleanup;
-
-      if (! so->so_name[0])
-       continue;
-      if (pattern && ! re_exec (so->so_name))
-       continue;
-
-      lib_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, "lib");
-
-      if (so->addr_high != 0)
-       {
-         ui_out_field_core_addr (uiout, "from", gdbarch, so->addr_low);
-         ui_out_field_core_addr (uiout, "to", gdbarch, so->addr_high);
-       }
-      else
-       {
-         ui_out_field_skip (uiout, "from");
-         ui_out_field_skip (uiout, "to");
-       }
-
-      if (! ui_out_is_mi_like_p (interp_ui_out (top_level_interpreter ()))
-         && so->symbols_loaded
-         && !objfile_has_symbols (so->objfile))
-       {
-         so_missing_debug_info = 1;
-         ui_out_field_string (uiout, "syms-read", "Yes (*)");
-       }
-      else
-       ui_out_field_string (uiout, "syms-read", 
-                            so->symbols_loaded ? "Yes" : "No");
-
-      ui_out_field_string (uiout, "name", so->so_name);
+  {
+    ui_out_emit_table table_emitter (uiout, 4, nr_libs, "SharedLibraryTable");

 
 

-      ui_out_text (uiout, "\n");
+    /* The "- 1" is because ui_out adds one space between columns.  */
+    uiout->table_header (addr_width - 1, ui_left, "from", "From");
+    uiout->table_header (addr_width - 1, ui_left, "to", "To");
+    uiout->table_header (12 - 1, ui_left, "syms-read", "Syms Read");
+    uiout->table_header (0, ui_noalign, "name", "Shared Object Library");

 
 

-      do_cleanups (lib_cleanup);
-    }
+    uiout->table_body ();

 
 

-  do_cleanups (table_cleanup);
+    for (struct so_list *so : current_program_space->solibs ())
+      {
+       if (! so->so_name[0])
+         continue;
+       if (pattern && ! re_exec (so->so_name))
+         continue;
+
+       ui_out_emit_tuple tuple_emitter (uiout, "lib");
+
+       if (so->addr_high != 0)
+         {
+           uiout->field_core_addr ("from", gdbarch, so->addr_low);
+           uiout->field_core_addr ("to", gdbarch, so->addr_high);
+         }
+       else
+         {
+           uiout->field_skip ("from");
+           uiout->field_skip ("to");
+         }
+
+       if (! top_level_interpreter ()->interp_ui_out ()->is_mi_like_p ()
+           && so->symbols_loaded
+           && !objfile_has_symbols (so->objfile))
+         {
+           so_missing_debug_info = true;
+           uiout->field_string ("syms-read", "Yes (*)");
+         }
+       else
+         uiout->field_string ("syms-read", so->symbols_loaded ? "Yes" : "No");
+
+       uiout->field_string ("name", so->so_name, file_name_style.style ());
+
+       uiout->text ("\n");
+      }
+  }

 
   if (nr_libs == 0)
     {
       if (pattern)
 
   if (nr_libs == 0)
     {
       if (pattern)

-       ui_out_message (uiout, 0,
-                       _("No shared libraries matched.\n"));
+       uiout->message (_("No shared libraries matched.\n"));

       else
       else

-       ui_out_message (uiout, 0,
-                       _("No shared libraries loaded at this time.\n"));
+       uiout->message (_("No shared libraries loaded at this time.\n"));

     }
   else
     {
       if (so_missing_debug_info)
     }
   else
     {
       if (so_missing_debug_info)

-       ui_out_message (uiout, 0,
-                       _("(*): Shared library is missing "
+       uiout->message (_("(*): Shared library is missing "

                          "debugging information.\n"));
     }
 }
 
                          "debugging information.\n"));
     }
 }
 

-/* Return 1 if ADDRESS lies within SOLIB.  */
+/* See solib.h.  */

 
 

-int
+bool

 solib_contains_address_p (const struct so_list *const solib,
                          CORE_ADDR address)
 {
 solib_contains_address_p (const struct so_list *const solib,
                          CORE_ADDR address)
 {


@@ -1105,9 +1124,9 @@ solib_contains_address_p (const struct so_list *const solib,
 
   for (p = solib->sections; p < solib->sections_end; p++)
     if (p->addr <= address && address < p->endaddr)
 
   for (p = solib->sections; p < solib->sections_end; p++)
     if (p->addr <= address && address < p->endaddr)

-      return 1;
+      return true;

 
 

-  return 0;
+  return false;

 }
 
 /* If ADDRESS is in a shared lib in program space PSPACE, return its
 }
 
 /* If ADDRESS is in a shared lib in program space PSPACE, return its


@@ -1133,21 +1152,17 @@ solib_name_from_address (struct program_space *pspace, CORE_ADDR address)
   return (0);
 }
 
   return (0);
 }
 

-/* Return whether the data starting at VADDR, size SIZE, must be kept
-   in a core file for shared libraries loaded before "gcore" is used
-   to be handled correctly when the core file is loaded.  This only
-   applies when the section would otherwise not be kept in the core
-   file (in particular, for readonly sections).  */
+/* See solib.h.  */

 
 

-int
+bool

 solib_keep_data_in_core (CORE_ADDR vaddr, unsigned long size)
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
 
   if (ops->keep_data_in_core)
 solib_keep_data_in_core (CORE_ADDR vaddr, unsigned long size)
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
 
   if (ops->keep_data_in_core)

-    return ops->keep_data_in_core (vaddr, size);
+    return ops->keep_data_in_core (vaddr, size) != 0;

   else
   else

-    return 0;
+    return false;

 }
 
 /* Called by free_all_symtabs */
 }
 
 /* Called by free_all_symtabs */


@@ -1157,36 +1172,14 @@ clear_solib (void)
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
 
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
 

-  /* This function is expected to handle ELF shared libraries.  It is
-     also used on Solaris, which can run either ELF or a.out binaries
-     (for compatibility with SunOS 4), both of which can use shared
-     libraries.  So we don't know whether we have an ELF executable or
-     an a.out executable until the user chooses an executable file.
-
-     ELF shared libraries don't get mapped into the address space
-     until after the program starts, so we'd better not try to insert
-     breakpoints in them immediately.  We have to wait until the
-     dynamic linker has loaded them; we'll hit a bp_shlib_event
-     breakpoint (look for calls to create_solib_event_breakpoint) when
-     it's ready.
-
-     SunOS shared libraries seem to be different --- they're present
-     as soon as the process begins execution, so there's no need to
-     put off inserting breakpoints.  There's also nowhere to put a
-     bp_shlib_event breakpoint, so if we put it off, we'll never get
-     around to it.
-
-     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 ();
-
-  while (so_list_head)
+  disable_breakpoints_in_shlibs ();
+
+  while (current_program_space->so_list)

     {
     {

-      struct so_list *so = so_list_head;
+      struct so_list *so = current_program_space->so_list;

 
 

-      so_list_head = so->next;
-      observer_notify_solib_unloaded (so);
+      current_program_space->so_list = so->next;
+      gdb::observers::solib_unloaded.notify (so);

       remove_target_sections (so);
       free_so (so);
     }
       remove_target_sections (so);
       free_so (so);
     }


@@ -1207,24 +1200,23 @@ solib_create_inferior_hook (int from_tty)
   ops->solib_create_inferior_hook (from_tty);
 }
 
   ops->solib_create_inferior_hook (from_tty);
 }
 

-/* Check to see if an address is in the dynamic loader's dynamic
-   symbol resolution code.  Return 1 if so, 0 otherwise.  */
+/* See solib.h.  */

 
 

-int
+bool

 in_solib_dynsym_resolve_code (CORE_ADDR pc)
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
 
 in_solib_dynsym_resolve_code (CORE_ADDR pc)
 {
   const struct target_so_ops *ops = solib_ops (target_gdbarch ());
 

-  return ops->in_dynsym_resolve_code (pc);
+  return ops->in_dynsym_resolve_code (pc) != 0;

 }
 
 /* Implements the "sharedlibrary" command.  */
 
 static void
 }
 
 /* Implements the "sharedlibrary" command.  */
 
 static void

-sharedlibrary_command (char *args, int from_tty)
+sharedlibrary_command (const char *args, int from_tty)

 {
   dont_repeat ();
 {
   dont_repeat ();

-  solib_add (args, from_tty, (struct target_ops *) 0, 1);
+  solib_add (args, from_tty, 1);

 }
 
 /* Implements the command "nosharedlibrary", which discards symbols
 }
 
 /* Implements the command "nosharedlibrary", which discards symbols


@@ -1233,7 +1225,7 @@ sharedlibrary_command (char *args, int from_tty)
    are not discarded.  Also called from remote.c.  */
 
 void
    are not discarded.  Also called from remote.c.  */
 
 void

-no_shared_libraries (char *ignored, int from_tty)
+no_shared_libraries (const char *ignored, int from_tty)

 {
   /* The order of the two routines below is important: clear_solib notifies
      the solib_unloaded observers, and some of these observers might need
 {
   /* The order of the two routines below is important: clear_solib notifies
      the solib_unloaded observers, and some of these observers might need


@@ -1270,9 +1262,9 @@ handle_solib_event (void)
   /* Check for any newly added shared libraries if we're supposed to
      be adding them automatically.  Switch terminal for any messages
      produced by breakpoint_re_set.  */
   /* Check for any newly added shared libraries if we're supposed to
      be adding them automatically.  Switch terminal for any messages
      produced by breakpoint_re_set.  */

-  target_terminal_ours_for_output ();
-  solib_add (NULL, 0, &current_target, auto_solib_add);
-  target_terminal_inferior ();
+  target_terminal::ours_for_output ();
+  solib_add (NULL, 0, auto_solib_add);
+  target_terminal::inferior ();

 }
 
 /* Reload shared libraries, but avoid reloading the same symbol file
 }
 
 /* Reload shared libraries, but avoid reloading the same symbol file


@@ -1281,29 +1273,23 @@ handle_solib_event (void)
 static void
 reload_shared_libraries_1 (int from_tty)
 {
 static void
 reload_shared_libraries_1 (int from_tty)
 {

-  struct so_list *so;
-  struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
-

   if (print_symbol_loading_p (from_tty, 0, 0))
     printf_unfiltered (_("Loading symbols for shared libraries.\n"));
 
   if (print_symbol_loading_p (from_tty, 0, 0))
     printf_unfiltered (_("Loading symbols for shared libraries.\n"));
 

-  for (so = so_list_head; so != NULL; so = so->next)
+  for (struct so_list *so : current_program_space->solibs ())

     {
     {

-      char *filename, *found_pathname = NULL;
-      bfd *abfd;
-      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);
-      make_cleanup (xfree, filename);
-      abfd = solib_bfd_open (filename);
+      const char *found_pathname = NULL;
+      bool was_loaded = so->symbols_loaded != 0;
+      symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET;
+
+      if (from_tty)
+       add_flags |= SYMFILE_VERBOSE;
+
+      gdb::unique_xmalloc_ptr<char> filename
+       (tilde_expand (so->so_original_name));
+      gdb_bfd_ref_ptr abfd (solib_bfd_open (filename.get ()));

       if (abfd != NULL)
       if (abfd != NULL)

-       {
-         found_pathname = xstrdup (bfd_get_filename (abfd));
-         make_cleanup (xfree, found_pathname);
-         gdb_bfd_unref (abfd);
-       }
+       found_pathname = bfd_get_filename (abfd.get ());

 
       /* If this shared library is no longer associated with its previous
         symbol file, close that.  */
 
       /* If this shared library is no longer associated with its previous
         symbol file, close that.  */


@@ -1313,7 +1299,7 @@ reload_shared_libraries_1 (int from_tty)
        {
          if (so->objfile && ! (so->objfile->flags & OBJF_USERLOADED)
              && !solib_used (so))
        {
          if (so->objfile && ! (so->objfile->flags & OBJF_USERLOADED)
              && !solib_used (so))

-           free_objfile (so->objfile);
+           so->objfile->unlink ();

          remove_target_sections (so);
          clear_so (so);
        }
          remove_target_sections (so);
          clear_so (so);
        }


@@ -1324,33 +1310,30 @@ reload_shared_libraries_1 (int from_tty)
          && (!was_loaded
              || filename_cmp (found_pathname, so->so_name) != 0))
        {
          && (!was_loaded
              || filename_cmp (found_pathname, so->so_name) != 0))
        {

-         int got_error = 0;
+         bool got_error = false;

 
 

-         TRY
+         try

            {
              solib_map_sections (so);
            }
 
            {
              solib_map_sections (so);
            }
 

-         CATCH (e, RETURN_MASK_ERROR)
+         catch (const gdb_exception_error &e)

            {
              exception_fprintf (gdb_stderr, e,
                                 _("Error while mapping "
                                   "shared library sections:\n"));
            {
              exception_fprintf (gdb_stderr, e,
                                 _("Error while mapping "
                                   "shared library sections:\n"));

-             got_error = 1;
+             got_error = true;

            }
            }

-         END_CATCH

 
            if (!got_error
                && (auto_solib_add || was_loaded || libpthread_solib_p (so)))
 
            if (!got_error
                && (auto_solib_add || was_loaded || libpthread_solib_p (so)))

-             solib_read_symbols (so, flags);
+             solib_read_symbols (so, add_flags);

        }
     }
        }
     }

-
-  do_cleanups (old_chain);

 }
 
 static void
 }
 
 static void

-reload_shared_libraries (char *ignored, int from_tty,
+reload_shared_libraries (const char *ignored, int from_tty,

                         struct cmd_list_element *e)
 {
   const struct target_so_ops *ops;
                         struct cmd_list_element *e)
 {
   const struct target_so_ops *ops;


@@ -1389,7 +1372,7 @@ reload_shared_libraries (char *ignored, int from_tty,
      removed.  Call it only after the solib target has been initialized by
      solib_create_inferior_hook.  */
 
      removed.  Call it only after the solib target has been initialized by
      solib_create_inferior_hook.  */
 

-  solib_add (NULL, 0, NULL, auto_solib_add);
+  solib_add (NULL, 0, auto_solib_add);

 
   breakpoint_re_set ();
 
 
   breakpoint_re_set ();
 


@@ -1399,8 +1382,36 @@ reload_shared_libraries (char *ignored, int from_tty,
      structures that are now freed.  Also, getting new symbols may
      change our opinion about what is frameless.  */
   reinit_frame_cache ();
      structures that are now freed.  Also, getting new symbols may
      change our opinion about what is frameless.  */
   reinit_frame_cache ();

+}
+
+/* Wrapper for reload_shared_libraries that replaces "remote:"
+   at the start of gdb_sysroot with "target:".  */
+
+static void
+gdb_sysroot_changed (const char *ignored, int from_tty,
+                    struct cmd_list_element *e)
+{
+  const char *old_prefix = "remote:";
+  const char *new_prefix = TARGET_SYSROOT_PREFIX;

 
 

-  ops->special_symbol_handling ();
+  if (startswith (gdb_sysroot, old_prefix))
+    {
+      static bool warning_issued = false;
+
+      gdb_assert (strlen (old_prefix) == strlen (new_prefix));
+      memcpy (gdb_sysroot, new_prefix, strlen (new_prefix));
+
+      if (!warning_issued)
+       {
+         warning (_("\"%s\" is deprecated, use \"%s\" instead."),
+                  old_prefix, new_prefix);
+         warning (_("sysroot set to \"%s\"."), gdb_sysroot);
+
+         warning_issued = true;
+       }
+    }
+
+  reload_shared_libraries (ignored, from_tty, e);

 }
 
 static void
 }
 
 static void


@@ -1412,21 +1423,6 @@ 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 (struct objfile *objfile,
-                    const char *name,
-                    const domain_enum domain)
-{
-  const struct target_so_ops *ops = solib_ops (get_objfile_arch (objfile));
-
-  if (ops->lookup_lib_global_symbol != NULL)
-    return ops->lookup_lib_global_symbol (objfile, name, domain);
-  return NULL;
-}
-

 /* Lookup the value for a specific symbol from dynamic symbol table.  Look
    up symbol from ABFD.  MATCH_SYM is a callback function to determine
    whether to pick up a symbol.  DATA is the input of this callback
 /* Lookup the value for a specific symbol from dynamic symbol table.  Look
    up symbol from ABFD.  MATCH_SYM is a callback function to determine
    whether to pick up a symbol.  DATA is the input of this callback


@@ -1434,8 +1430,9 @@ solib_global_lookup (struct objfile *objfile,
 
 CORE_ADDR
 gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
 
 CORE_ADDR
 gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,

-                                  int (*match_sym) (asymbol *, void *),
-                                  void *data)
+                                  int (*match_sym) (const asymbol *,
+                                                    const void *),
+                                  const void *data)

 {
   long storage_needed = bfd_get_symtab_upper_bound (abfd);
   CORE_ADDR symaddr = 0;
 {
   long storage_needed = bfd_get_symtab_upper_bound (abfd);
   CORE_ADDR symaddr = 0;


@@ -1444,8 +1441,8 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
     {
       unsigned int i;
 
     {
       unsigned int i;
 

-      asymbol **symbol_table = (asymbol **) xmalloc (storage_needed);
-      struct cleanup *back_to = make_cleanup (xfree, symbol_table);
+      gdb::def_vector<asymbol *> storage (storage_needed / sizeof (asymbol *));
+      asymbol **symbol_table = storage.data ();

       unsigned int number_of_symbols =
        bfd_canonicalize_symtab (abfd, symbol_table);
 
       unsigned int number_of_symbols =
        bfd_canonicalize_symtab (abfd, symbol_table);
 


@@ -1467,9 +1464,8 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
              if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
                  && gdbarch_elf_make_msymbol_special_p (gdbarch))
                {
              if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
                  && gdbarch_elf_make_msymbol_special_p (gdbarch))
                {

-                 struct minimal_symbol msym;
+                 struct minimal_symbol msym {};

 
 

-                 memset (&msym, 0, sizeof (msym));

                  SET_MSYMBOL_VALUE_ADDRESS (&msym, symaddr);
                  gdbarch_elf_make_msymbol_special (gdbarch, sym, &msym);
                  symaddr = MSYMBOL_VALUE_RAW_ADDRESS (&msym);
                  SET_MSYMBOL_VALUE_ADDRESS (&msym, symaddr);
                  gdbarch_elf_make_msymbol_special (gdbarch, sym, &msym);
                  symaddr = MSYMBOL_VALUE_RAW_ADDRESS (&msym);


@@ -1480,7 +1476,6 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
              break;
            }
        }
              break;
            }
        }

-      do_cleanups (back_to);

     }
 
   return symaddr;
     }
 
   return symaddr;


@@ -1493,8 +1488,9 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
 
 static CORE_ADDR
 bfd_lookup_symbol_from_dyn_symtab (bfd *abfd,
 
 static CORE_ADDR
 bfd_lookup_symbol_from_dyn_symtab (bfd *abfd,

-                                  int (*match_sym) (asymbol *, void *),
-                                  void *data)
+                                  int (*match_sym) (const asymbol *,
+                                                    const void *),
+                                  const void *data)

 {
   long storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd);
   CORE_ADDR symaddr = 0;
 {
   long storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd);
   CORE_ADDR symaddr = 0;


@@ -1502,8 +1498,8 @@ bfd_lookup_symbol_from_dyn_symtab (bfd *abfd,
   if (storage_needed > 0)
     {
       unsigned int i;
   if (storage_needed > 0)
     {
       unsigned int i;

-      asymbol **symbol_table = (asymbol **) xmalloc (storage_needed);
-      struct cleanup *back_to = make_cleanup (xfree, symbol_table);
+      gdb::def_vector<asymbol *> storage (storage_needed / sizeof (asymbol *));
+      asymbol **symbol_table = storage.data ();

       unsigned int number_of_symbols =
        bfd_canonicalize_dynamic_symtab (abfd, symbol_table);
 
       unsigned int number_of_symbols =
        bfd_canonicalize_dynamic_symtab (abfd, symbol_table);
 


@@ -1518,7 +1514,6 @@ bfd_lookup_symbol_from_dyn_symtab (bfd *abfd,
              break;
            }
        }
              break;
            }
        }

-      do_cleanups (back_to);

     }
   return symaddr;
 }
     }
   return symaddr;
 }


@@ -1531,8 +1526,8 @@ bfd_lookup_symbol_from_dyn_symtab (bfd *abfd,
 
 CORE_ADDR
 gdb_bfd_lookup_symbol (bfd *abfd,
 
 CORE_ADDR
 gdb_bfd_lookup_symbol (bfd *abfd,

-                      int (*match_sym) (asymbol *, void *),
-                      void *data)
+                      int (*match_sym) (const asymbol *, const void *),
+                      const void *data)

 {
   CORE_ADDR symaddr = gdb_bfd_lookup_symbol_from_symtab (abfd, match_sym, data);
 
 {
   CORE_ADDR symaddr = gdb_bfd_lookup_symbol_from_symtab (abfd, match_sym, data);
 


@@ -1544,36 +1539,35 @@ gdb_bfd_lookup_symbol (bfd *abfd,
   return symaddr;
 }
 
   return symaddr;
 }
 

-/* SO_LIST_HEAD may contain user-loaded object files that can be removed
-   out-of-band by the user.  So upon notification of free_objfile remove
-   all references to any user-loaded file that is about to be freed.  */
+/* The shared library list may contain user-loaded object files that
+   can be removed out-of-band by the user.  So upon notification of
+   free_objfile remove all references to any user-loaded file that is
+   about to be freed.  */

 
 static void
 remove_user_added_objfile (struct objfile *objfile)
 {
 
 static void
 remove_user_added_objfile (struct objfile *objfile)
 {

-  struct so_list *so;
-

   if (objfile != 0 && objfile->flags & OBJF_USERLOADED)
     {
   if (objfile != 0 && objfile->flags & OBJF_USERLOADED)
     {

-      for (so = so_list_head; so != NULL; so = so->next)
+      for (struct so_list *so : current_program_space->solibs ())

        if (so->objfile == objfile)
          so->objfile = NULL;
     }
 }
 
        if (so->objfile == objfile)
          so->objfile = NULL;
     }
 }
 

-extern initialize_file_ftype _initialize_solib; /* -Wmissing-prototypes */
-
+void _initialize_solib ();

 void
 void

-_initialize_solib (void)
+_initialize_solib ()

 {
   solib_data = gdbarch_data_register_pre_init (solib_init);
 
 {
   solib_data = gdbarch_data_register_pre_init (solib_init);
 

-  observer_attach_free_objfile (remove_user_added_objfile);
+  gdb::observers::free_objfile.attach (remove_user_added_objfile);

 
   add_com ("sharedlibrary", class_files, sharedlibrary_command,
           _("Load shared object library symbols for files matching REGEXP."));
   add_info ("sharedlibrary", info_sharedlibrary_command,
            _("Status of loaded shared object libraries."));
 
   add_com ("sharedlibrary", class_files, sharedlibrary_command,
           _("Load shared object library symbols for files matching REGEXP."));
   add_info ("sharedlibrary", info_sharedlibrary_command,
            _("Status of loaded shared object libraries."));

+  add_info_alias ("dll", "sharedlibrary", 1);

   add_com ("nosharedlibrary", class_files, no_shared_libraries,
           _("Unload all shared object library symbols."));
 
   add_com ("nosharedlibrary", class_files, no_shared_libraries,
           _("Unload all shared object library symbols."));
 


@@ -1597,7 +1591,7 @@ Show the current system root."), _("\
 The system root is used to load absolute shared library symbol files.\n\
 For other (relative) files, you can add directories using\n\
 `set solib-search-path'."),
 The system root is used to load absolute shared library symbol files.\n\
 For other (relative) files, you can add directories using\n\
 `set solib-search-path'."),

-                                    reload_shared_libraries,
+                                    gdb_sysroot_changed,

                                     NULL,
                                     &setlist, &showlist);
 
                                     NULL,
                                     &setlist, &showlist);