PERFORCE change 100938 for review

Olivier Houchard cognet at FreeBSD.org
Fri Jul 7 21:39:33 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=100938

Change 100938 by cognet at cognet on 2006/07/07 21:39:20

	Regen the gnu/contrib patches :
	- Hack a bit bfd to provide my own grok_prstatus function for arm, 
	which hardcodes the size and offset of the pr_reg field in the
	struct prstatus.
	- Include armfbsd-nat.c even if we're building a cross-debugger,
	just, in this case, include the definitions of the struct reg and
	the struct fpreg (hopefully those won't change much), and do not
	attempt to run ptrace.
	This seems to be enough to use a cross-gdb on amd64 to examine an
	arm core file.

Affected files ...

.. //depot/projects/arm/contrib-arm.diff#4 edit
.. //depot/projects/arm/gnu-arm.diff#12 edit

Differences ...

==== //depot/projects/arm/contrib-arm.diff#4 (text+ko) ====

@@ -1,10 +1,10 @@
 Index: contrib/binutils/ld/emulparams/armelf_fbsd.sh
 ===================================================================
-RCS file: /home/ncvs/src/contrib/binutils/ld/emulparams/armelf_fbsd.sh,v
+RCS file: /cognet/ncvs/src/contrib/binutils/ld/emulparams/armelf_fbsd.sh,v
 retrieving revision 1.1.1.1
 diff -u -p -r1.1.1.1 armelf_fbsd.sh
 --- contrib/binutils/ld/emulparams/armelf_fbsd.sh	22 Feb 2002 04:18:15 -0000	1.1.1.1
-+++ contrib/binutils/ld/emulparams/armelf_fbsd.sh	21 Oct 2004 21:30:03 -0000
++++ contrib/binutils/ld/emulparams/armelf_fbsd.sh	29 Aug 2005 12:39:39 -0000
 @@ -1,2 +1,7 @@
  . ${srcdir}/emulparams/armelf.sh
  . ${srcdir}/emulparams/elf_fbsd.sh
@@ -15,12 +15,12 @@
 +unset EMBEDDED
 Index: contrib/gcc/config/arm/arm.md
 ===================================================================
-RCS file: /home/ncvs/src/contrib/gcc/config/arm/arm.md,v
-retrieving revision 1.1.1.6
-diff -u -p -r1.1.1.6 arm.md
---- contrib/gcc/config/arm/arm.md	28 Jul 2004 03:11:35 -0000	1.1.1.6
-+++ contrib/gcc/config/arm/arm.md	6 Apr 2005 20:06:06 -0000
-@@ -8834,12 +8834,12 @@
+RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/arm.md,v
+retrieving revision 1.1.1.7
+diff -u -p -r1.1.1.7 arm.md
+--- contrib/gcc/config/arm/arm.md	3 Jun 2005 03:28:42 -0000	1.1.1.7
++++ contrib/gcc/config/arm/arm.md	29 Aug 2005 12:39:39 -0000
+@@ -8836,12 +8836,12 @@
  	ldm[2] = operands[4];
        }
      if (GET_CODE (XEXP (operands[2], 0)) != REG)
@@ -36,7 +36,7 @@
        {
  	arith[1] = ldm[1];
  	arith[2] = ldm[2];
-@@ -8869,7 +8869,7 @@
+@@ -8871,7 +8871,7 @@
  	else
  	  output_asm_insn (\"ldm%?ia\\t%0, {%1, %2}\", ldm);
        }
@@ -45,7 +45,7 @@
        {
  	ldm[0] = XEXP (operands[2], 0);
  	if (val1 < val2)
-@@ -8877,6 +8877,14 @@
+@@ -8879,6 +8879,14 @@
  	else
  	  output_asm_insn (\"ldm%?da\\t%0, {%1, %2}\", ldm);
        }
@@ -62,11 +62,11 @@
    }"
 Index: contrib/gcc/config/arm/freebsd.h
 ===================================================================
-RCS file: /home/ncvs/src/contrib/gcc/config/arm/freebsd.h,v
+RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/freebsd.h,v
 retrieving revision 1.1.1.3
 diff -u -p -r1.1.1.3 freebsd.h
 --- contrib/gcc/config/arm/freebsd.h	28 Jul 2004 03:11:35 -0000	1.1.1.3
-+++ contrib/gcc/config/arm/freebsd.h	19 Jan 2005 17:09:58 -0000
++++ contrib/gcc/config/arm/freebsd.h	29 Aug 2005 12:39:39 -0000
 @@ -22,7 +22,10 @@
  
  #undef  SUBTARGET_EXTRA_SPECS
@@ -165,34 +165,14 @@
 +    (void) sysarch (0, &s);						\
 +  }									\
 +while (0)
-Index: contrib/gcc/config/arm/t-xscale-elf
-===================================================================
-RCS file: /home/ncvs/src/contrib/gcc/config/arm/t-xscale-elf,v
-retrieving revision 1.1.1.2
-diff -u -p -r1.1.1.2 t-xscale-elf
---- contrib/gcc/config/arm/t-xscale-elf	28 Jul 2004 03:11:35 -0000	1.1.1.2
-+++ contrib/gcc/config/arm/t-xscale-elf	21 Oct 2004 21:30:03 -0000
-@@ -37,9 +37,9 @@ MULTILIB_EXCEPTIONS += *mhard-float/*mth
- 
- MULTILIB_REDUNDANT_DIRS = interwork/thumb=thumb
- 
--MULTILIB_OPTIONS    += mcpu=iwmmxt
--MULTILIB_DIRNAMES   += iwmmxt
--MULTILIB_REDUNDANT_DIRS += interwork/thumb/iwmmxt=thumb
-+#MULTILIB_OPTIONS    += mcpu=iwmmxt
-+#MULTILIB_DIRNAMES   += iwmmxt
-+#MULTILIB_REDUNDANT_DIRS += interwork/thumb/iwmmxt=thumb
- 
- EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
- 
 Index: contrib/gdb/gdb/armfbsd-nat.c
 ===================================================================
 RCS file: contrib/gdb/gdb/armfbsd-nat.c
 diff -N contrib/gdb/gdb/armfbsd-nat.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ contrib/gdb/gdb/armfbsd-nat.c	15 Aug 2004 00:57:52 -0000
-@@ -0,0 +1,464 @@
-+/* Native-dependent code for BSD Unix running on ARM's, for GDB.
++++ contrib/gdb/gdb/armfbsd-nat.c	7 Jul 2006 21:33:39 -0000
+@@ -0,0 +1,516 @@
++ /* Native-dependent code for BSD Unix running on ARM's, for GDB.
 +   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 1999, 2002
 +   Free Software Foundation, Inc.
 +
@@ -216,21 +196,48 @@
 +#include "defs.h"
 +
 +#ifndef FETCH_INFERIOR_REGISTERS
++#ifndef CROSS_DEBUGGER
 +#error Not FETCH_INFERIOR_REGISTERS 
++#endif
 +#endif /* !FETCH_INFERIOR_REGISTERS */
 +
 +#include "arm-tdep.h"
 +
 +#include <sys/types.h>
 +#include <sys/ptrace.h>
-+#include <machine/reg.h>
-+#include <machine/frame.h>
++#ifndef CROSS_DEBUGGER
++#include </sys/arm/include/reg.h>
++#include </sys/arm/include/frame.h>
++#endif
 +#include "inferior.h"
 +#include "regcache.h"
 +#include "gdbcore.h"
 +
 +extern int arm_apcs_32;
 +
++#ifdef CROSS_DEBUGGER
++struct reg {
++	unsigned int r[13];
++	unsigned int r_sp;
++	unsigned int r_lr;
++	unsigned int r_pc;
++	unsigned int r_cpsr;
++};
++
++typedef struct fp_extended_precision {
++	u_int32_t fp_exponent;
++	u_int32_t fp_mantissa_hi;
++	u_int32_t fp_mantissa_lo;
++} fp_extended_precision_t;
++
++typedef struct fp_extended_precision fp_reg_t;
++
++struct fpreg {
++	unsigned int fpr_fpsr;
++	fp_reg_t fpr[8];
++};
++#endif
++
 +void
 +supply_gregset (struct reg *gregset)
 +{
@@ -269,6 +276,7 @@
 +fetch_register (int regno)
 +{
 +  struct reg inferior_registers;
++#ifndef CROSS_DEBUGGER
 +  int ret;
 +
 +  ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
@@ -279,6 +287,7 @@
 +      warning ("unable to fetch general register");
 +      return;
 +    }
++#endif
 +
 +  switch (regno)
 +    {
@@ -313,9 +322,12 @@
 +fetch_regs (void)
 +{
 +  struct reg inferior_registers;
++#ifndef CROSS_DEBUGGER
 +  int ret;
++#endif
 +  int regno;
 +
++#ifndef CROSS_DEBUGGER
 +  ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
 +		(PTRACE_ARG3_TYPE) &inferior_registers, 0);
 +
@@ -324,6 +336,7 @@
 +      warning ("unable to fetch general registers");
 +      return;
 +    }
++#endif
 +
 +  supply_gregset (&inferior_registers);
 +}
@@ -332,6 +345,7 @@
 +fetch_fp_register (int regno)
 +{
 +  struct fpreg inferior_fp_registers;
++#ifndef CROSS_DEBUGGER
 +  int ret;
 +
 +  ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
@@ -342,6 +356,7 @@
 +      warning ("unable to fetch floating-point register");
 +      return;
 +    }
++#endif
 +
 +  switch (regno)
 +    {
@@ -361,9 +376,12 @@
 +fetch_fp_regs (void)
 +{
 +  struct fpreg inferior_fp_registers;
++#ifndef CROSS_DEBUGGER
 +  int ret;
++#endif
 +  int regno;
 +
++#ifndef CROSS_DEBUGGER
 +  ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
 +		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
 +
@@ -372,6 +390,7 @@
 +      warning ("unable to fetch general registers");
 +      return;
 +    }
++#endif
 +
 +  supply_fpregset (&inferior_fp_registers);
 +}
@@ -398,6 +417,7 @@
 +store_register (int regno)
 +{
 +  struct reg inferior_registers;
++#ifndef CROSS_DEBUGGER
 +  int ret;
 +
 +  ret = ptrace (PT_GETREGS, PIDGET (inferior_ptid),
@@ -408,6 +428,7 @@
 +      warning ("unable to fetch general registers");
 +      return;
 +    }
++#endif
 +
 +  switch (regno)
 +    {
@@ -455,11 +476,13 @@
 +      break;
 +    }
 +
++#ifndef CROSS_DEBUGGER
 +  ret = ptrace (PT_SETREGS, PIDGET (inferior_ptid),
 +		(PTRACE_ARG3_TYPE) &inferior_registers, 0);
 +
 +  if (ret < 0)
 +    warning ("unable to write register %d to inferior", regno);
++#endif
 +}
 +
 +static void
@@ -495,17 +518,20 @@
 +      inferior_registers.r_pc = pc_val | psr_val;
 +    }
 +
++#ifndef CROSS_DEBUGGER
 +  ret = ptrace (PT_SETREGS, PIDGET (inferior_ptid),
 +		(PTRACE_ARG3_TYPE) &inferior_registers, 0);
 +
 +  if (ret < 0)
 +    warning ("unable to store general registers");
++#endif
 +}
 +
 +static void
 +store_fp_register (int regno)
 +{
 +  struct fpreg inferior_fp_registers;
++#ifndef CROSS_DEBUGGER
 +  int ret;
 +
 +  ret = ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
@@ -516,6 +542,7 @@
 +      warning ("unable to fetch floating-point registers");
 +      return;
 +    }
++#endif
 +
 +  switch (regno)
 +    {
@@ -530,11 +557,13 @@
 +      break;
 +    }
 +
++#ifndef CROSS_DEBUGGER
 +  ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
 +		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
 +
 +  if (ret < 0)
 +    warning ("unable to write register %d to inferior", regno);
++#endif
 +}
 +
 +static void
@@ -551,11 +580,13 @@
 +
 +  regcache_collect (ARM_FPS_REGNUM, (char *) &inferior_fp_registers.fpr_fpsr);
 +
++#ifndef CROSS_DEBUGGER
 +  ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
 +		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);
 +
 +  if (ret < 0)
 +    warning ("unable to store floating-point registers");
++#endif
 +}
 +
 +void
@@ -575,6 +606,7 @@
 +    }
 +}
 +
++
 +struct md_core
 +{
 +  struct reg intreg;
@@ -661,7 +693,7 @@
 RCS file: contrib/gdb/gdb/armfbsd-tdep.c
 diff -N contrib/gdb/gdb/armfbsd-tdep.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ contrib/gdb/gdb/armfbsd-tdep.c	27 Feb 2005 20:44:28 -0000
++++ contrib/gdb/gdb/armfbsd-tdep.c	29 Aug 2005 12:39:39 -0000
 @@ -0,0 +1,67 @@
 +/* Target-specific functions for ARM running under NetBSD.
 +   Copyright 2002, 2003 Free Software Foundation, Inc.
@@ -730,33 +762,33 @@
 +  gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_FREEBSD_ELF,
 +                          arm_freebsd_elf_init_abi);
 +}
+Index: contrib/gdb/gdb/config/arm/fbsd.mh
+===================================================================
+RCS file: contrib/gdb/gdb/config/arm/fbsd.mh
+diff -N contrib/gdb/gdb/config/arm/fbsd.mh
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ contrib/gdb/gdb/config/arm/fbsd.mh	7 Jul 2006 21:29:38 -0000
+@@ -0,0 +1,4 @@
++# Host ARM running FreeBSD
++NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o armfbsd-nat.o
++XM_FILE=xm-fbsd.h
++NAT_FILE=nm-fbsd.h
 Index: contrib/gdb/gdb/config/arm/fbsd.mt
 ===================================================================
 RCS file: contrib/gdb/gdb/config/arm/fbsd.mt
 diff -N contrib/gdb/gdb/config/arm/fbsd.mt
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ contrib/gdb/gdb/config/arm/fbsd.mt	15 Aug 2004 00:33:53 -0000
++++ contrib/gdb/gdb/config/arm/fbsd.mt	29 Aug 2005 12:39:39 -0000
 @@ -0,0 +1,3 @@
 +# Target: ARM running FreeBSD
 +TDEPFILES= arm-tdep.o armfbsd-tdep.o fbsd-tdep.o solib.o solib-svr4.o
 +TM_FILE=tm-fbsd.h
-Index: contrib/gdb/gdb/config/arm/fbsdelf.h
-===================================================================
-RCS file: contrib/gdb/gdb/config/arm/fbsdelf.h
-diff -N contrib/gdb/gdb/config/arm/fbsdelf.h
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ contrib/gdb/gdb/config/arm/fbsdelf.h	15 Aug 2004 00:03:06 -0000
-@@ -0,0 +1,4 @@
-+# Host ARM running NetBSD
-+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o armfbsd-nat.o
-+XM_FILE=xm-fbsd.h
-+NAT_FILE=nm-fbsd.h
 Index: contrib/gdb/gdb/config/arm/nm-fbsd.h
 ===================================================================
 RCS file: contrib/gdb/gdb/config/arm/nm-fbsd.h
 diff -N contrib/gdb/gdb/config/arm/nm-fbsd.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ contrib/gdb/gdb/config/arm/nm-fbsd.h	15 Aug 2004 00:11:57 -0000
++++ contrib/gdb/gdb/config/arm/nm-fbsd.h	29 Aug 2005 12:39:39 -0000
 @@ -0,0 +1,30 @@
 +/* Native-dependent definitions for ARM running NetBSD, for GDB.
 +   Copyright 1986, 1987, 1989, 1992, 1994, 1999 Free Software Foundation, Inc.
@@ -793,7 +825,7 @@
 RCS file: contrib/gdb/gdb/config/arm/tm-fbsd.h
 diff -N contrib/gdb/gdb/config/arm/tm-fbsd.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ contrib/gdb/gdb/config/arm/tm-fbsd.h	15 Aug 2004 00:06:04 -0000
++++ contrib/gdb/gdb/config/arm/tm-fbsd.h	29 Aug 2005 12:39:39 -0000
 @@ -0,0 +1,26 @@
 +/* Macro definitions for ARM running under NetBSD.
 +   Copyright 2003 Free Software Foundation, Inc.
@@ -826,7 +858,7 @@
 RCS file: contrib/gdb/gdb/config/arm/xm-fbsd.h
 diff -N contrib/gdb/gdb/config/arm/xm-fbsd.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ contrib/gdb/gdb/config/arm/xm-fbsd.h	15 Aug 2004 00:08:17 -0000
++++ contrib/gdb/gdb/config/arm/xm-fbsd.h	29 Aug 2005 12:39:39 -0000
 @@ -0,0 +1,20 @@
 +/* Parameters for execution on an ARM running NetBSD, for GDB.
 +   Copyright 1994 Free Software Foundation, Inc.

==== //depot/projects/arm/gnu-arm.diff#12 (text+ko) ====

@@ -4,7 +4,7 @@
 retrieving revision 1.55
 diff -u -p -r1.55 Makefile
 --- gnu/lib/libgcc/Makefile	18 Mar 2006 21:37:03 -0000	1.55
-+++ gnu/lib/libgcc/Makefile	19 Mar 2006 21:13:20 -0000
++++ gnu/lib/libgcc/Makefile	6 Jul 2006 23:54:06 -0000
 @@ -98,8 +98,11 @@ LIB2FUNCS_EXTRA = qrnnd.asm
  #	from config/arm/t-strongarm-elf
  CFLAGS+=	-Dinhibit_libc -fno-inline
@@ -34,7 +34,7 @@
 retrieving revision 1.56
 diff -u -p -r1.56 Makefile
 --- gnu/lib/libstdc++/Makefile	22 Jul 2005 17:18:58 -0000	1.56
-+++ gnu/lib/libstdc++/Makefile	29 Aug 2005 12:39:27 -0000
++++ gnu/lib/libstdc++/Makefile	6 Jul 2006 23:54:06 -0000
 @@ -174,6 +174,10 @@ TARGETHDRSNAME_c_locale.h= c++locale.h
  TARGETHDRSNAME_new_allocator_base.h= c++allocator.h
  TARGETHDRSDIR=	${CXXINCLUDEDIR}/bits
@@ -52,7 +52,7 @@
 retrieving revision 1.88
 diff -u -p -r1.88 Makefile
 --- gnu/usr.bin/Makefile	17 Mar 2006 18:54:22 -0000	1.88
-+++ gnu/usr.bin/Makefile	18 Mar 2006 01:46:32 -0000
++++ gnu/usr.bin/Makefile	6 Jul 2006 23:54:06 -0000
 @@ -24,7 +24,7 @@ SUBDIR= bc \
  	sort \
  	${_texinfo}
@@ -67,7 +67,7 @@
 RCS file: gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h
 diff -N gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h	29 Aug 2005 12:39:27 -0000
++++ gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h	6 Jul 2006 23:54:06 -0000
 @@ -0,0 +1,3 @@
 +/* $FreeBSD$ */
 +
@@ -77,7 +77,7 @@
 RCS file: gnu/usr.bin/binutils/ld/Makefile.arm
 diff -N gnu/usr.bin/binutils/ld/Makefile.arm
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/binutils/ld/Makefile.arm	29 Aug 2005 12:39:27 -0000
++++ gnu/usr.bin/binutils/ld/Makefile.arm	6 Jul 2006 23:54:06 -0000
 @@ -0,0 +1,12 @@
 +# $FreeBSD$
 +
@@ -96,8 +96,8 @@
 RCS file: gnu/usr.bin/binutils/libbfd/Makefile.arm
 diff -N gnu/usr.bin/binutils/libbfd/Makefile.arm
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/binutils/libbfd/Makefile.arm	20 May 2006 22:58:30 -0000
-@@ -0,0 +1,24 @@
++++ gnu/usr.bin/binutils/libbfd/Makefile.arm	7 Jul 2006 21:11:14 -0000
+@@ -0,0 +1,43 @@
 +# $FreeBSD$
 +
 +DEFAULT_VECTOR=	bfd_elf32_littlearm_vec
@@ -107,7 +107,6 @@
 +	elf32.c		\
 +	elf32-gen.c	\
 +	elflink.c	\
-+	elfarm-nabi.c	\
 +	elfarm-oabi.c	\
 +	elf32-arm-fbsd.c \
 +	elf32-target.h
@@ -121,13 +120,33 @@
 +CLEANFILES+=	elf32-arm-fbsd.c
 +
 +elf32-arm-fbsd.c: elfarm-nabi.c
-+	cat ${.ALLSRC} | sed s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g >${.TARGET}
++	cat ${.ALLSRC} | sed -e s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g \
++	-e "s/\(.*#define.*\)elf32_arm_nabi_grok_prstatus/\1elf32_fbsd_arm_grok_prstatus/" -e s/"#include.*elf32-arm.h.*//" >${.TARGET}; \
++	echo '\
++	static bfd_boolean elf32_fbsd_arm_grok_prstatus(bfd *abfd, Elf_Internal_Note *note) \
++	{ \
++	size_t raw_size; \
++	int offset; \
++	if (note->descsz != 96) \
++		return (FALSE); \
++	offset = 28; \
++	raw_size = 68; \
++	if (elf_tdata(abfd)->core_signal == 0) \
++		elf_tdata (abfd)->core_signal = ((int *)(note->descdata))[5]; \
++	elf_tdata (abfd)->core_pid = ((int *)(note->descdata))[6]; \
++	/* Make a ".reg/999" section.  */ \
++  	return _bfd_elfcore_make_pseudosection (abfd, ".reg", \
++					  raw_size, note->descpos + offset); \
++}' >> ${.TARGET}; \
++	echo '#include "elf32-arm.h"' >> ${.TARGET}
++
++	
 Index: gnu/usr.bin/binutils/libopcodes/Makefile.arm
 ===================================================================
 RCS file: gnu/usr.bin/binutils/libopcodes/Makefile.arm
 diff -N gnu/usr.bin/binutils/libopcodes/Makefile.arm
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/binutils/libopcodes/Makefile.arm	29 Aug 2005 12:39:27 -0000
++++ gnu/usr.bin/binutils/libopcodes/Makefile.arm	6 Jul 2006 23:54:06 -0000
 @@ -0,0 +1,4 @@
 +# $FreeBSD$
 +
@@ -139,7 +158,7 @@
 retrieving revision 1.82
 diff -u -p -r1.82 Makefile
 --- gnu/usr.bin/cc/cc_tools/Makefile	17 Mar 2006 18:54:23 -0000	1.82
-+++ gnu/usr.bin/cc/cc_tools/Makefile	19 Mar 2006 21:13:24 -0000
++++ gnu/usr.bin/cc/cc_tools/Makefile	6 Jul 2006 23:54:06 -0000
 @@ -216,7 +216,9 @@ CLEANFILES+=	fini
  .if ${TARGET_ARCH} == "amd64"
  TARGET_INC=	i386/biarch64.h
@@ -168,7 +187,7 @@
 retrieving revision 1.18
 diff -u -p -r1.18 auto-host.h
 --- gnu/usr.bin/cc/cc_tools/auto-host.h	28 Jul 2004 05:27:20 -0000	1.18
-+++ gnu/usr.bin/cc/cc_tools/auto-host.h	29 Aug 2005 12:39:27 -0000
++++ gnu/usr.bin/cc/cc_tools/auto-host.h	6 Jul 2006 23:54:06 -0000
 @@ -523,7 +523,7 @@
  /* The number of bytes in type int */
  #define SIZEOF_INT 4
@@ -183,14 +202,12 @@
 RCS file: gnu/usr.bin/gdb/arch/arm/Makefile
 diff -N gnu/usr.bin/gdb/arch/arm/Makefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/gdb/arch/arm/Makefile	29 Aug 2005 12:39:27 -0000
-@@ -0,0 +1,16 @@
++++ gnu/usr.bin/gdb/arch/arm/Makefile	7 Jul 2006 00:02:26 -0000
+@@ -0,0 +1,14 @@
 +# $FreeBSD$
 +
 +GENSRCS+= xm.h
-+.if !defined(GDB_CROSS_DEBUGGER)
 +LIBSRCS+= armfbsd-nat.c
-+.endif
 +LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c
 +
 +nm.h:
@@ -206,7 +223,7 @@
 RCS file: gnu/usr.bin/gdb/arch/arm/config.h
 diff -N gnu/usr.bin/gdb/arch/arm/config.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/gdb/arch/arm/config.h	29 Aug 2005 12:39:27 -0000
++++ gnu/usr.bin/gdb/arch/arm/config.h	6 Jul 2006 23:55:39 -0000
 @@ -0,0 +1,553 @@
 +/* $FreeBSD$ */
 +
@@ -378,7 +395,7 @@
 +/* #undef HAVE_LIBUNWIND */
 +
 +/* hostfile */
-+#define GDB_XM_FILE config/arm/xm-nbsd.h
++#define GDB_XM_FILE config/arm/xm-fbsd.h
 +
 +/* targetfile */
 +#define GDB_TM_FILE config/arm/tm-fbsd.h
@@ -766,7 +783,7 @@
 RCS file: gnu/usr.bin/gdb/arch/arm/init.c
 diff -N gnu/usr.bin/gdb/arch/arm/init.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/gdb/arch/arm/init.c	29 Aug 2005 12:39:27 -0000
++++ gnu/usr.bin/gdb/arch/arm/init.c	7 Jul 2006 00:02:16 -0000
 @@ -0,0 +1,226 @@
 +/* $FreeBSD$ */
 +
@@ -787,8 +804,8 @@
 +extern initialize_file_ftype _initialize_kernel_u_addr;
 +extern initialize_file_ftype _initialize_infptrace;
 +extern initialize_file_ftype _initialize_inftarg;
++#endif
 +extern initialize_file_ftype _initialize_arm_fbsdnat;
-+#endif
 +extern initialize_file_ftype _initialize_remote;
 +extern initialize_file_ftype _initialize_dcache;
 +extern initialize_file_ftype _initialize_sr_support;
@@ -898,8 +915,8 @@
 +  _initialize_kernel_u_addr ();
 +  _initialize_infptrace ();
 +  _initialize_inftarg ();
++#endif
 +  _initialize_arm_fbsdnat ();
-+#endif
 +  _initialize_remote ();
 +  _initialize_dcache ();
 +  _initialize_sr_support ();
@@ -999,7 +1016,7 @@
 RCS file: gnu/usr.bin/gdb/kgdb/trgt_arm.c
 diff -N gnu/usr.bin/gdb/kgdb/trgt_arm.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ gnu/usr.bin/gdb/kgdb/trgt_arm.c	13 Jun 2006 16:26:07 -0000
++++ gnu/usr.bin/gdb/kgdb/trgt_arm.c	6 Jul 2006 23:54:06 -0000
 @@ -0,0 +1,224 @@
 +/*
 + * Copyright (c) 2004 Marcel Moolenaar


More information about the p4-projects mailing list