Merge GDB 7.5.1

sim/d10v/interp.c

+#include "config.h"
 #include <signal.h>
-#include "sysdep.h"
 #include "bfd.h"
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
 
 #include "d10v_sim.h"
 #include "gdb/sim-d10v.h"
 #include "gdb/signals.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif /* HAVE_STRING_H */
+#endif /* HAVE_STRINGS_H */
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 enum _leftright { LEFT_FIRST, RIGHT_FIRST };
 
 static char *myname;
 static SIM_OPEN_KIND sim_kind;
 int d10v_debug;
 
 /* Set this to true to get the previous segment layout. */
 
 int old_segment_mapping;
 
@@ skipping 1250 matching lines @@
       *sigrc = 0;
       break;
 
     case SIG_D10V_EXIT:                 /* exit trap */
       *reason = sim_exited;
       *sigrc = GPR (0);
       break;
 
     case SIG_D10V_BUS:
       *reason = sim_stopped;
-      *sigrc = TARGET_SIGNAL_BUS;
+      *sigrc = GDB_SIGNAL_BUS;
       break;
 
     default:                            /* some signal */
       *reason = sim_stopped;
       if (stop_simulator && !State.exception)
-        *sigrc = TARGET_SIGNAL_INT;
+        *sigrc = GDB_SIGNAL_INT;
       else
         *sigrc = State.exception;
       break;
     }
 
   stop_simulator = 0;
 }
 
 int
 sim_fetch_register (sd, rn, memory, length)
@@ skipping 192 matching lines @@
       prog_bfd_was_opened_p = 0;
     }
   prog_bfd = sim_load_file (sd, myname, d10v_callback, prog, abfd,
                             sim_kind == SIM_OPEN_DEBUG,
                             1/*LMA*/, sim_write);
   if (prog_bfd == NULL)
     return SIM_RC_FAIL;
   prog_bfd_was_opened_p = abfd == NULL;
   return SIM_RC_OK;
 }