Index: gdb/nacl-manifest.c |
diff --git a/gdb/nacl-manifest.c b/gdb/nacl-manifest.c |
index 927a2692c345a9dc25486737ec87469ac2b64b6f..b5c6d5b6ceda56fc6e28294b6415c07fec6dff6c 100644 |
--- a/gdb/nacl-manifest.c |
+++ b/gdb/nacl-manifest.c |
@@ -26,6 +26,7 @@ |
#include "readline/readline.h" |
#include "solib.h" |
#include "symfile.h" |
+#include "objfiles.h" |
#include <ctype.h> |
#include <stdio.h> |
@@ -56,8 +57,6 @@ 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) |
{ |
@@ -342,10 +341,11 @@ nacl_irt_command (char *args, int from_tty) |
{ |
if (args) |
{ |
- xfree (nacl_irt_filename); |
+ char *nacl_irt_filename; |
nacl_irt_filename = tilde_expand (args); |
- |
- solib_add (NULL, from_tty, NULL, 1); |
+ symbol_file_add (nacl_irt_filename, from_tty ? SYMFILE_VERBOSE : 0, |
+ NULL, OBJF_USERLOADED); |
+ xfree (nacl_irt_filename); |
} |
} |