diff options
Diffstat (limited to 'sim/sh64')
| -rw-r--r-- | sim/sh64/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/sh64/sim-if.c | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 9a4d1f5..8a2b58b 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,3 +1,7 @@ +2015-12-26 Mike Frysinger <vapier@gentoo.org> + + * sim-if.c (sim_create_inferior): Replace old #if 0 code with dupargv. + 2015-12-25 Mike Frysinger <vapier@gentoo.org> * Makefile.in (SIM_OBJS): Delete sim-model.o. diff --git a/sim/sh64/sim-if.c b/sim/sh64/sim-if.c index 29e0936..9cd6df8 100644 --- a/sim/sh64/sim-if.c +++ b/sim/sh64/sim-if.c @@ -178,10 +178,15 @@ sim_create_inferior (sd, abfd, argv, envp) addr = 0; sim_pc_set (current_cpu, addr); -#if 0 - STATE_ARGV (sd) = sim_copy_argv (argv); - STATE_ENVP (sd) = sim_copy_argv (envp); -#endif + /* Standalone mode (i.e. `run`) will take care of the argv for us in + sim_open() -> sim_parse_args(). But in debug mode (i.e. 'target sim' + with `gdb`), we need to handle it because the user can change the + argv on the fly via gdb's 'run'. */ + if (STATE_PROG_ARGV (sd) != argv) + { + freeargv (STATE_PROG_ARGV (sd)); + STATE_PROG_ARGV (sd) = dupargv (argv); + } return SIM_RC_OK; } |