*** empty log message ***

[deliverable/binutils-gdb.git] / sim / erc32 / interf.c

diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c
index 19318864534debfb1d21c88af25423f624a1ab19..fe075e1f286b23f2acb11158047ead2fe37dbf8f 100644 (file)
--- a/sim/erc32/interf.c
+++ b/sim/erc32/interf.c
@@ -27,22 +27,18 @@
 #include <time.h>
 #include <sys/fcntl.h>
 #include "sis.h"
+#include "libiberty.h"
 #include "bfd.h"
 #include <dis-asm.h>
 #include "sim-config.h"
 
 #include "gdb/remote-sim.h"
-
-#ifndef fprintf
-extern          fprintf();
-#endif
+#include "gdb/signals.h"
 
 #define PSR_CWP 0x7
 
 #define        VAL(x)  strtol(x,(char **)NULL,0)
 
-extern char   **buildargv(char *input);
-
 extern struct disassemble_info dinfo;
 extern struct pstate sregs;
 extern struct estate ebase;
@@ -184,7 +180,7 @@ SIM_DESC
 sim_open (kind, callback, abfd, argv)
      SIM_OPEN_KIND kind;
      struct host_callback_struct *callback;
-     struct _bfd *abfd;
+     struct bfd *abfd;
      char **argv;
 {
 
@@ -304,7 +300,7 @@ sim_load(sd, prog, abfd, from_tty)
 SIM_RC
 sim_create_inferior(sd, abfd, argv, env)
      SIM_DESC sd;
-     struct _bfd *abfd;
+     struct bfd *abfd;
      char **argv;
      char **env;
 {
@@ -391,16 +387,13 @@ sim_stop_reason(sd, reason, sigrc)
     switch (simstat) {
        case CTRL_C:
        *reason = sim_stopped;
-       *sigrc = SIGINT;
+       *sigrc = TARGET_SIGNAL_INT;
        break;
     case OK:
     case TIME_OUT:
     case BPT_HIT:
        *reason = sim_stopped;
-#ifdef _WIN32
-#define SIGTRAP 5
-#endif
-       *sigrc = SIGTRAP;
+       *sigrc = TARGET_SIGNAL_TRAP;
        break;
     case ERROR:
        *sigrc = 0;