Merge GDB 7.5.1

sim/common/sim-signal.c

Index: sim/common/sim-signal.c
diff --git a/sim/common/sim-signal.c b/sim/common/sim-signal.c
index df0a371c2e10a88a43a07f82e29b83d660b0f6ee..5aff15f58a694478fba0eaac561399549bd3a893 100644
--- a/sim/common/sim-signal.c
+++ b/sim/common/sim-signal.c
@@ -94,41 +94,41 @@ sim_signal_to_host (SIM_DESC sd, SIM_SIGNAL sig)
 #endif
 }
 
-enum target_signal
-sim_signal_to_target (SIM_DESC sd, SIM_SIGNAL sig)
+enum gdb_signal
+sim_signal_to_gdb_signal (SIM_DESC sd, SIM_SIGNAL sig)
 {
   switch (sig)
     {
     case SIM_SIGINT :
-      return TARGET_SIGNAL_INT;
+      return GDB_SIGNAL_INT;
 
     case SIM_SIGABRT :
-      return TARGET_SIGNAL_ABRT;
+      return GDB_SIGNAL_ABRT;
 
     case SIM_SIGILL :
-      return TARGET_SIGNAL_ILL;
+      return GDB_SIGNAL_ILL;
 
     case SIM_SIGTRAP :
-      return TARGET_SIGNAL_TRAP;
+      return GDB_SIGNAL_TRAP;
 
     case SIM_SIGBUS :
-      return TARGET_SIGNAL_BUS;
+      return GDB_SIGNAL_BUS;
 
     case SIM_SIGSEGV :
-      return TARGET_SIGNAL_SEGV;
+      return GDB_SIGNAL_SEGV;
 
     case SIM_SIGXCPU :
-      return TARGET_SIGNAL_XCPU;
+      return GDB_SIGNAL_XCPU;
 
     case SIM_SIGFPE:
-      return TARGET_SIGNAL_FPE;
+      return GDB_SIGNAL_FPE;
       break;
 
     case SIM_SIGNONE:
-      return TARGET_SIGNAL_0;
+      return GDB_SIGNAL_0;
       break;
     }
 
   sim_io_eprintf (sd, "sim_signal_to_host: unknown signal: %d\n", sig);
-  return TARGET_SIGNAL_HUP;
+  return GDB_SIGNAL_HUP;
 }