Merge GDB 7.5.1

sim/d10v/interp.c

Index: sim/d10v/interp.c
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index cd18eadc5503ce279a5702a825f419669ef5491d..23db647a33c5e8f8eedb420dc8d96cf0cc22829c 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -1,5 +1,5 @@
+#include "config.h"
 #include <signal.h>
-#include "sysdep.h"
 #include "bfd.h"
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
@@ -8,6 +8,18 @@
 #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;
@@ -1278,13 +1290,13 @@ sim_stop_reason (sd, reason, sigrc)
 
     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;