* remote-sim.c (gdbsim_wait): Pass target signal numbers to

	sim_resume.  Expect target signal numbers from sim_stop_reason.

	* wrapper.c (gdb/signals.h): Include it.
	(SIGTRAP): Don't define.
	(SIGBUS): Likewise.
	(sim_stop_reason): Use TARGET_SIGNAL_* instead of SIG*.

	* sim-reason.c (sim_stop_reason): Use
	sim_signal_to_target, not sim_signal_to_host.
	* sim-signal.c (sim_signal_to_host): Fix typo.
	(sim_signal_to_target): New function.

	* interp.c (gdb/signals.h): Include it.
	(sim_stop_reason): Use TARGET_SIGNAL_*.

	* interf.c: (gdb/signals.h): Include it.
	(sim_stop_reason): Use TARGET_SIGNAL_*.

	* sim_calls.c (gdb/signals.h): Include it.
	(sim_stop_reason): Use TARGET_SIGNAL_*.
	* psim.c (cntrl_c_simulation): Use TARGET_SIGNAL_*.

1 files changed, 3 insertions, 5 deletions

diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c
index 3d53574..fe075e1 100644
--- a/sim/erc32/interf.c
+++ b/sim/erc32/interf.c
@@ -33,6 +33,7 @@
 #include "sim-config.h"
 
 #include "gdb/remote-sim.h"
+#include "gdb/signals.h"
 
 #define PSR_CWP 0x7
 
@@ -386,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;