sim: moxie: switch to common sim-command.o

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index f509fc019e558c884379384934936a47cfc4ea0a..d7b4e5040e1124bc55b438e4fdaf5ebfc29ef1a5 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-24  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in (SIM_OBJS): Add sim-command.o.
+       * interp.c (sim_do_command): Delete.
+
 2015-03-16  Mike Frysinger  <vapier@gentoo.org>
 
        * config.in, configure: Regenerate.

diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index 8f1a2aa656abeba48727794e66591820cb4461ff..76137c8307221da485c2db59b36176c0a94be7a6 100644 (file)
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -26,7 +26,7 @@ SIM_EXTRA_CFLAGS = -DSIM_USE_DEPRECATED_RUN_FRONTEND
 SIM_OBJS = interp.o sim-load.o sim-io.o sim-config.o sim-utils.o       \
 sim-options.o sim-module.o sim-core.o sim-endian.o sim-trace.o         \
 sim-engine.o sim-fpu.o sim-bits.o sim-profile.o sim-events.o \
-sim-memopt.o
+sim-memopt.o sim-command.o
 
 SIM_EXTRA_LIBS = -lm -lz
 SIM_EXTRA_INSTALL = install-dtb

diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index 1126552cc1400e8d7e686191c12e6b88b5583209..5286b666a30168cdb259be613eceb8d789433d39 100644 (file)
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -1450,17 +1450,6 @@ sim_create_inferior (sd, prog_bfd, argv, env)
   return SIM_RC_OK;
 }
 
-void
-sim_do_command (sd, cmd)
-     SIM_DESC sd;
-     const char *cmd;
-{
-  if (sim_args_command (sd, cmd) != SIM_RC_OK)
-    sim_io_printf (sd, 
-                  "Error: \"%s\" is not a valid moxie simulator command.\n",
-                  cmd);
-}
-
 void
 sim_set_callbacks (ptr)
      host_callback * ptr;