Merge GDB 7.5.1

sim/erc32/interf.c

 /*
  * This file is part of SIS.
  * 
  * SIS, SPARC instruction simulator V1.6 Copyright (C) 1995 Jiri Gaisler,
  * European Space Agency
  * 
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free
  * Software Foundation; either version 2 of the License, or (at your option)
  * any later version.
@@ skipping 370 matching lines @@
 void
 sim_stop_reason(sd, reason, sigrc)
      SIM_DESC sd;
      enum sim_stop * reason;
      int *sigrc;
 {
 
     switch (simstat) {
         case CTRL_C:
         *reason = sim_stopped;
-        *sigrc = TARGET_SIGNAL_INT;
+        *sigrc = GDB_SIGNAL_INT;
         break;
     case OK:
     case TIME_OUT:
     case BPT_HIT:
         *reason = sim_stopped;
-        *sigrc = TARGET_SIGNAL_TRAP;
+        *sigrc = GDB_SIGNAL_TRAP;
         break;
     case ERROR:
         *sigrc = 0;
         *reason = sim_exited;
     }
     ctrl_c = 0;
     simstat = OK;
 }
 
 /* Flush all register windows out to the stack.  Starting after the invalid
@@ skipping 109 matching lines @@
             sregs.bpts[i] = sregs.bpts[i + 1];
         sregs.bptnum -= 1;
         if (sis_verbose)
             (*sim_callback->printf_filtered) (sim_callback, "removed HW BP at %x\n", addr);
         return 0;
     }
     return 1;
 }
 
 #endif