Allow to add irt symbols with nacl-irt command.

gdb/nacl-manifest.c

 /* Handle Native Client manifest files.
 
    Copyright (C) 2011 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 
 #include "command.h"
 #include "completer.h"
 #include "exec.h"
 #include "observer.h"
 #include "readline/readline.h"
 #include "solib.h"
 #include "symfile.h"
+#include "objfiles.h"
 
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
 #define MANIFEST_MAX_NESTING 4
 
 #define MANIFEST_MAX_STRING_SIZE 256
 
 struct file_list
@@ skipping 10 matching lines @@
 
 /* Mapping of 64-bit *.so libraries.  */
 static struct file_list *nacl_file_list_64 = NULL;
 
 /* runnable-ld.so or statically linked 32-bit program name.  */
 static char *nacl_program_filename_32 = NULL;
 
 /* runnable-ld.so or statically linked 64-bit program name.  */
 static char *nacl_program_filename_64 = NULL;
 
-static char *nacl_irt_filename = NULL;
-
 const char *
 nacl_manifest_find (char *original_name)
 {
   struct file_list *curr;
   int addr_bit;
 
   /* HACK: NaCl uses "/lib/" library path to inform service runtime that the
            file should be opened as solib vs. ordinary file. Split that prefix
            here so that GDB can find these files via manifest or as is.  */
   if (strncmp (original_name, "/lib/", 5) == 0)
@@ skipping 264 matching lines @@
     }
 }
 
 /* GDB commands for specifying Native Client files.  */
 
 static void
 nacl_irt_command (char *args, int from_tty)
 {
   if (args)
     {
+      char *nacl_irt_filename;
+      nacl_irt_filename = tilde_expand (args);
+      symbol_file_add (nacl_irt_filename, from_tty ? SYMFILE_VERBOSE : 0,
+                       NULL, OBJF_USERLOADED);
       xfree (nacl_irt_filename);
-      nacl_irt_filename = tilde_expand (args);
-
-      solib_add (NULL, from_tty, NULL, 1);
     }
 }
 
 static struct observer *about_to_proceed_observer = NULL;
 
 static void
 about_to_proceed_hook ()
 {
   if (exec_bfd == NULL)
     {
@@ skipping 46 matching lines @@
 
   c = add_com ("nacl-irt", class_files, nacl_irt_command,
                _("Use FILE as Native Client IRT to be debugged."));
   set_cmd_completer (c, filename_completer);
 
   c = add_com ("nacl-manifest", class_files, nacl_manifest_command,
                _("Use FILE as Native Client manifest for the program"
                  " to be debugged."));
   set_cmd_completer (c, filename_completer);
 }