Remove some includes of readline.h

[binutils.git] / gdb / solib.c

diff --git a/gdb/solib.c b/gdb/solib.c
index db370e9ff87c6aa6413161ead9a5a722390699cc..400fddedb62c82c3305ee88098466424888de4ab 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-2016 Free Software Foundation, Inc.
+   Copyright (C) 1990-2019 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.  */
 


@@ -89,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


@@ -114,11 +113,9 @@ 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
 

-/* Return the full pathname of a binary file (the main executable
-   or a shared library file), or NULL if not found.  The returned
-   pathname is malloc'ed and must be freed by the caller.  If FD
-   is non-NULL, *FD is set to either -1 or an open file handle for
-   the binary file.
+/* 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
    to search for binary files if they have an absolute path.
 
    Global variable GDB_SYSROOT is used as a prefix directory
    to search for binary files if they have an absolute path.


@@ -147,19 +144,18 @@ show_solib_search_path (struct ui_file *file, int from_tty,
    *   If IS_SOLIB is non-zero:
    *     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
+   * The last check avoids doing this search when targeting remote

    * machines since a sysroot will almost always be set.
 */
 
    * machines since a sysroot will almost always be set.
 */
 

-static char *
-solib_find_1 (char *in_pathname, int *fd, int is_solib)
+static gdb::unique_xmalloc_ptr<char>
+solib_find_1 (const char *in_pathname, int *fd, int 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;
+  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 = gdb_sysroot;
+  const char *sysroot = gdb_sysroot;

   int prefix_len, orig_prefix_len;
 
   /* If the absolute prefix starts with "target:" but the filesystem
   int prefix_len, orig_prefix_len;
 
   /* If the absolute prefix starts with "target:" but the filesystem


@@ -177,12 +173,13 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib)
   while (prefix_len > 0 && IS_DIR_SEPARATOR (sysroot[prefix_len - 1]))
     prefix_len--;
 
   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)
     {
   if (prefix_len == 0)
     sysroot = NULL;
   else if (prefix_len != orig_prefix_len)
     {

-      sysroot = savestring (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


@@ -218,7 +215,7 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib)
   */
 
   if (!IS_TARGET_ABSOLUTE_PATH (fskind, in_pathname) || sysroot == NULL)
   */
 
   if (!IS_TARGET_ABSOLUTE_PATH (fskind, in_pathname) || sysroot == NULL)

-    temp_pathname = xstrdup (in_pathname);
+    temp_pathname.reset (xstrdup (in_pathname));

   else
     {
       int need_dir_separator;
   else
     {
       int need_dir_separator;


@@ -237,31 +234,28 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib)
         | target:some/dir |           | /foo/bar.dll   |
 
        IOW, we don't need to add a separator if IN_PATHNAME already
         | target:some/dir |           | /foo/bar.dll   |
 
        IOW, we don't need to add a separator if IN_PATHNAME already

-       has one, or when the the sysroot is exactly "target:".
+       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])
                             || strcmp (TARGET_SYSROOT_PREFIX, sysroot) == 0);
 
       /* Cat the prefixed pathname together.  */
        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 (TARGET_SYSROOT_PREFIX, sysroot) == 0);
 
       /* 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 files to be accessed via the target.  */
     }
 
   /* Handle files to be accessed via the target.  */

-  if (is_target_filename (temp_pathname))
+  if (is_target_filename (temp_pathname.get ()))

     {
       if (fd != NULL)
        *fd = -1;
     {
       if (fd != NULL)
        *fd = -1;

-      do_cleanups (old_chain);

       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,45 +267,40 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib)
       && HAS_TARGET_DRIVE_SPEC (fskind, in_pathname))
     {
       int need_dir_separator = !IS_DIR_SEPARATOR (in_pathname[2]);
       && HAS_TARGET_DRIVE_SPEC (fskind, in_pathname))
     {
       int need_dir_separator = !IS_DIR_SEPARATOR (in_pathname[2]);

-      char *drive = savestring (in_pathname, 1);
+      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


@@ -353,16 +342,15 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib)
 
   /* If not found, next search the inferior's $PATH environment variable.  */
   if (found_file < 0 && sysroot == NULL)
 
   /* If not found, next search the inferior's $PATH environment variable.  */
   if (found_file < 0 && sysroot == NULL)

-    found_file = openp (get_in_environ (current_inferior ()->environment,
-                                       "PATH"),
+    found_file = openp (current_inferior ()->environment.get ("PATH"),

                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH, in_pathname,
                        O_RDONLY | O_BINARY, &temp_pathname);
 
   /* 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)
                        OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH, in_pathname,
                        O_RDONLY | O_BINARY, &temp_pathname);
 
   /* 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 (get_in_environ (current_inferior ()->environment,
-                                       "LD_LIBRARY_PATH"),
+    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);
 


@@ -378,14 +366,13 @@ solib_find_1 (char *in_pathname, int *fd, int is_solib)
 }
 
 /* Return the full pathname of the main executable, or NULL if not
 }
 
 /* Return the full pathname of the main executable, or NULL if not

-   found.  The returned pathname is malloc'ed and must be freed by
-   the caller.  If FD is non-NULL, *FD is set to either -1 or an open
-   file handle for the main executable.  */
+   found.  If FD is non-NULL, *FD is set to either -1 or an open file
+   handle for the main executable.  */

 
 

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

 {
 {

-  char *result;
+  gdb::unique_xmalloc_ptr<char> result;

   const char *fskind = effective_target_file_system_kind ();
 
   if (in_pathname == NULL)
   const char *fskind = effective_target_file_system_kind ();
 
   if (in_pathname == NULL)


@@ -417,7 +404,7 @@ exec_file_find (char *in_pathname, int *fd)
         filename.  Not much more we can do...)  */
 
       if (!source_full_path_of (in_pathname, &result))
         filename.  Not much more we can do...)  */
 
       if (!source_full_path_of (in_pathname, &result))

-       result = xstrdup (in_pathname);
+       result.reset (xstrdup (in_pathname));

       if (fd != NULL)
        *fd = -1;
     }
       if (fd != NULL)
        *fd = -1;
     }


@@ -426,15 +413,14 @@ exec_file_find (char *in_pathname, int *fd)
 }
 
 /* Return the full pathname of a shared library file, or NULL if not
 }
 
 /* Return the full pathname of a shared library file, or NULL if not

-   found.  The returned pathname is malloc'ed and must be freed by
-   the caller.  If FD is non-NULL, *FD is set to either -1 or an open
-   file handle for the shared library.
+   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.  */
 
 
    The search algorithm used is described in solib_find_1's comment
    above.  */
 

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

 {
   const char *solib_symbols_extension
     = gdbarch_solib_symbols_extension (target_gdbarch ());
 {
   const char *solib_symbols_extension
     = gdbarch_solib_symbols_extension (target_gdbarch ());


@@ -443,7 +429,7 @@ solib_find (char *in_pathname, int *fd)
      extension.  */
   if (solib_symbols_extension != NULL)
     {
      extension.  */
   if (solib_symbols_extension != NULL)
     {

-      char *p = in_pathname + strlen (in_pathname);
+      const char *p = in_pathname + strlen (in_pathname);

 
       while (p > in_pathname && *p != '.')
        p--;
 
       while (p > in_pathname && *p != '.')
        p--;


@@ -470,42 +456,37 @@ solib_find (char *in_pathname, int *fd)
    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.
 
    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).  */
+   If unsuccessful, the FD will be closed (unless FD was -1).  */

 
 

-bfd *
-solib_bfd_fopen (char *pathname, int fd)
+gdb_bfd_ref_ptr
+solib_bfd_fopen (const char *pathname, int fd)

 {
 {

-  bfd *abfd = gdb_bfd_open (pathname, gnutarget, fd);
+  gdb_bfd_ref_ptr abfd (gdb_bfd_open (pathname, gnutarget, fd));

 
 

-  if (abfd != NULL && !gdb_bfd_has_target_filename (abfd))
-    bfd_set_cacheable (abfd, 1);
+  if (abfd != NULL && !gdb_bfd_has_target_filename (abfd.get ()))
+    bfd_set_cacheable (abfd.get (), 1);

 
 

-  if (!abfd)
+  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


@@ -517,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;
 }


@@ -553,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


@@ -575,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++)


@@ -701,37 +675,38 @@ solib_read_symbols (struct so_list *so, symfile_add_flags 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)
            {
            }
          if (so->objfile == NULL)
            {

-             sap = build_section_addr_info_from_section_table (so->sections,
-                                                               so->sections_end);
+             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,
              so->objfile = symbol_file_add_from_bfd (so->abfd, so->so_name,

-                                                     flags, sap, OBJF_SHARED,
-                                                     NULL);
+                                                     flags, &sap,
+                                                     OBJF_SHARED, NULL);

              so->objfile->addr_low = so->addr_low;
              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 1;
     }


@@ -753,31 +728,10 @@ solib_used (const struct so_list *const known)
   return 0;
 }
 
   return 0;
 }
 

-/* 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();


@@ -785,7 +739,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 ();
 


@@ -793,9 +747,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


@@ -864,17 +827,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);
+           delete gdb->objfile;

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


@@ -903,9 +865,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))


@@ -916,17 +878,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


@@ -978,11 +939,10 @@ 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;
 
 {
   struct so_list *gdb;
 


@@ -1007,7 +967,7 @@ 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
 
   /* Walk the list of currently loaded shared libraries, and read
      symbols for any that match the pattern --- or any whose symbols


@@ -1069,13 +1029,12 @@ 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;
   int addr_width;
   int nr_libs;
 {
   struct so_list *so = NULL;   /* link map state variable */
   int so_missing_debug_info = 0;
   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;
 


@@ -1090,10 +1049,10 @@ 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)
     {
 
   for (nr_libs = 0, so = so_list_head; so; so = so->next)
     {


@@ -1105,75 +1064,64 @@ 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);
+    ALL_SO_LIBS (so)
+      {
+       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 = 1;
+           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,
-                       _("No shared libraries matched.\n"));
+       uiout->message (_("No shared libraries matched.\n"));

       else
       else

-       ui_out_message (uiout,
-                       _("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,
-                       _("(*): Shared library is missing "
+       uiout->message (_("(*): Shared library is missing "

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


@@ -1240,36 +1188,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 ();
+  disable_breakpoints_in_shlibs ();

 
   while (so_list_head)
     {
       struct so_list *so = so_list_head;
 
       so_list_head = so->next;
 
   while (so_list_head)
     {
       struct so_list *so = so_list_head;
 
       so_list_head = so->next;

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

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


@@ -1304,10 +1230,10 @@ in_solib_dynsym_resolve_code (CORE_ADDR pc)
 /* 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


@@ -1316,7 +1242,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


@@ -1353,9 +1279,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


@@ -1365,30 +1291,24 @@ static void
 reload_shared_libraries_1 (int from_tty)
 {
   struct so_list *so;
 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"));
 
   for (so = so_list_head; so != NULL; so = so->next)
     {
 
   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)
     {

-      char *filename, *found_pathname = NULL;
-      bfd *abfd;
+      const char *found_pathname = NULL;

       int was_loaded = so->symbols_loaded;
       symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET;
 
       if (from_tty)
        add_flags |= SYMFILE_VERBOSE;
 
       int was_loaded = so->symbols_loaded;
       symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET;
 
       if (from_tty)
        add_flags |= SYMFILE_VERBOSE;
 

-      filename = tilde_expand (so->so_original_name);
-      make_cleanup (xfree, filename);
-      abfd = solib_bfd_open (filename);
+      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.  */


@@ -1398,7 +1318,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);
+           delete so->objfile;

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


@@ -1411,31 +1331,28 @@ reload_shared_libraries_1 (int from_tty)
        {
          int got_error = 0;
 
        {
          int got_error = 0;
 

-         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"));
              got_error = 1;
            }
            {
              exception_fprintf (gdb_stderr, e,
                                 _("Error while mapping "
                                   "shared library sections:\n"));
              got_error = 1;
            }

-         END_CATCH

 
            if (!got_error
                && (auto_solib_add || was_loaded || libpthread_solib_p (so)))
              solib_read_symbols (so, add_flags);
        }
     }
 
            if (!got_error
                && (auto_solib_add || was_loaded || libpthread_solib_p (so)))
              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;


@@ -1474,7 +1391,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 ();
 


@@ -1490,7 +1407,7 @@ reload_shared_libraries (char *ignored, int from_tty,
    at the start of gdb_sysroot with "target:".  */
 
 static void
    at the start of gdb_sysroot with "target:".  */
 
 static void

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

                     struct cmd_list_element *e)
 {
   const char *old_prefix = "remote:";
                     struct cmd_list_element *e)
 {
   const char *old_prefix = "remote:";


@@ -1525,21 +1442,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 block_symbol
-solib_global_lookup (struct objfile *objfile,
-                    const char *name,
-                    const domain_enum domain)
-{
-  const struct target_so_ops *ops = solib_ops (target_gdbarch ());
-
-  if (ops->lookup_lib_global_symbol != NULL)
-    return ops->lookup_lib_global_symbol (objfile, name, domain);
-  return (struct block_symbol) {NULL, 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


@@ -1558,8 +1460,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);
 


@@ -1581,9 +1483,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);


@@ -1594,7 +1495,6 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
              break;
            }
        }
              break;
            }
        }

-      do_cleanups (back_to);

     }
 
   return symaddr;
     }
 
   return symaddr;


@@ -1617,8 +1517,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);
 


@@ -1633,7 +1533,6 @@ bfd_lookup_symbol_from_dyn_symtab (bfd *abfd,
              break;
            }
        }
              break;
            }
        }

-      do_cleanups (back_to);

     }
   return symaddr;
 }
     }
   return symaddr;
 }


@@ -1676,14 +1575,12 @@ remove_user_added_objfile (struct objfile *objfile)
     }
 }
 
     }
 }
 

-extern initialize_file_ftype _initialize_solib; /* -Wmissing-prototypes */
-

 void
 _initialize_solib (void)
 {
   solib_data = gdbarch_data_register_pre_init (solib_init);
 
 void
 _initialize_solib (void)
 {
   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_com ("sharedlibrary", class_files, sharedlibrary_command,
           _("Load shared object library symbols for files matching REGEXP."));