From 74cbb09e74dda17fc79e2ce709116780a90310ef Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 7 Aug 2017 12:09:37 +0200 Subject: [PATCH] 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. --- gdb/ChangeLog | 5 +++++ gdb/remote-sim.c | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 722fade0b19..f6440858115 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-08-07 Simon Marchi + + * remote-sim.c (gdbsim_load): Remove char **argv local variable. + (gdbsim_open): Rename gdb_argv args object to argv. + 2017-08-05 Tom Tromey * compile/compile-object-load.c (compile_object_load): Use diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 75b1f56cb34..ca824d7985b 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; -- 2.30.2