Merge GDB 7.5.1

gdb/gdbserver/target.c

 /* Target operations for the remote server for GDB.
    Copyright (C) 2002, 2004-2005, 2007-2012 Free Software Foundation,
    Inc.
 
    Contributed by MontaVista Software.
 
    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
@@ skipping 69 matching lines @@
   if (connected_wait)
     server_waiting = 1;
 
   ret = (*the_target->wait) (ptid, ourstatus, options);
 
   if (ourstatus->kind == TARGET_WAITKIND_EXITED)
     fprintf (stderr,
              "\nChild exited with status %d\n", ourstatus->value.integer);
   else if (ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
     fprintf (stderr, "\nChild terminated with signal = 0x%x (%s)\n",
-             target_signal_to_host (ourstatus->value.sig),
-             target_signal_to_name (ourstatus->value.sig));
+             gdb_signal_to_host (ourstatus->value.sig),
+             gdb_signal_to_name (ourstatus->value.sig));
 
   if (connected_wait)
     server_waiting = 0;
 
   return ret;
 }
 
 int
 start_non_stop (int nonstop)
 {
@@ skipping 48 matching lines @@
   const char *kind_str = "status->kind = ";
 
   switch (ws->kind)
     {
     case TARGET_WAITKIND_EXITED:
       sprintf (buf, "%sexited, status = %d",
                kind_str, ws->value.integer);
       break;
     case TARGET_WAITKIND_STOPPED:
       sprintf (buf, "%sstopped, signal = %s",
-               kind_str, target_signal_to_name (ws->value.sig));
+               kind_str, gdb_signal_to_name (ws->value.sig));
       break;
     case TARGET_WAITKIND_SIGNALLED:
       sprintf (buf, "%ssignalled, signal = %s",
-               kind_str, target_signal_to_name (ws->value.sig));
+               kind_str, gdb_signal_to_name (ws->value.sig));
       break;
     case TARGET_WAITKIND_LOADED:
       sprintf (buf, "%sloaded", kind_str);
       break;
     case TARGET_WAITKIND_EXECD:
       sprintf (buf, "%sexecd", kind_str);
       break;
     case TARGET_WAITKIND_SPURIOUS:
       sprintf (buf, "%sspurious", kind_str);
       break;
     case TARGET_WAITKIND_IGNORE:
       sprintf (buf, "%signore", kind_str);
       break;
     default:
       sprintf (buf, "%sunknown???", kind_str);
       break;
     }
 
   return buf;
 }