aboutsummaryrefslogtreecommitdiff
path: root/gdb/remote-sim.c
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2017-08-07 12:09:37 +0200
committerSimon Marchi <simon.marchi@ericsson.com>2017-08-07 12:13:00 +0200
commit74cbb09e74dda17fc79e2ce709116780a90310ef (patch)
tree493f2975f7b9b676ee041f3a75f7155717a8622d /gdb/remote-sim.c
parentb7a18930e3925c4092bd975e95bc3603aa1418d9 (diff)
downloadgdb-74cbb09e74dda17fc79e2ce709116780a90310ef.zip
gdb-74cbb09e74dda17fc79e2ce709116780a90310ef.tar.gz
gdb-74cbb09e74dda17fc79e2ce709116780a90310ef.tar.bz2
remote-sim.c: Fix arg variables conflicts
The recent change introducing gdb_argv introduced some build failures in remote-sim.c. /home/emaisin/src/binutils-gdb/gdb/remote-sim.c: In function 'void gdbsim_load(target_ops*, const char*, int)': /home/emaisin/src/binutils-gdb/gdb/remote-sim.c:573:22: error: conflicting declaration 'gdb_argv argv' gdb_argv argv (args); ^ /home/emaisin/src/binutils-gdb/gdb/remote-sim.c:565:10: note: previous declaration as 'char** argv' char **argv; ^~~~ /home/emaisin/src/binutils-gdb/gdb/remote-sim.c: In function 'void gdbsim_open(const char*, int)': /home/emaisin/src/binutils-gdb/gdb/remote-sim.c:730:25: error: declaration of 'gdb_argv args' shadows a parameter gdb_argv args (arg_buf); In gdbsim_load, the new gdb_argv object conflicts with old char **argv variable. I think the old variable should be removed. In gdbsim_open, the new gdb_argv object conflicts with the args parameter. This patch renames it to argv. Built-tested for a mips host. gdb/ChangeLog: * remote-sim.c (gdbsim_load): Remove char **argv local variable. (gdbsim_open): Rename gdb_argv args object to argv.
Diffstat (limited to 'gdb/remote-sim.c')
-rw-r--r--gdb/remote-sim.c7
1 files changed, 3 insertions, 4 deletions
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;