Merge GDB 7.5.1

gdb/gdbserver/nto-low.c

 /* QNX Neutrino specific low level interface, for the remote server
    for GDB.
    Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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/>.  */
 
 
 #include "server.h"
+#include "gdbthread.h"
 #include "nto-low.h"
 
 #include <limits.h>
 #include <fcntl.h>
 #include <spawn.h>
 #include <sys/procfs.h>
 #include <sys/auxv.h>
 #include <stdarg.h>
 #include <sys/iomgr.h>
 #include <sys/neutrino.h>
@@ skipping 492 matching lines @@
       sigwaitinfo (&set, &info);
       devctl (nto_inferior.ctl_fd, DCMD_PROC_STATUS, &status, sizeof (status),
               0);
     }
   nto_find_new_threads (&nto_inferior);
 
   if (status.flags & _DEBUG_FLAG_SSTEP)
     {
       TRACE ("SSTEP\n");
       ourstatus->kind = TARGET_WAITKIND_STOPPED;
-      ourstatus->value.sig = TARGET_SIGNAL_TRAP;
+      ourstatus->value.sig = GDB_SIGNAL_TRAP;
     }
   /* Was it a breakpoint?  */
   else if (status.flags & trace_mask)
     {
       TRACE ("STOPPED\n");
       ourstatus->kind = TARGET_WAITKIND_STOPPED;
-      ourstatus->value.sig = TARGET_SIGNAL_TRAP;
+      ourstatus->value.sig = GDB_SIGNAL_TRAP;
     }
   else if (status.flags & _DEBUG_FLAG_ISTOP)
     {
       TRACE ("ISTOP\n");
       switch (status.why)
         {
         case _DEBUG_WHY_SIGNALLED:
           TRACE ("  SIGNALLED\n");
           ourstatus->kind = TARGET_WAITKIND_STOPPED;
           ourstatus->value.sig =
-            target_signal_from_host (status.info.si_signo);
+            gdb_signal_from_host (status.info.si_signo);
           nto_inferior.exit_signo = ourstatus->value.sig;
           break;
         case _DEBUG_WHY_FAULTED:
           TRACE ("  FAULTED\n");
           ourstatus->kind = TARGET_WAITKIND_STOPPED;
           if (status.info.si_signo == SIGTRAP)
             {
               ourstatus->value.sig = 0;
               nto_inferior.exit_signo = 0;
             }
           else
             {
               ourstatus->value.sig =
-                target_signal_from_host (status.info.si_signo);
+                gdb_signal_from_host (status.info.si_signo);
               nto_inferior.exit_signo = ourstatus->value.sig;
             }
           break;
 
         case _DEBUG_WHY_TERMINATED:
           {
             int waitval = 0;
 
             TRACE ("  TERMINATED\n");
             waitpid (ptid_get_pid (ptid), &waitval, WNOHANG);
@@ skipping 10 matching lines @@
                 ourstatus->value.integer = WEXITSTATUS (waitval);
               }
             nto_inferior.exit_signo = 0;
             break;
           }
 
         case _DEBUG_WHY_REQUESTED:
           TRACE ("REQUESTED\n");
           /* We are assuming a requested stop is due to a SIGINT.  */
           ourstatus->kind = TARGET_WAITKIND_STOPPED;
-          ourstatus->value.sig = TARGET_SIGNAL_INT;
+          ourstatus->value.sig = GDB_SIGNAL_INT;
           nto_inferior.exit_signo = 0;
           break;
         }
     }
 
   return ptid_build (status.pid, status.tid, 0);
 }
 
 /* Fetch inferior's registers for currently selected thread (CURRENT_INFERIOR).
    If REGNO is -1, fetch all registers, or REGNO register only otherwise.  */
@@ skipping 342 matching lines @@
   set_breakpoint_data (the_low_target.breakpoint,
                        the_low_target.breakpoint_len);
 
   /* We use SIGUSR1 to gain control after we block waiting for a process.
      We use sigwaitevent to wait.  */
   sigemptyset (&set);
   sigaddset (&set, SIGUSR1);
   sigprocmask (SIG_BLOCK, &set, NULL);
 }