This commit was manufactured by cvs2svn to create branch 'gdb_5_3-branch'.gdb_5_3-2002-09-04-branchpoint

Sprout from cagney_sysregs-20020825-branch 2002-08-25 19:39:46 UTC nobody 'This commit was manufactured by cvs2svn to create branch'
Cherrypick from master 2002-09-03 22:29:14 UTC Keith Seitz <keiths@redhat.com> '        * lib/gdb.exp (gdb_compile_pthreads): Fix "build_bin" typo.':
    bfd/ChangeLog
    bfd/Makefile.am
    bfd/Makefile.in
    bfd/aoutx.h
    bfd/archures.c
    bfd/bfd-in.h
    bfd/bfd-in2.h
    bfd/coff-tic4x.c
    bfd/coff64-rs6000.c
    bfd/coffcode.h
    bfd/coffswap.h
    bfd/config.bfd
    bfd/configure
    bfd/configure.in
    bfd/cpu-avr.c
    bfd/cpu-pj.c
    bfd/cpu-powerpc.c
    bfd/cpu-rs6000.c
    bfd/cpu-tic4x.c
    bfd/cpu-v850.c
    bfd/cpu-z8k.c
    bfd/doc/ChangeLog
    bfd/doc/chew.c
    bfd/ecoff.c
    bfd/elf32-arm.h
    bfd/elf32-v850.c
    bfd/libbfd.h
    bfd/mipsbsd.c
    bfd/pdp11.c
    bfd/reloc.c
    bfd/targets.c
    bfd/ticoff.h
    bfd/version.h
    gdb/ChangeLog
    gdb/Makefile.in
    gdb/ada-exp.y
    gdb/alphanbsd-tdep.c
    gdb/avr-tdep.c
    gdb/ax-gdb.c
    gdb/breakpoint.c
    gdb/c-exp.y
    gdb/c-valprint.c
    gdb/cli/cli-script.c
    gdb/cli/cli-script.h
    gdb/config/i386/nbsd.mt
    gdb/config/i386/nbsdaout.mh
    gdb/config/i386/nbsdelf.mh
    gdb/config/i386/tm-nbsd.h
    gdb/config/mips/nbsd.mt
    gdb/configure.tgt
    gdb/cp-abi.c
    gdb/doc/ChangeLog
    gdb/doc/gdb.texinfo
    gdb/dwarf2read.c
    gdb/f-exp.y
    gdb/gdb-events.c
    gdb/gdb-events.h
    gdb/gdb-events.sh
    gdb/gdbserver/ChangeLog
    gdb/gdbserver/linux-low.c
    gdb/gdbserver/remote-utils.c
    gdb/gdbserver/server.c
    gdb/gdbserver/target.h
    gdb/gnu-nat.c
    gdb/hpux-thread.c
    gdb/i386-linux-nat.c
    gdb/i386-tdep.c
    gdb/i386-tdep.h
    gdb/i386bsd-tdep.c
    gdb/i386nbsd-tdep.c
    gdb/i387-tdep.c
    gdb/inferior.h
    gdb/inflow.c
    gdb/inftarg.c
    gdb/jv-exp.y
    gdb/jv-valprint.c
    gdb/lin-lwp.c
    gdb/m2-exp.y
    gdb/m3-nat.c
    gdb/mipsnbsd-tdep.c
    gdb/nbsd-tdep.c
    gdb/nbsd-tdep.h
    gdb/osabi.c
    gdb/p-exp.y
    gdb/p-lang.c
    gdb/ppcnbsd-tdep.c
    gdb/proc-api.c
    gdb/procfs.c
    gdb/regcache.c
    gdb/regcache.h
    gdb/rs6000-tdep.c
    gdb/shnbsd-tdep.c
    gdb/signals/signals.c
    gdb/sol-thread.c
    gdb/sparcnbsd-tdep.c
    gdb/stack.c
    gdb/symtab.c
    gdb/target.c
    gdb/target.h
    gdb/testsuite/ChangeLog
    gdb/testsuite/gdb.base/commands.exp
    gdb/testsuite/gdb.mi/ChangeLog
    gdb/testsuite/gdb.mi/gdb680.exp
    gdb/testsuite/gdb.threads/killed.c
    gdb/testsuite/gdb.threads/killed.exp
    gdb/testsuite/gdb.threads/pthreads.exp
    gdb/testsuite/lib/gdb.exp
    gdb/testsuite/lib/mi-support.exp
    gdb/tui/ChangeLog
    gdb/tui/tui-hooks.c
    gdb/tui/tui-out.c
    gdb/tui/tui.c
    gdb/tui/tui.h
    gdb/tui/tuiData.c
    gdb/tui/tuiData.h
    gdb/tui/tuiDisassem.c
    gdb/tui/tuiDisassem.h
    gdb/tui/tuiIO.c
    gdb/tui/tuiIO.h
    gdb/tui/tuiSource.c
    gdb/tui/tuiSourceWin.c
    gdb/tui/tuiSourceWin.h
    gdb/tui/tuiStack.c
    gdb/tui/tuiWin.c
    gdb/version.in
    gdb/win32-nat.c
    gdb/wince.c
    gdb/x86-64-linux-nat.c
    gdb/x86-64-linux-tdep.c
    include/ChangeLog
    include/coff/internal.h
    include/coff/ti.h
    include/coff/tic4x.h
    include/dis-asm.h
    include/elf/ChangeLog
    include/elf/v850.h
    include/opcode/tic4x.h
    opcodes/ChangeLog
    opcodes/Makefile.am
    opcodes/Makefile.in
    opcodes/arc-opc.c
    opcodes/configure
    opcodes/configure.in
    opcodes/disassemble.c
    opcodes/mips-dis.c
    opcodes/tic4x-dis.c
    opcodes/v850-dis.c
    opcodes/v850-opc.c
    sim/common/ChangeLog
    sim/common/Make-common.in
    sim/igen/ChangeLog
    sim/igen/gen-support.c
    sim/v850/ChangeLog
    sim/v850/Makefile.in
    sim/v850/sim-main.h
    sim/v850/simops.c
Delete:
    gdb/config/i386/nbsdaout.mt
    gdb/config/i386/nbsdelf.mt
    gdb/config/i386/tm-nbsdaout.h

1 files changed, 7 insertions, 4 deletions

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 0d96e1f..4ef683c 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -803,7 +803,8 @@ static void dwarf2_attach_fields_to_type (struct field_info *,
 					  struct type *, struct objfile *);
 
 static void dwarf2_add_member_fn (struct field_info *,
-				  struct die_info *, struct objfile *objfile,
+				  struct die_info *, struct type *,
+				  struct objfile *objfile,
 				  const struct comp_unit_head *);
 
 static void dwarf2_attach_fn_fields_to_type (struct field_info *,
@@ -2259,7 +2260,7 @@ dwarf2_attach_fields_to_type (struct field_info *fip, struct type *type,
 
 static void
 dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
-		      struct objfile *objfile,
+		      struct type *type, struct objfile *objfile,
 		      const struct comp_unit_head *cu_header)
 {
   struct attribute *attr;
@@ -2327,7 +2328,9 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
       struct type *return_type = TYPE_TARGET_TYPE (die->type);
       int nparams = TYPE_NFIELDS (die->type);
 
-      smash_to_method_type (fnp->type, die->type,
+      /* TYPE is the domain of this method, and DIE->TYPE is the type
+	   of the method itself (TYPE_CODE_METHOD).  */
+      smash_to_method_type (fnp->type, type,
 			    TYPE_TARGET_TYPE (die->type),
 			    TYPE_FIELDS (die->type),
 			    TYPE_NFIELDS (die->type),
@@ -2516,7 +2519,7 @@ read_structure_scope (struct die_info *die, struct objfile *objfile,
 	    {
 	      /* C++ member function. */
 	      process_die (child_die, objfile, cu_header);
-	      dwarf2_add_member_fn (&fi, child_die, objfile, cu_header);
+	      dwarf2_add_member_fn (&fi, child_die, type, objfile, cu_header);
 	    }
 	  else if (child_die->tag == DW_TAG_inheritance)
 	    {