Fix "breakpoint always-inserted off"; remove "breakpoint always-inserted auto"

[deliverable/binutils-gdb.git] / gdb / vax-nat.c

diff --git a/gdb/vax-nat.c b/gdb/vax-nat.c
index c93435de1df3772fc90263b7c310df643a82c3b1..c39ae296a9c4ba7c0ee6ac329eef9e754b2480dd 100644 (file)
--- a/gdb/vax-nat.c
+++ b/gdb/vax-nat.c
@@ -1,12 +1,12 @@
 /* Native-dependent code for VAX UNIXen (including older BSD's).
 
-   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004-2014 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 2 of the License, or
+   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,
@@ -15,14 +15,11 @@
    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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "inferior.h"
 
-#include "gdb_assert.h"
 #include <sys/types.h>
 #include <sys/dir.h>
 #include <sys/user.h>
@@ -46,7 +43,7 @@
 #include "vax-tdep.h"
 #include "inf-ptrace.h"
 
-/* Address of the user structure.  This is the the value for 32V; 3BSD
+/* Address of the user structure.  This is the value for 32V; 3BSD
    uses a different value, but hey, who's still using those systems?  */
 static CORE_ADDR vax_kernel_u_addr = 0x80020000;
 
@@ -76,7 +73,7 @@ vax_register_u_offset (struct gdbarch *gdbarch, int regnum, int store_p)
   int pid;
 
   errno = 0;
-  pid = PIDGET (inferior_ptid);
+  pid = ptid_get_pid (inferior_ptid);
   u_ar0 = ptrace (PT_READ_U, pid, u_ar0_offset, 0);
   if (errno)
     perror_with_name (_("Unable to determine location of registers"));