Tweak gdb.cp tests for aarch32

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

diff --git a/gdb/amd64obsd-nat.c b/gdb/amd64obsd-nat.c
index 265aca9ec56c322553495faea04d623bfbda0682..7256dec89e93c34e43c42f298d2a7f4bac85bb9c 100644 (file)
--- a/gdb/amd64obsd-nat.c
+++ b/gdb/amd64obsd-nat.c
@@ -1,12 +1,12 @@
 /* Native-dependent code for OpenBSD/amd64.
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 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,19 +15,16 @@
    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 "gdbcore.h"
 #include "regcache.h"
 #include "target.h"
 
-#include "gdb_assert.h"
-
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
+#include "obsd-nat.h"
 
 /* Mapping between the general-purpose registers in OpenBSD/amd64
    `struct reg' format and GDB's register cache layout for
@@ -103,7 +100,7 @@ amd64obsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
     return 0;
 
   /* Read the stack frame, and check its validity.  */
-  read_memory (pcb->pcb_rsp, (char *) &sf, sizeof sf);
+  read_memory (pcb->pcb_rsp, (gdb_byte *) &sf, sizeof sf);
   if (sf.sf_rbp == pcb->pcb_rbp)
     {
       /* Yes, we have a frame that matches cpu_switch().  */
@@ -139,8 +136,8 @@ _initialize_amd64obsd_nat (void)
   amd64_native_gregset32_num_regs = ARRAY_SIZE (amd64obsd32_r_reg_offset);
   amd64_native_gregset64_reg_offset = amd64obsd_r_reg_offset;
 
-  /* We've got nothing to add to the common *BSD/amd64 target.  */
-  add_target (amd64bsd_target ());
+  /* Add some extra features to the common *BSD/amd64 target.  */
+  obsd_add_target (amd64bsd_target ());
 
   /* Support debugging kernel virtual memory images.  */
   bsd_kvm_add_target (amd64obsd_supply_pcb);