2002-10-21 David Carlton <carlton@math.stanford.edu>

	* buildsym.c (add_symbol_to_list): Expand comment.
	* objc-lang.c (find_methods): Use BLOCK_START, BLOCK_END.
	* Makefile.in (x86-64-tdep.o): Depend on block_h.
	* x86-64-tdep.c (x86_64_skip_prologue): Use BLOCK_END and
	SYMBOL_BLOCK_VALUE.

6 files changed, 17 insertions, 8 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 60aad17647e..2dc13c24d73 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-21  David Carlton  <carlton@math.stanford.edu>
+
+	* buildsym.c (add_symbol_to_list): Expand comment.
+	* objc-lang.c (find_methods): Use BLOCK_START, BLOCK_END.
+	* Makefile.in (x86-64-tdep.o): Depend on block_h.
+	* x86-64-tdep.c (x86_64_skip_prologue): Use BLOCK_END and
+	SYMBOL_BLOCK_VALUE.
+
 2002-10-18  David Carlton  <carlton@math.stanford.edu>
 
 	* Makefile.in (block_h): New variable.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 248f38f6453..3bf4396c696 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2295,7 +2295,7 @@ x86-64-linux-tdep.o: x86-64-linux-tdep.c $(defs_h) $(inferior_h) \
 	$(gdbcore_h) $(regcache_h) $(x86_64_tdep_h) $(dwarf2cfi_h)
 x86-64-tdep.o: x86-64-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \
 	$(gdbcmd_h) $(arch_utils_h) $(regcache_h) $(symfile_h) $(objfiles_h) \
-	$(x86_64_tdep_h) $(dwarf2cfi_h) $(gdb_assert_h)
+	$(x86_64_tdep_h) $(dwarf2cfi_h) $(gdb_assert_h) $(block_h)
 xcoffread.o: xcoffread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(gdb_stat_h) \
 	$(coff_internal_h) $(libcoff_h) $(coff_xcoff_h) $(libxcoff_h) \
 	$(coff_rs6000_h) $(symtab_h) $(gdbtypes_h) $(symfile_h) \
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 1371f3799cf..a912108f91c 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -123,8 +123,9 @@ add_free_pendings (struct pending *list)
 }
       
 /* Add a symbol to one of the lists of symbols.  While we're at it, if
-   we're in the C++ case, check to see if it references an anonymous
-   namespace; if so, add an appropriate using directive.  */
+   we're in the C++ case and don't have full namespace debugging info,
+   check to see if it references an anonymous namespace; if so, add an
+   appropriate using directive.  */
 
 void
 add_symbol_to_list (struct symbol *symbol, struct pending **listhead)
@@ -254,7 +255,6 @@ add_using_directive (const char *name, unsigned int outer_length,
 				     using_list);
 }
 
-
 /* At end of reading syms, or in case of quit, really free as many
    `struct pending's as we can easily find. */
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 1de9e8094b8..c5ddc535465 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -893,7 +893,7 @@ static char *dwarf2_linkage_name (struct die_info *);
 
 static char *dwarf2_name (struct die_info *);
 
-static struct die_info * dwarf2_extension (struct die_info *die);
+static struct die_info *dwarf2_extension (struct die_info *die);
 
 static char *dwarf_tag_name (unsigned int);
 
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 6f379484ac2..17bc66f519d 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -1321,8 +1321,8 @@ find_methods (struct symtab *symtab, char type,
 	continue;
 
       if (symtab)
-	if ((SYMBOL_VALUE_ADDRESS (msymbol) <  block->startaddr) ||
-	    (SYMBOL_VALUE_ADDRESS (msymbol) >= block->endaddr))
+	if ((SYMBOL_VALUE_ADDRESS (msymbol) <  BLOCK_START (block)) ||
+	    (SYMBOL_VALUE_ADDRESS (msymbol) >= BLOCK_END (block)))
 	  /* Not in the specified symtab.  */
 	  continue;
 
diff --git a/gdb/x86-64-tdep.c b/gdb/x86-64-tdep.c
index dbc5611cb0d..0e5ba5db9d9 100644
--- a/gdb/x86-64-tdep.c
+++ b/gdb/x86-64-tdep.c
@@ -32,6 +32,7 @@
 #include "x86-64-tdep.h"
 #include "dwarf2cfi.h"
 #include "gdb_assert.h"
+#include "block.h"
 
 /* Register numbers of various important registers.  */
 #define RAX_REGNUM 0
@@ -889,7 +890,7 @@ x86_64_skip_prologue (CORE_ADDR pc)
   if (!v_function || !v_function->ginfo.value.block || !v_sal.symtab)
     return pc;
 
-  endaddr = v_function->ginfo.value.block->endaddr;
+  endaddr = BLOCK_END (SYMBOL_BLOCK_VALUE (v_function));
 
   for (i = 0; i < v_sal.symtab->linetable->nitems; i++)
     if (v_sal.symtab->linetable->item[i].pc >= pc