Merge GDB 7.5.1

sim/arm/wrapper.c

 /* run front end support for arm
    Copyright (C) 1995-1997, 2000-2002, 2007-2012 Free Software
    Foundation, Inc.
 
    This file is part of ARM SIM.
 
    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 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* This file provides the interface between the simulator and
    run.c and gdb (when the simulator is linked with gdb).
    All simulator interaction should go through this file.  */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include <bfd.h>
 #include <signal.h>
 #include "gdb/callback.h"
 #include "gdb/remote-sim.h"
 #include "armdefs.h"
 #include "armemu.h"
 #include "dbg_rdi.h"
@@ skipping 228 matching lines @@
       /* We wouldn't set the machine type with earlier toolchains, so we
          explicitly select a processor capable of supporting all ARMs in
          32bit mode.  */
       /* We choose the XScale rather than the iWMMXt, because the iWMMXt
          removes the FPE emulator, since it conflicts with its coprocessors.
          For the most generic ARM support, we want the FPE emulator in place.  */
     case bfd_mach_arm_XScale:
       ARMul_SelectProcessor (state, ARM_v5_Prop | ARM_v5e_Prop | ARM_XScale_Prop | ARM_v6_Prop);
       break;
 
+    case bfd_mach_arm_iWMMXt2:
     case bfd_mach_arm_iWMMXt:
       {
         extern int SWI_vector_installed;
         ARMword i;
 
         if (! SWI_vector_installed)
           {
             /* Intialise the hardware vectors to zero.  */
             if (! SWI_vector_installed)
               for (i = ARMul_ResetV; i <= ARMFIQV; i += 4)
@@ skipping 615 matching lines @@
 
 void
 sim_stop_reason (sd, reason, sigrc)
      SIM_DESC sd ATTRIBUTE_UNUSED;
      enum sim_stop *reason;
      int *sigrc;
 {
   if (stop_simulator)
     {
       *reason = sim_stopped;
-      *sigrc = TARGET_SIGNAL_INT;
+      *sigrc = GDB_SIGNAL_INT;
     }
   else if (state->EndCondition == 0)
     {
       *reason = sim_exited;
       *sigrc = state->Reg[0] & 255;
     }
   else
     {
       *reason = sim_stopped;
       if (state->EndCondition == RDIError_BreakpointReached)
-        *sigrc = TARGET_SIGNAL_TRAP;
+        *sigrc = GDB_SIGNAL_TRAP;
       else if (   state->EndCondition == RDIError_DataAbort
                || state->EndCondition == RDIError_AddressException)
-        *sigrc = TARGET_SIGNAL_BUS;
+        *sigrc = GDB_SIGNAL_BUS;
       else
         *sigrc = 0;
     }
 }
 
 void
 sim_do_command (sd, cmd)
      SIM_DESC sd ATTRIBUTE_UNUSED;
      char *cmd ATTRIBUTE_UNUSED;
 {  
   (*sim_callback->printf_filtered)
     (sim_callback,
      "This simulator does not accept any commands.\n");
 }
 
 void
 sim_set_callbacks (ptr)
      host_callback *ptr;
 {
   sim_callback = ptr;
 }
 
 char **
 sim_complete_command (SIM_DESC sd, char *text, char *word)
 {
   return NULL;
 }