aboutsummaryrefslogtreecommitdiff
path: root/sim/m32r
diff options
context:
space:
mode:
Diffstat (limited to 'sim/m32r')
-rw-r--r--sim/m32r/ChangeLog4
-rw-r--r--sim/m32r/sim-if.c13
2 files changed, 13 insertions, 4 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 09d2c05..c492bd6 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/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>
* configure.ac (SIM_AC_OPTION_HARDWARE): Add m32r_cache & m32r_uart.
diff --git a/sim/m32r/sim-if.c b/sim/m32r/sim-if.c
index 639976d..043c618 100644
--- a/sim/m32r/sim-if.c
+++ b/sim/m32r/sim-if.c
@@ -199,10 +199,15 @@ sim_create_inferior (sd, abfd, argv, envp)
m32r_decode_gdb_ctrl_regnum(SPU_REGNUM), 0x1f00000);
#endif
-#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;
}