diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/remote-sim.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 722fade..f644085 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-08-07 Simon Marchi <simon.marchi@ericsson.com> + + * remote-sim.c (gdbsim_load): Remove char **argv local variable. + (gdbsim_open): Rename gdb_argv args object to argv. + 2017-08-05 Tom Tromey <tom@tromey.com> * compile/compile-object-load.c (compile_object_load): Use diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 75b1f56..ca824d7 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -562,7 +562,6 @@ gdbsim_kill (struct target_ops *ops) static void gdbsim_load (struct target_ops *self, const char *args, int fromtty) { - char **argv; const char *prog; struct sim_inferior_data *sim_data = get_sim_inferior_data (current_inferior (), SIM_INSTANCE_NEEDED); @@ -727,8 +726,8 @@ gdbsim_open (const char *args, int from_tty) strcat (arg_buf, args); } - gdb_argv args (arg_buf); - sim_argv = args.get (); + gdb_argv argv (arg_buf); + sim_argv = argv.get (); init_callbacks (); gdbsim_desc = sim_open (SIM_OPEN_DEBUG, &gdb_callback, exec_bfd, sim_argv); @@ -739,7 +738,7 @@ gdbsim_open (const char *args, int from_tty) error (_("unable to create simulator instance")); } - args.release (); + argv.release (); /* Reset the pid numberings for this batch of sim instances. */ next_pid = INITIAL_PID; |