summaryrefslogtreecommitdiff
path: root/devel/gdb/files/extrapatch-threads
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gdb/files/extrapatch-threads')
-rw-r--r--devel/gdb/files/extrapatch-threads164
1 files changed, 82 insertions, 82 deletions
diff --git a/devel/gdb/files/extrapatch-threads b/devel/gdb/files/extrapatch-threads
index a6935a87fd42..67f30c9dcdd2 100644
--- a/devel/gdb/files/extrapatch-threads
+++ b/devel/gdb/files/extrapatch-threads
@@ -1,16 +1,16 @@
-diff --git a/gdb/Makefile.in b/gdb/Makefile.in
-index ea27cf5..d17752f 100644
+diff --git gdb/Makefile.in gdb/Makefile.in
+index 7937801..6122f16 100644
--- gdb/Makefile.in
+++ gdb/Makefile.in
-@@ -668,6 +668,7 @@ ALL_TARGET_OBS = \
+@@ -691,6 +691,7 @@ ALL_TARGET_OBS = \
xtensa-config.o xtensa-tdep.o xtensa-linux-tdep.o \
glibc-tdep.o \
bsd-uthread.o \
+ fbsd-threads.o \
nbsd-tdep.o obsd-tdep.o \
sol2-tdep.o \
- solib-frv.o solib-irix.o solib-svr4.o \
-@@ -1327,7 +1328,7 @@ libgdb.a: $(LIBGDB_OBS)
+ solib-frv.o solib-svr4.o \
+@@ -1366,7 +1367,7 @@ libgdb.a: $(LIBGDB_OBS)
# Removing the old gdb first works better if it is running, at least on SunOS.
gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
rm -f gdb$(EXEEXT)
@@ -19,7 +19,7 @@ index ea27cf5..d17752f 100644
-o gdb$(EXEEXT) gdb.o $(LIBGDB_OBS) \
$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
-@@ -1600,7 +1601,7 @@ ALLDEPFILES = \
+@@ -1639,7 +1640,7 @@ ALLDEPFILES = \
armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c \
avr-tdep.c \
bfin-linux-tdep.c bfin-tdep.c \
@@ -28,12 +28,12 @@ index ea27cf5..d17752f 100644
core-regset.c \
dcache.c dicos-tdep.c darwin-nat.c \
exec.c \
-diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c
-index 9e6a0df..7aff6f0 100644
+diff --git gdb/amd64bsd-nat.c gdb/amd64bsd-nat.c
+index b1d4a0e..7f189f6 100644
--- gdb/amd64bsd-nat.c
+++ gdb/amd64bsd-nat.c
-@@ -41,6 +41,19 @@
- size_t x86_xsave_len;
+@@ -40,6 +40,19 @@
+ size_t amd64bsd_xsave_len;
#endif
+static pid_t
@@ -52,7 +52,7 @@ index 9e6a0df..7aff6f0 100644
/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
for all registers (including the floating-point registers). */
-@@ -54,7 +67,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
+@@ -53,7 +66,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
{
struct reg regs;
@@ -61,16 +61,16 @@ index 9e6a0df..7aff6f0 100644
(PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't get registers"));
-@@ -72,7 +85,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
- if (x86_xsave_len != 0)
+@@ -71,7 +84,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
+ if (amd64bsd_xsave_len != 0)
{
- xstateregs = alloca(x86_xsave_len);
+ xstateregs = alloca (amd64bsd_xsave_len);
- if (ptrace (PT_GETXSTATE, ptid_get_pid (inferior_ptid),
+ if (ptrace (PT_GETXSTATE, ptrace_pid (inferior_ptid),
(PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
perror_with_name (_("Couldn't get extended state status"));
-@@ -81,7 +94,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
+@@ -80,7 +93,7 @@ amd64bsd_fetch_inferior_registers (struct target_ops *ops,
}
#endif
@@ -79,7 +79,7 @@ index 9e6a0df..7aff6f0 100644
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
perror_with_name (_("Couldn't get floating point status"));
-@@ -104,11 +117,11 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
+@@ -103,11 +116,11 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
memset( &regs, 0, sizeof(struct reg));
memset( &oldregs, 0, sizeof(struct reg));
@@ -93,7 +93,7 @@ index 9e6a0df..7aff6f0 100644
(PTRACE_TYPE_ARG3) &oldregs, 0);
amd64_collect_native_gregset (regcache, &regs, regnum);
-@@ -118,7 +131,7 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
+@@ -117,7 +130,7 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
regs.r_rflags ^= (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE;
//printf(" allowed regs.r_rflags = 0x%8.8X\n", regs.r_rflags );
}
@@ -102,10 +102,10 @@ index 9e6a0df..7aff6f0 100644
(PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't write registers"));
-@@ -135,26 +148,26 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
- if (x86_xsave_len != 0)
+@@ -134,26 +147,26 @@ amd64bsd_store_inferior_registers (struct target_ops *ops,
+ if (amd64bsd_xsave_len != 0)
{
- xstateregs = alloca(x86_xsave_len);
+ xstateregs = alloca (amd64bsd_xsave_len);
- if (ptrace (PT_GETXSTATE, ptid_get_pid (inferior_ptid),
+ if (ptrace (PT_GETXSTATE, ptrace_pid (inferior_ptid),
(PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
@@ -115,7 +115,7 @@ index 9e6a0df..7aff6f0 100644
- if (ptrace (PT_SETXSTATE, ptid_get_pid (inferior_ptid),
+ if (ptrace (PT_SETXSTATE, ptrace_pid (inferior_ptid),
- (PTRACE_TYPE_ARG3) xstateregs, x86_xsave_len) == -1)
+ (PTRACE_TYPE_ARG3) xstateregs, amd64bsd_xsave_len) == -1)
perror_with_name (_("Couldn't write extended state status"));
return;
}
@@ -133,7 +133,7 @@ index 9e6a0df..7aff6f0 100644
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
perror_with_name (_("Couldn't write floating point status"));
}
-@@ -184,7 +197,7 @@ amd64bsd_dr_get (ptid_t ptid, int regnum)
+@@ -183,7 +196,7 @@ amd64bsd_dr_get (ptid_t ptid, int regnum)
{
struct dbreg dbregs;
@@ -142,7 +142,7 @@ index 9e6a0df..7aff6f0 100644
(PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
perror_with_name (_("Couldn't read debug registers"));
-@@ -196,7 +209,7 @@ amd64bsd_dr_set (int regnum, unsigned long value)
+@@ -195,7 +208,7 @@ amd64bsd_dr_set (int regnum, unsigned long value)
{
struct dbreg dbregs;
@@ -151,7 +151,7 @@ index 9e6a0df..7aff6f0 100644
(PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
perror_with_name (_("Couldn't get debug registers"));
-@@ -207,7 +220,7 @@ amd64bsd_dr_set (int regnum, unsigned long value)
+@@ -206,7 +219,7 @@ amd64bsd_dr_set (int regnum, unsigned long value)
DBREG_DRX ((&dbregs), regnum) = value;
@@ -160,8 +160,8 @@ index 9e6a0df..7aff6f0 100644
(PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
perror_with_name (_("Couldn't write debug registers"));
}
-diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
-index eea2472..9ce6a54 100644
+diff --git gdb/amd64fbsd-nat.c gdb/amd64fbsd-nat.c
+index a721f48..2534360 100644
--- gdb/amd64fbsd-nat.c
+++ gdb/amd64fbsd-nat.c
@@ -18,6 +18,7 @@
@@ -172,7 +172,7 @@ index eea2472..9ce6a54 100644
#include "inferior.h"
#include "regcache.h"
#include "target.h"
-@@ -95,6 +96,46 @@ static int amd64fbsd32_r_reg_offset[I386_NUM_GREGS] =
+@@ -92,6 +93,46 @@ static int amd64fbsd32_r_reg_offset[I386_NUM_GREGS] =
};
@@ -219,19 +219,19 @@ index eea2472..9ce6a54 100644
/* Support for debugging kernel virtual memory images. */
#include <machine/pcb.h>
-diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
-index 582ae50..8e07369 100644
+diff --git gdb/amd64fbsd-tdep.c gdb/amd64fbsd-tdep.c
+index 52705d9..6d48d8f 100644
--- gdb/amd64fbsd-tdep.c
+++ gdb/amd64fbsd-tdep.c
-@@ -31,7 +31,6 @@
- #include <string.h>
+@@ -28,7 +28,6 @@
+ #include "x86-xstate.h"
#include "amd64-tdep.h"
-#include "bsd-uthread.h"
+ #include "fbsd-tdep.h"
#include "solib-svr4.h"
- /* Supported register note sections. */
-@@ -178,46 +177,6 @@ amd64fbsd_core_read_description (struct gdbarch *gdbarch,
+@@ -226,46 +225,6 @@ amd64fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
}
static void
@@ -278,7 +278,7 @@ index 582ae50..8e07369 100644
amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-@@ -245,10 +204,6 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+@@ -298,10 +257,6 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
set_gdbarch_core_read_description (gdbarch,
amd64fbsd_core_read_description);
@@ -289,42 +289,42 @@ index 582ae50..8e07369 100644
/* FreeBSD uses SVR4-style shared libraries. */
set_solib_svr4_fetch_link_map_offsets
(gdbarch, svr4_lp64_fetch_link_map_offsets);
-diff --git a/gdb/configure.tgt b/gdb/configure.tgt
-index 01311b2..0929a25 100644
+diff --git gdb/configure.tgt gdb/configure.tgt
+index 7fdd34e..64afacf 100644
--- gdb/configure.tgt
+++ gdb/configure.tgt
-@@ -189,7 +189,7 @@ i[34567]86-*-dicos*)
+@@ -187,7 +187,7 @@ i[34567]86-*-dicos*)
i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
# Target: FreeBSD/i386
gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-- bsd-uthread.o solib-svr4.o"
-+ fbsd-threads.o solib-svr4.o"
+- bsd-uthread.o fbsd-tdep.o solib-svr4.o"
++ fbsd-threads.o fbsd-tdep.o solib-svr4.o"
;;
i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
# Target: NetBSD/i386
-@@ -415,7 +415,7 @@ nios2*-*-*)
+@@ -410,7 +410,7 @@ nios2*-*-*)
powerpc*-*-freebsd*)
# Target: FreeBSD/powerpc
gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
-- ppcfbsd-tdep.o solib-svr4.o \
-+ ppcfbsd-tdep.o solib-svr4.o fbsd-threads.o \
+- ppcfbsd-tdep.o fbsd-tdep.o solib-svr4.o \
++ ppcfbsd-tdep.o fbsd-threads.o fbsd-tdep.o solib-svr4.o \
ravenscar-thread.o ppc-ravenscar-thread.o"
;;
-@@ -667,7 +667,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
+@@ -663,7 +663,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
# Target: FreeBSD/amd64
gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-- bsd-uthread.o solib-svr4.o"
-+ fbsd-threads.o solib-svr4.o"
+- bsd-uthread.o fbsd-tdep.o solib-svr4.o"
++ fbsd-threads.o fbsd-tdep.o solib-svr4.o"
;;
x86_64-*-mingw* | x86_64-*-cygwin*)
# Target: MingW/amd64
-diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
-index c26e830..246acdd 100644
+diff --git gdb/i386bsd-nat.c gdb/i386bsd-nat.c
+index ac8a19b..cb2d50e 100644
--- gdb/i386bsd-nat.c
+++ gdb/i386bsd-nat.c
-@@ -89,9 +89,22 @@ size_t x86_xsave_len;
+@@ -87,9 +87,22 @@ size_t i386bsd_xsave_len;
#endif
@@ -348,7 +348,7 @@ index c26e830..246acdd 100644
i386bsd_supply_gregset (struct regcache *regcache, const void *gregs)
{
const char *regs = gregs;
-@@ -110,7 +123,7 @@ i386bsd_supply_gregset (struct regcache *regcache, const void *gregs)
+@@ -108,7 +121,7 @@ i386bsd_supply_gregset (struct regcache *regcache, const void *gregs)
GREGS. If REGNUM is -1, collect and store all appropriate
registers. */
@@ -357,7 +357,7 @@ index c26e830..246acdd 100644
i386bsd_collect_gregset (const struct regcache *regcache,
void *gregs, int regnum)
{
-@@ -140,7 +153,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
+@@ -138,7 +151,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
{
struct reg regs;
@@ -366,16 +366,16 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't get registers"));
-@@ -162,7 +175,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
+@@ -160,7 +173,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
char *xstateregs;
- xstateregs = alloca(x86_xsave_len);
+ xstateregs = alloca (i386bsd_xsave_len);
- if (ptrace (PT_GETXSTATE, ptid_get_pid (inferior_ptid),
+ if (ptrace (PT_GETXSTATE, ptrace_pid (inferior_ptid),
(PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
perror_with_name (_("Couldn't get extended state status"));
-@@ -174,7 +187,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
+@@ -171,7 +184,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
#ifdef HAVE_PT_GETXMMREGS
if (have_ptrace_xmmregs != 0
@@ -384,7 +384,7 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
{
have_ptrace_xmmregs = 1;
-@@ -184,7 +197,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
+@@ -181,7 +194,7 @@ i386bsd_fetch_inferior_registers (struct target_ops *ops,
{
have_ptrace_xmmregs = 0;
#endif
@@ -393,7 +393,7 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
perror_with_name (_("Couldn't get floating point status"));
-@@ -206,13 +219,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
+@@ -203,13 +216,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
{
struct reg regs;
@@ -409,10 +409,10 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't write registers"));
-@@ -233,13 +246,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
+@@ -230,13 +243,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
char *xstateregs;
- xstateregs = alloca(x86_xsave_len);
+ xstateregs = alloca (i386bsd_xsave_len);
- if (ptrace (PT_GETXSTATE, ptid_get_pid (inferior_ptid),
+ if (ptrace (PT_GETXSTATE, ptrace_pid (inferior_ptid),
(PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
@@ -422,10 +422,10 @@ index c26e830..246acdd 100644
- if (ptrace (PT_SETXSTATE, ptid_get_pid (inferior_ptid),
+ if (ptrace (PT_SETXSTATE, ptrace_pid (inferior_ptid),
- (PTRACE_TYPE_ARG3) xstateregs, x86_xsave_len) == -1)
+ (PTRACE_TYPE_ARG3) xstateregs, i386bsd_xsave_len) == -1)
perror_with_name (_("Couldn't write extended state status"));
- }
-@@ -247,14 +260,14 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
+ return;
+@@ -245,14 +258,14 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
#ifdef HAVE_PT_GETXMMREGS
if (have_ptrace_xmmregs != 0
@@ -442,7 +442,7 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) xmmregs, 0) == -1)
perror_with_name (_("Couldn't write XMM registers"));
}
-@@ -262,13 +275,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
+@@ -260,13 +273,13 @@ i386bsd_store_inferior_registers (struct target_ops *ops,
{
have_ptrace_xmmregs = 0;
#endif
@@ -458,7 +458,7 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
perror_with_name (_("Couldn't write floating point status"));
#ifdef HAVE_PT_GETXMMREGS
-@@ -307,7 +320,7 @@ i386bsd_dr_get (ptid_t ptid, int regnum)
+@@ -305,7 +318,7 @@ i386bsd_dr_get (ptid_t ptid, int regnum)
{
struct dbreg dbregs;
@@ -467,7 +467,7 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
perror_with_name (_("Couldn't read debug registers"));
-@@ -319,7 +332,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
+@@ -317,7 +330,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
{
struct dbreg dbregs;
@@ -476,7 +476,7 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
perror_with_name (_("Couldn't get debug registers"));
-@@ -330,7 +343,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
+@@ -328,7 +341,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
DBREG_DRX ((&dbregs), regnum) = value;
@@ -485,8 +485,8 @@ index c26e830..246acdd 100644
(PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
perror_with_name (_("Couldn't write debug registers"));
}
-diff --git a/gdb/i386bsd-nat.h b/gdb/i386bsd-nat.h
-index 044f530..2fca773 100644
+diff --git gdb/i386bsd-nat.h gdb/i386bsd-nat.h
+index 2f50c32..bf7f2ff 100644
--- gdb/i386bsd-nat.h
+++ gdb/i386bsd-nat.h
@@ -38,6 +38,14 @@ extern CORE_ADDR i386bsd_dr_get_addr (int regnum);
@@ -504,8 +504,8 @@ index 044f530..2fca773 100644
extern unsigned long i386bsd_dr_get_control (void);
#endif /* i386bsd-nat.h */
-diff --git a/gdb/i386fbsd-nat.c b/gdb/i386fbsd-nat.c
-index b9620e1..71abcdf 100644
+diff --git gdb/i386fbsd-nat.c gdb/i386fbsd-nat.c
+index a205a26..29b9444 100644
--- gdb/i386fbsd-nat.c
+++ gdb/i386fbsd-nat.c
@@ -21,6 +21,7 @@
@@ -516,7 +516,7 @@ index b9620e1..71abcdf 100644
#include <sys/types.h>
#include <sys/ptrace.h>
-@@ -82,6 +83,49 @@ i386fbsd_resume (struct target_ops *ops,
+@@ -81,6 +82,49 @@ i386fbsd_resume (struct target_ops *ops,
}
@@ -566,19 +566,19 @@ index b9620e1..71abcdf 100644
/* Support for debugging kernel virtual memory images. */
#include <machine/pcb.h>
-diff --git a/gdb/i386fbsd-tdep.c b/gdb/i386fbsd-tdep.c
-index 8f7109f..fcb85d8 100644
+diff --git gdb/i386fbsd-tdep.c gdb/i386fbsd-tdep.c
+index 99e08cb..5bb15f6 100644
--- gdb/i386fbsd-tdep.c
+++ gdb/i386fbsd-tdep.c
-@@ -30,7 +30,6 @@
+@@ -28,7 +28,6 @@
#include "i386-tdep.h"
#include "i387-tdep.h"
-#include "bsd-uthread.h"
+ #include "fbsd-tdep.h"
#include "solib-svr4.h"
- /* FreeBSD 3.0-RELEASE or later. */
-@@ -153,46 +152,6 @@ i386fbsd_core_read_description (struct gdbarch *gdbarch,
+@@ -333,46 +332,6 @@ i386fbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
}
static void
@@ -625,7 +625,7 @@ index 8f7109f..fcb85d8 100644
i386fbsdaout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
-@@ -217,10 +176,6 @@ i386fbsdaout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+@@ -399,10 +358,6 @@ i386fbsdaout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
/* FreeBSD has a more complete `struct sigcontext'. */
tdep->sc_reg_offset = i386fbsd_sc_reg_offset;
tdep->sc_num_regs = ARRAY_SIZE (i386fbsd_sc_reg_offset);
@@ -636,11 +636,11 @@ index 8f7109f..fcb85d8 100644
}
static void
-diff --git a/gdb/ppcfbsd-nat.c b/gdb/ppcfbsd-nat.c
-index 079bd12..74922f2 100644
+diff --git gdb/ppcfbsd-nat.c gdb/ppcfbsd-nat.c
+index 778b4bb..fa9285f 100644
--- gdb/ppcfbsd-nat.c
+++ gdb/ppcfbsd-nat.c
-@@ -39,6 +39,19 @@
+@@ -37,6 +37,19 @@
#include "inf-ptrace.h"
#include "bsd-kvm.h"
@@ -660,7 +660,7 @@ index 079bd12..74922f2 100644
/* Fill GDB's register array with the general-purpose register values
in *GREGSETP. */
-@@ -123,7 +136,7 @@ ppcfbsd_fetch_inferior_registers (struct target_ops *ops,
+@@ -121,7 +134,7 @@ ppcfbsd_fetch_inferior_registers (struct target_ops *ops,
{
gdb_gregset_t regs;
@@ -669,7 +669,7 @@ index 079bd12..74922f2 100644
(PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't get registers"));
-@@ -134,7 +147,7 @@ ppcfbsd_fetch_inferior_registers (struct target_ops *ops,
+@@ -132,7 +145,7 @@ ppcfbsd_fetch_inferior_registers (struct target_ops *ops,
const struct regset *fpregset = ppc_fbsd_fpregset ();
gdb_fpregset_t fpregs;
@@ -678,7 +678,7 @@ index 079bd12..74922f2 100644
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
perror_with_name (_("Couldn't get FP registers"));
-@@ -151,13 +164,13 @@ ppcfbsd_store_inferior_registers (struct target_ops *ops,
+@@ -149,13 +162,13 @@ ppcfbsd_store_inferior_registers (struct target_ops *ops,
{
gdb_gregset_t regs;
@@ -694,7 +694,7 @@ index 079bd12..74922f2 100644
(PTRACE_TYPE_ARG3) &regs, 0) == -1)
perror_with_name (_("Couldn't write registers"));
-@@ -165,13 +178,13 @@ ppcfbsd_store_inferior_registers (struct target_ops *ops,
+@@ -163,13 +176,13 @@ ppcfbsd_store_inferior_registers (struct target_ops *ops,
{
gdb_fpregset_t fpregs;