Imported Upstream version 7.9

[platform/upstream/gdb.git] / gdb / i386obsd-nat.c

diff --git a/gdb/i386obsd-nat.c b/gdb/i386obsd-nat.c
index e64c587..540d2b0 100644 (file)
--- a/gdb/i386obsd-nat.c
+++ b/gdb/i386obsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for OpenBSD/i386.
 
-   Copyright (C) 2002-2004, 2006-2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,13 +22,13 @@
 #include "regcache.h"
 #include "target.h"
 
-#include <sys/param.h>
 #include <sys/sysctl.h>
 #include <machine/frame.h>
 #include <machine/pcb.h>
 
 #include "i386-tdep.h"
 #include "i386bsd-nat.h"
+#include "obsd-nat.h"
 #include "bsd-kvm.h"
 
 static int
@@ -65,7 +65,7 @@ i386obsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
   if ((pcb->pcb_flags & PCB_SAVECTX) == 0)
     {
       /* Yes, we have a frame that matches cpu_switch().  */
-      read_memory (pcb->pcb_esp, (char *) &sf, sizeof sf);
+      read_memory (pcb->pcb_esp, (gdb_byte *) &sf, sizeof sf);
       pcb->pcb_esp += sizeof (struct switchframe);
       regcache_raw_supply (regcache, I386_EDI_REGNUM, &sf.sf_edi);
       regcache_raw_supply (regcache, I386_ESI_REGNUM, &sf.sf_esi);
@@ -95,8 +95,8 @@ void _initialize_i386obsd_nat (void);
 void
 _initialize_i386obsd_nat (void)
 {
-  /* We've got nothing to add to the common *BSD/i386 target.  */
-  add_target (i386bsd_target ());
+  /* Add some extra features to the common *BSD/i386 target.  */
+  obsd_add_target (i386bsd_target ());
 
   /* Support debugging kernel virtual memory images.  */
   bsd_kvm_add_target (i386obsd_supply_pcb);