Unbreak on FreeBSD/powerpc. Doesn't affect any other platforms.

Submitted by:	Andreas Tobler <toa@pop.agri.ch>

8 files changed, 641 insertions, 3 deletions

diff --git a/devel/gdb6/files/patch-gdb_config_powerpc_fbsd.mh b/devel/gdb6/files/patch-gdb_config_powerpc_fbsd.mh
new file mode 100644
index 000000000000..24adb71f3af2
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_config_powerpc_fbsd.mh
@@ -0,0 +1,10 @@
+
+$FreeBSD$
+
+--- /dev/null
++++ gdb/config/powerpc/fbsd.mh
+@@ -0,0 +1,4 @@
++# Host: FreeBSD/PowerPC
++NATDEPFILES= fbsd-nat.o fork-child.o inf-ptrace.o ppcfbsd-nat.o bsd-kvm.o gcore.o
++
++LOADLIBES= -lkvm
diff --git a/devel/gdb6/files/patch-gdb_config_powerpc_fbsd.mt b/devel/gdb6/files/patch-gdb_config_powerpc_fbsd.mt
new file mode 100644
index 000000000000..f040c8137f9e
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_config_powerpc_fbsd.mt
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- /dev/null
++++ gdb/config/powerpc/fbsd.mt
+@@ -0,0 +1,7 @@
++# Target: FreeBSD/PowerPC
++TDEPFILES= rs6000-tdep.o ppc-sysv-tdep.o ppcfbsd-tdep.o corelow.o \
++	solib.o solib-svr4.o
++TM_FILE= tm-ppc-eabi.h
++
++# SIM_OBS = remote-sim.o
++# SIM = ../sim/ppc/libsim.a
diff --git a/devel/gdb6/files/patch-gdb_configure.host b/devel/gdb6/files/patch-gdb_configure.host
new file mode 100644
index 000000000000..efd101d8f93b
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_configure.host
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- gdb/configure.host
++++ gdb/configure.host
+@@ -106,6 +106,7 @@
+ powerpc-*-aix4.[0-2]*)	gdb_host=aix ;;
+ powerpc-*-aix4.3.[0-1]*)	gdb_host=aix ;;
+ powerpc-*-aix*)		gdb_host=aix432 ;;
++powerpc-*-freebsd*)	gdb_host=fbsd;;
+ powerpc-*-linux*)	gdb_host=linux ;;
+ powerpc-*-netbsd*)	gdb_host=nbsd ;;
+ powerpc-*-openbsd*)	gdb_host=obsd ;;
diff --git a/devel/gdb6/files/patch-gdb_ppcfbsd-nat.c b/devel/gdb6/files/patch-gdb_ppcfbsd-nat.c
new file mode 100644
index 000000000000..26111cebb138
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_ppcfbsd-nat.c
@@ -0,0 +1,196 @@
+
+$FreeBSD$
+
+--- /dev/null
++++ gdb/ppcfbsd-nat.c
+@@ -0,0 +1,190 @@
++/* Native-dependent code for PowerPC's running FreeBSD, for GDB.
++   Copyright 2002, 2004 Free Software Foundation, Inc.
++   Contributed by Wasabi Systems, 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
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   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., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.  */
++
++#include <sys/types.h>
++#include <sys/ptrace.h>
++#include <machine/reg.h>
++#include <machine/frame.h>
++#include <machine/pcb.h>
++
++#include "defs.h"
++#include "inferior.h"
++#include "gdb_assert.h"
++#include "gdbcore.h"
++#include "regcache.h"
++#include "bsd-kvm.h"
++
++#include "ppc-tdep.h"
++#include "ppcfbsd-tdep.h"
++
++#include "inf-ptrace.h"
++
++/* Returns true if PT_GETREGS fetches this register.  */
++static int
++getregs_supplies (int regno)
++{
++  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
++
++  return ((regno >= tdep->ppc_gp0_regnum
++           && regno < tdep->ppc_gp0_regnum + ppc_num_gprs)
++          || regno == tdep->ppc_lr_regnum
++          || regno == tdep->ppc_cr_regnum
++          || regno == tdep->ppc_xer_regnum
++          || regno == tdep->ppc_ctr_regnum
++	  || regno == PC_REGNUM);
++}
++
++/* Like above, but for PT_GETFPREGS.  */
++static int
++getfpregs_supplies (int regno)
++{
++  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
++
++  /* FIXME: jimb/2004-05-05: Some PPC variants don't have floating
++     point registers.  Traditionally, GDB's register set has still
++     listed the floating point registers for such machines, so this
++     code is harmless.  However, the new E500 port actually omits the
++     floating point registers entirely from the register set --- they
++     don't even have register numbers assigned to them.
++
++     It's not clear to me how best to update this code, so this assert
++     will alert the first person to encounter the NetBSD/E500
++     combination to the problem.  */
++  gdb_assert (ppc_floating_point_unit_p (current_gdbarch));
++
++  return ((regno >= tdep->ppc_fp0_regnum
++           && regno < tdep->ppc_fp0_regnum + ppc_num_fprs)
++	  || regno == tdep->ppc_fpscr_regnum);
++}
++
++static void
++ppcfbsd_fetch_inferior_registers (int regno)
++{
++  if (regno == -1 || getregs_supplies (regno))
++    {
++      struct reg regs;
++
++      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
++		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
++        perror_with_name (_("Couldn't get registers"));
++
++      ppcfbsd_supply_reg ((char *) &regs, regno);
++      if (regno != -1)
++	return;
++    }
++
++  if (regno == -1 || getfpregs_supplies (regno))
++    {
++      struct fpreg fpregs;
++
++      if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
++		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
++	perror_with_name (_("Couldn't get FP registers"));
++
++      ppcfbsd_supply_fpreg ((char *) &fpregs, regno);
++      if (regno != -1)
++	return;
++    }
++}
++
++static void
++ppcfbsd_store_inferior_registers (int regno)
++{
++  if (regno == -1 || getregs_supplies (regno))
++    {
++      struct reg regs;
++
++      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
++		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
++	perror_with_name (_("Couldn't get registers"));
++
++      ppcfbsd_fill_reg ((char *) &regs, regno);
++
++      if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
++		  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
++	perror_with_name (_("Couldn't write registers"));
++
++      if (regno != -1)
++	return;
++    }
++
++  if (regno == -1 || getfpregs_supplies (regno))
++    {
++      struct fpreg fpregs;
++
++      if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
++		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
++	perror_with_name (_("Couldn't get FP registers"));
++
++      ppcfbsd_fill_fpreg ((char *) &fpregs, regno);
++      
++      if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
++		  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
++	perror_with_name (_("Couldn't set FP registers"));
++    }
++}
++
++static int
++ppcfbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
++{
++  struct switchframe sf;
++  struct callframe cf;
++  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
++  int i;
++
++  /* The stack pointer shouldn't be zero.  */
++  if (pcb->pcb_sp == 0)
++    return 0;
++
++  read_memory (pcb->pcb_sp, (char *) &sf, sizeof sf);
++  regcache_raw_supply (regcache, tdep->ppc_cr_regnum, &sf.cr);
++  regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 2, &sf.fixreg2);
++  for (i = 0 ; i < 19 ; i++)
++    regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 13 + i,
++			 &sf.fixreg[i]);
++
++  read_memory(sf.sp, (char *)&cf, sizeof(cf));
++  regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 30, &cf.cf_arg0);
++  regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 31, &cf.cf_func);
++  regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 1, &cf.cf_dummy_fp);
++
++  read_memory(cf.cf_dummy_fp, (char *)&cf, sizeof(cf));
++  regcache_raw_supply (regcache, tdep->ppc_lr_regnum, &cf.cf_lr);
++  regcache_raw_supply (regcache, PC_REGNUM, &cf.cf_lr);
++
++  return 1;
++}
++
++/* Provide a prototype to silence -Wmissing-prototypes.  */
++void _initialize_ppcfbsd_nat (void);
++
++void
++_initialize_ppcfbsd_nat (void)
++{
++  struct target_ops *t;
++  /* Support debugging kernel virtual memory images.  */
++  bsd_kvm_add_target (ppcfbsd_supply_pcb);
++  /* Add in local overrides.  */
++  t = inf_ptrace_target ();
++  t->to_fetch_registers = ppcfbsd_fetch_inferior_registers;
++  t->to_store_registers = ppcfbsd_store_inferior_registers;
++  add_target (t);
++}
diff --git a/devel/gdb6/files/patch-gdb_ppcfbsd-tdep.c b/devel/gdb6/files/patch-gdb_ppcfbsd-tdep.c
new file mode 100644
index 000000000000..a207dd119d84
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_ppcfbsd-tdep.c
@@ -0,0 +1,347 @@
+
+$FreeBSD$
+
+--- /dev/null
++++ gdb/ppcfbsd-tdep.c
+@@ -0,0 +1,341 @@
++/* Target-dependent code for PowerPC systems running FreeBSD.
++
++   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
++
++   Contributed by Wasabi Systems, 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
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   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., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.  */
++
++#include "defs.h"
++#include "gdbcore.h"
++#include "regcache.h"
++#include "target.h"
++#include "breakpoint.h"
++#include "value.h"
++#include "osabi.h"
++
++#include "ppc-tdep.h"
++#include "ppcfbsd-tdep.h"
++//#include "fbsd-tdep.h"
++#include "tramp-frame.h"
++#include "trad-frame.h"
++#include "gdb_assert.h"
++#include "solib-svr4.h"
++
++#define REG_FIXREG_OFFSET(x)	((x) * 4)
++#define REG_LR_OFFSET		(32 * 4)
++#define REG_CR_OFFSET		(33 * 4)
++#define REG_XER_OFFSET		(34 * 4)
++#define REG_CTR_OFFSET		(35 * 4)
++#define REG_PC_OFFSET		(36 * 4)
++#define SIZEOF_STRUCT_REG	(37 * 4)
++
++#define FPREG_FPR_OFFSET(x)	((x) * 8)
++#define FPREG_FPSCR_OFFSET	(32 * 8)
++#define SIZEOF_STRUCT_FPREG	(33 * 8)
++
++void
++ppcfbsd_supply_reg (char *regs, int regno)
++{
++  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
++  int i;
++
++  for (i = 0; i < ppc_num_gprs; i++)
++    {
++      if (regno == tdep->ppc_gp0_regnum + i || regno == -1)
++	regcache_raw_supply (current_regcache, tdep->ppc_gp0_regnum + i,
++			     regs + REG_FIXREG_OFFSET (i));
++    }
++
++  if (regno == tdep->ppc_lr_regnum || regno == -1)
++    regcache_raw_supply (current_regcache, tdep->ppc_lr_regnum,
++			 regs + REG_LR_OFFSET);
++
++  if (regno == tdep->ppc_cr_regnum || regno == -1)
++    regcache_raw_supply (current_regcache, tdep->ppc_cr_regnum,
++			 regs + REG_CR_OFFSET);
++
++  if (regno == tdep->ppc_xer_regnum || regno == -1)
++    regcache_raw_supply (current_regcache, tdep->ppc_xer_regnum,
++			 regs + REG_XER_OFFSET);
++
++  if (regno == tdep->ppc_ctr_regnum || regno == -1)
++    regcache_raw_supply (current_regcache, tdep->ppc_ctr_regnum,
++			 regs + REG_CTR_OFFSET);
++
++  if (regno == PC_REGNUM || regno == -1)
++    regcache_raw_supply (current_regcache, PC_REGNUM,
++			 regs + REG_PC_OFFSET);
++}
++
++void
++ppcfbsd_fill_reg (char *regs, int regno)
++{
++  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
++  int i;
++
++  for (i = 0; i < ppc_num_gprs; i++)
++    {
++      if (regno == tdep->ppc_gp0_regnum + i || regno == -1)
++	regcache_raw_collect (current_regcache, tdep->ppc_gp0_regnum + i,
++			      regs + REG_FIXREG_OFFSET (i));
++    }
++
++  if (regno == tdep->ppc_lr_regnum || regno == -1)
++    regcache_raw_collect (current_regcache, tdep->ppc_lr_regnum,
++			  regs + REG_LR_OFFSET);
++
++  if (regno == tdep->ppc_cr_regnum || regno == -1)
++    regcache_raw_collect (current_regcache, tdep->ppc_cr_regnum,
++			  regs + REG_CR_OFFSET);
++
++  if (regno == tdep->ppc_xer_regnum || regno == -1)
++    regcache_raw_collect (current_regcache, tdep->ppc_xer_regnum,
++			  regs + REG_XER_OFFSET);
++
++  if (regno == tdep->ppc_ctr_regnum || regno == -1)
++    regcache_raw_collect (current_regcache, tdep->ppc_ctr_regnum,
++			  regs + REG_CTR_OFFSET);
++
++  if (regno == PC_REGNUM || regno == -1)
++    regcache_raw_collect (current_regcache, PC_REGNUM, regs + REG_PC_OFFSET);
++}
++
++void
++ppcfbsd_supply_fpreg (char *fpregs, int regno)
++{
++  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
++  int i;
++
++  /* FIXME: jimb/2004-05-05: Some PPC variants don't have floating
++     point registers.  Traditionally, GDB's register set has still
++     listed the floating point registers for such machines, so this
++     code is harmless.  However, the new E500 port actually omits the
++     floating point registers entirely from the register set --- they
++     don't even have register numbers assigned to them.
++
++     It's not clear to me how best to update this code, so this assert
++     will alert the first person to encounter the NetBSD/E500
++     combination to the problem.  */
++  gdb_assert (ppc_floating_point_unit_p (current_gdbarch));
++
++  for (i = 0; i < ppc_num_fprs; i++)
++    {
++      if (regno == tdep->ppc_fp0_regnum + i || regno == -1)
++	regcache_raw_supply (current_regcache, tdep->ppc_fp0_regnum + i,
++			     fpregs + FPREG_FPR_OFFSET (i));
++    }
++
++  if (regno == tdep->ppc_fpscr_regnum || regno == -1)
++    regcache_raw_supply (current_regcache, tdep->ppc_fpscr_regnum,
++			 fpregs + FPREG_FPSCR_OFFSET);
++}
++
++void
++ppcfbsd_fill_fpreg (char *fpregs, int regno)
++{
++  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
++  int i;
++
++  /* FIXME: jimb/2004-05-05: Some PPC variants don't have floating
++     point registers.  Traditionally, GDB's register set has still
++     listed the floating point registers for such machines, so this
++     code is harmless.  However, the new E500 port actually omits the
++     floating point registers entirely from the register set --- they
++     don't even have register numbers assigned to them.
++
++     It's not clear to me how best to update this code, so this assert
++     will alert the first person to encounter the NetBSD/E500
++     combination to the problem.  */
++  gdb_assert (ppc_floating_point_unit_p (current_gdbarch));
++
++  for (i = 0; i < ppc_num_fprs; i++)
++    {
++      if (regno == tdep->ppc_fp0_regnum + i || regno == -1)
++	regcache_raw_collect (current_regcache, tdep->ppc_fp0_regnum + i,
++			      fpregs + FPREG_FPR_OFFSET (i));
++    }
++
++  if (regno == tdep->ppc_fpscr_regnum || regno == -1)
++    regcache_raw_collect (current_regcache, tdep->ppc_fpscr_regnum,
++			  fpregs + FPREG_FPSCR_OFFSET);
++}
++
++static void
++fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
++                      CORE_ADDR ignore)
++{
++  char *regs, *fpregs;
++
++  /* We get everything from one section.  */
++  if (which != 0)
++    return;
++
++  regs = core_reg_sect;
++  fpregs = core_reg_sect + SIZEOF_STRUCT_REG;
++
++  /* Integer registers.  */
++  ppcfbsd_supply_reg (regs, -1);
++
++  /* Floating point registers.  */
++  ppcfbsd_supply_fpreg (fpregs, -1);
++}
++
++static void
++fetch_elfcore_registers (char *core_reg_sect, unsigned core_reg_size, int which,
++                         CORE_ADDR ignore)
++{
++  switch (which)
++    {
++    case 0:  /* Integer registers.  */
++      if (core_reg_size != SIZEOF_STRUCT_REG)
++	warning (_("Wrong size register set in core file."));
++      else
++	ppcfbsd_supply_reg (core_reg_sect, -1);
++      break;
++
++    case 2:  /* Floating point registers.  */
++      if (core_reg_size != SIZEOF_STRUCT_FPREG)
++	warning (_("Wrong size FP register set in core file."));
++      else
++	ppcfbsd_supply_fpreg (core_reg_sect, -1);
++      break;
++
++    default:
++      /* Don't know what kind of register request this is; just ignore it.  */
++      break;
++    }
++}
++
++static struct core_fns ppcfbsd_core_fns =
++{
++  bfd_target_unknown_flavour,		/* core_flavour */
++  default_check_format,			/* check_format */
++  default_core_sniffer,			/* core_sniffer */
++  fetch_core_registers,			/* core_read_registers */
++  NULL					/* next */
++};
++
++static struct core_fns ppcfbsd_elfcore_fns =
++{
++  bfd_target_elf_flavour,		/* core_flavour */
++  default_check_format,			/* check_format */
++  default_core_sniffer,			/* core_sniffer */
++  fetch_elfcore_registers,		/* core_read_registers */
++  NULL					/* next */
++};
++
++/* NetBSD is confused.  It appears that 1.5 was using the correct SVr4
++   convention but, 1.6 switched to the below broken convention.  For
++   the moment use the broken convention.  Ulgh!.  */
++
++static enum return_value_convention
++ppcfbsd_return_value (struct gdbarch *gdbarch, struct type *valtype,
++		      struct regcache *regcache, void *readbuf,
++		      const void *writebuf)
++{
++  if ((TYPE_CODE (valtype) == TYPE_CODE_STRUCT
++       || TYPE_CODE (valtype) == TYPE_CODE_UNION)
++      && !((TYPE_LENGTH (valtype) == 16 || TYPE_LENGTH (valtype) == 8))
++      && !(TYPE_LENGTH (valtype) == 1
++	   || TYPE_LENGTH (valtype) == 2
++	   || TYPE_LENGTH (valtype) == 4
++	   || TYPE_LENGTH (valtype) == 8)) 
++    return RETURN_VALUE_STRUCT_CONVENTION; 
++  else 
++    return ppc_sysv_abi_broken_return_value (gdbarch, valtype, regcache,
++					     readbuf, writebuf); 
++}
++
++static void
++ppcfbsd_sigtramp_cache_init (const struct tramp_frame *self,
++			     struct frame_info *next_frame,
++			     struct trad_frame_cache *this_cache,
++			     CORE_ADDR func)
++{
++  CORE_ADDR base;
++  CORE_ADDR offset;
++  int i;
++  struct gdbarch *gdbarch = get_frame_arch (next_frame);
++  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
++
++  base = frame_unwind_register_unsigned (next_frame, SP_REGNUM);
++  offset = base + 0x18 + 2 * tdep->wordsize;
++  for (i = 0; i < ppc_num_gprs; i++)
++    {
++      int regnum = i + tdep->ppc_gp0_regnum;
++      trad_frame_set_reg_addr (this_cache, regnum, offset);
++      offset += tdep->wordsize;
++    }
++  trad_frame_set_reg_addr (this_cache, tdep->ppc_lr_regnum, offset);
++  offset += tdep->wordsize;
++  trad_frame_set_reg_addr (this_cache, tdep->ppc_cr_regnum, offset);
++  offset += tdep->wordsize;
++  trad_frame_set_reg_addr (this_cache, tdep->ppc_xer_regnum, offset);
++  offset += tdep->wordsize;
++  trad_frame_set_reg_addr (this_cache, tdep->ppc_ctr_regnum, offset);
++  offset += tdep->wordsize;
++  trad_frame_set_reg_addr (this_cache, PC_REGNUM, offset); /* SRR0? */
++  offset += tdep->wordsize;
++
++  /* Construct the frame ID using the function start.  */
++  trad_frame_set_id (this_cache, frame_id_build (base, func));
++}
++
++/* Given the NEXT frame, examine the instructions at and around this
++   frame's resume address (aka PC) to see of they look like a signal
++   trampoline.  Return the address of the trampolines first
++   instruction, or zero if it isn't a signal trampoline.  */
++
++static const struct tramp_frame ppcfbsd_sigtramp = {
++  SIGTRAMP_FRAME,
++  4, /* insn size */
++  { /* insn */
++    { 0x38610018, -1 }, /* addi r3,r1,24 */
++    { 0x38000127, -1 }, /* li r0,295 */
++    { 0x44000002, -1 }, /* sc */
++    { 0x38000001, -1 }, /* li r0,1 */
++    { 0x44000002, -1 }, /* sc */
++    { TRAMP_SENTINEL_INSN, -1 }
++  },
++  ppcfbsd_sigtramp_cache_init
++};
++
++static void
++ppcfbsd_init_abi (struct gdbarch_info info,
++                  struct gdbarch *gdbarch)
++{
++  /* For NetBSD, this is an on again, off again thing.  Some systems
++     do use the broken struct convention, and some don't.  */
++  set_gdbarch_return_value (gdbarch, ppcfbsd_return_value);
++  set_solib_svr4_fetch_link_map_offsets (gdbarch,
++                                svr4_ilp32_fetch_link_map_offsets);
++  tramp_frame_prepend_unwinder (gdbarch, &ppcfbsd_sigtramp);
++}
++
++void
++_initialize_ppcfbsd_tdep (void)
++{
++  gdbarch_register_osabi (bfd_arch_rs6000, 0, GDB_OSABI_FREEBSD_ELF,
++			  ppcfbsd_init_abi);
++  gdbarch_register_osabi (bfd_arch_powerpc, 0, GDB_OSABI_FREEBSD_ELF,
++			  ppcfbsd_init_abi);
++
++  deprecated_add_core_fns (&ppcfbsd_core_fns);
++  deprecated_add_core_fns (&ppcfbsd_elfcore_fns);
++}
diff --git a/devel/gdb6/files/patch-gdb_ppcfbsd-tdep.h b/devel/gdb6/files/patch-gdb_ppcfbsd-tdep.h
new file mode 100644
index 000000000000..2c21f6966a4c
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_ppcfbsd-tdep.h
@@ -0,0 +1,36 @@
+
+$FreeBSD$
+
+--- /dev/null
++++ gdb/ppcfbsd-tdep.h
+@@ -0,0 +1,30 @@
++/* Common target dependent code for GDB on PowerPC systems running FreeBSD.
++   Copyright 2002 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
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   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., 59 Temple Place - Suite 330,
++   Boston, MA 02111-1307, USA.  */
++
++#ifndef PPCFBSD_TDEP_H
++#define PPCFBSD_TDEP_H
++
++void ppcfbsd_supply_reg (char *, int);
++void ppcfbsd_fill_reg (char *, int);
++
++void ppcfbsd_supply_fpreg (char *, int);
++void ppcfbsd_fill_fpreg (char *, int);
++
++#endif /* PPCFBSD_TDEP_H */
diff --git a/devel/gdb6/files/patch-gdb_rs6000-tdep.c b/devel/gdb6/files/patch-gdb_rs6000-tdep.c
new file mode 100644
index 000000000000..746ee7e31564
--- /dev/null
+++ b/devel/gdb6/files/patch-gdb_rs6000-tdep.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- gdb/rs6000-tdep.c
++++ gdb/rs6000-tdep.c
+@@ -3290,6 +3290,7 @@
+     case GDB_OSABI_NETBSD_ELF:
+     case GDB_OSABI_UNKNOWN:
+     case GDB_OSABI_LINUX:
++    case GDB_OSABI_FREEBSD_ELF:
+       set_gdbarch_unwind_pc (gdbarch, rs6000_unwind_pc);
+       frame_unwind_append_sniffer (gdbarch, rs6000_frame_sniffer);
+       set_gdbarch_unwind_dummy_id (gdbarch, rs6000_unwind_dummy_id);
diff --git a/devel/gdb6/files/patch-target.c b/devel/gdb6/files/patch-target.c
index 3bd25996c60a..31a2da3a9d1b 100644
--- a/devel/gdb6/files/patch-target.c
+++ b/devel/gdb6/files/patch-target.c
@@ -1,6 +1,16 @@
---- gdb/target.c	Mon Aug 26 12:18:33 2002
-+++ gdb/target.c	Sun Oct 13 10:51:32 2002
-@@ -1429,7 +1429,7 @@
+
+$FreeBSD$
+
+--- gdb/target.c.orig
++++ gdb/target.c
+@@ -1487,13 +1487,14 @@
+   struct target_ops **t;
+   struct target_ops *runable = NULL;
+   int count;
++  extern int kernel_debugging;
+ 
+   count = 0;
+ 
    for (t = target_structs; t < target_structs + target_struct_size;
         ++t)
      {