Merge GDB 7.5.1

gdb/i386fbsd-nat.c

 /* Native-dependent code for FreeBSD/i386.
 
    Copyright (C) 2001-2004, 2007-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.
@@ skipping 18 matching lines @@
 #include "fbsd-nat.h"
 #include "i386-tdep.h"
 #include "i386-nat.h"
 #include "i386bsd-nat.h"
 
 /* Resume execution of the inferior process.  If STEP is nonzero,
    single-step it.  If SIGNAL is nonzero, give it that signal.  */
 
 static void
 i386fbsd_resume (struct target_ops *ops,
-                 ptid_t ptid, int step, enum target_signal signal)
+                 ptid_t ptid, int step, enum gdb_signal signal)
 {
   pid_t pid = ptid_get_pid (ptid);
   int request = PT_STEP;
 
   if (pid == -1)
     /* Resume all threads.  This only gets used in the non-threaded
        case, where "resume all threads" and "resume inferior_ptid" are
        the same.  */
     pid = ptid_get_pid (inferior_ptid);
 
@@ skipping 15 matching lines @@
       regcache_cooked_read_unsigned (regcache, I386_EFLAGS_REGNUM,
                                      &eflags);
       if (eflags & 0x0100)
         regcache_cooked_write_unsigned (regcache, I386_EFLAGS_REGNUM,
                                         eflags & ~0x0100);
 
       request = PT_CONTINUE;
     }
 
   /* An addres of (caddr_t) 1 tells ptrace to continue from where it