bfd_get_filename

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

diff --git a/gdb/solib.c b/gdb/solib.c
index 75897ac55ad1850bfcc9c36c4e9ff937a7dda66f..86000f6d61d4ec7ee7915ffc84f728f50b479f68 100644 (file)
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -31,7 +31,7 @@
 #include "frame.h"
 #include "gdb_regex.h"
 #include "inferior.h"
-#include "common/environ.h"
+#include "gdbsupport/environ.h"
 #include "language.h"
 #include "gdbcmd.h"
 #include "completer.h"
@@ -45,7 +45,7 @@
 #include "interps.h"
 #include "filesystem.h"
 #include "gdb_bfd.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "source.h"
 
 /* Architecture-specific operations.  */
@@ -700,7 +700,7 @@ solib_read_symbols (struct so_list *so, symfile_add_flags flags)
 
          so->symbols_loaded = 1;
        }
-      catch (const gdb_exception_RETURN_MASK_ERROR &e)
+      catch (const gdb_exception_error &e)
        {
          exception_fprintf (gdb_stderr, e, _("Error while reading shared"
                                              " library symbols for %s:\n"),
@@ -751,7 +751,7 @@ update_solib_list (int from_tty)
            {
              ops->open_symbol_file_object (from_tty);
            }
-         catch (const gdb_exception_RETURN_MASK_ALL &ex)
+         catch (const gdb_exception &ex)
            {
              exception_fprintf (gdb_stderr, ex,
                                 "Error reading attached "
@@ -877,7 +877,7 @@ update_solib_list (int from_tty)
                }
            }
 
-         catch (const gdb_exception_RETURN_MASK_ERROR &e)
+         catch (const gdb_exception_error &e)
            {
              exception_fprintf (gdb_stderr, e,
                                 _("Error while mapping shared "
@@ -1104,7 +1104,7 @@ info_sharedlibrary_command (const char *pattern, int from_tty)
        else
          uiout->field_string ("syms-read", so->symbols_loaded ? "Yes" : "No");
 
-       uiout->field_string ("name", so->so_name);
+       uiout->field_string ("name", so->so_name, ui_out_style_kind::FILE);
 
        uiout->text ("\n");
       }
@@ -1296,7 +1296,7 @@ reload_shared_libraries_1 (int from_tty)
 
   for (so = so_list_head; so != NULL; so = so->next)
     {
-      char *found_pathname = NULL;
+      const char *found_pathname = NULL;
       int was_loaded = so->symbols_loaded;
       symfile_add_flags add_flags = SYMFILE_DEFER_BP_RESET;
 
@@ -1335,7 +1335,7 @@ reload_shared_libraries_1 (int from_tty)
              solib_map_sections (so);
            }
 
-         catch (const gdb_exception_RETURN_MASK_ERROR &e)
+         catch (const gdb_exception_error &e)
            {
              exception_fprintf (gdb_stderr, e,
                                 _("Error while mapping "