* tm-mips.h: Removed BLOCK_ADDRESS_ABSOLUTE, now that

	mips-tfile has been hacked to act more "traditionally."
	* dbxread.c:  Fixed typo in comment.

3 files changed, 18 insertions, 9 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e554647..6f0bb08 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 13 14:57:11 1992  Per Bothner  (bothner at cygnus.com)
+
+	* tm-mips.h:  Removed BLOCK_ADDRESS_ABSOLUTE, now that
+	mips-tfile has been hacked to act more "traditionally."
+	* dbxread.c:  Fixed typo in comment.
+
 Sun Jan 12 13:08:36 1992  Per Bothner  (bothner at cygnus.com)
 
 	* mips-tdep.c (mips_skip_prologue):  Add some number of
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 0124667..8bb9365 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -117,6 +117,11 @@ static void dbx_psymtab_to_symtab ();
 #define GCC_COMPILED_FLAG_SYMBOL "gcc_compiled."
 #endif
 
+/* Macro for name of symbol to indicate a file compiled with gcc2. */
+#ifndef GCC2_COMPILED_FLAG_SYMBOL
+#define GCC2_COMPILED_FLAG_SYMBOL "gcc2_compiled."
+#endif
+
 /* Define this as 1 if a pcc declaration of a char or short argument
    gives the correct address.  Otherwise assume pcc gives the
    address of the corresponding int, which is not the same on a
@@ -1211,8 +1216,8 @@ read_ofile_symtab (objfile, stringtab, stringtab_size, sym_offset,
 
       processing_gcc_compilation =
 	(bufp->n_type == N_TEXT
-	 && !strcmp (namestring, GCC_COMPILED_FLAG_SYMBOL));
-      /* FIXME!!!  Check for gcc2_compiled... */
+	 && (strcmp (namestring, GCC_COMPILED_FLAG_SYMBOL) == 0
+	     || strcmp(namestring, GCC2_COMPILED_FLAG_SYMBOL) == 0));
     }
   else
     {
@@ -1265,7 +1270,8 @@ read_ofile_symtab (objfile, stringtab, stringtab_size, sym_offset,
       /* We skip checking for a new .o or -l file; that should never
          happen in this routine. */
       else if (type == N_TEXT
-	       && !strcmp (namestring, GCC_COMPILED_FLAG_SYMBOL))
+	       && (strcmp (namestring, GCC_COMPILED_FLAG_SYMBOL) == 0
+		   || strcmp (namestring, GCC2_COMPILED_FLAG_SYMBOL) == 0))
 	/* I don't think this code will ever be executed, because
 	   the GCC_COMPILED_FLAG_SYMBOL usually is right before
 	   the N_SO symbol which starts this source file.
@@ -1322,7 +1328,7 @@ process_one_symbol (type, desc, valu, name)
      char *name;
 {
 #ifndef SUN_FIXED_LBRAC_BUG
-  /* This records the last pc address we've seen.  We depend on their being
+  /* This records the last pc address we've seen.  We depend on there being
      an SLINE or FUN or SO before the first LBRAC, since the variable does
      not get reset in between reads of different symbol files.  */
   static CORE_ADDR last_pc_address;
@@ -1431,7 +1437,8 @@ process_one_symbol (type, desc, valu, name)
       /* Some compilers put the variable decls inside of an
          LBRAC/RBRAC block.  This macro should be nonzero if this
 	 is true.  DESC is N_DESC from the N_RBRAC symbol.
-	 GCC_P is true if we've detected the GCC_COMPILED_SYMBOL.  */
+	 GCC_P is true if we've detected the GCC_COMPILED_SYMBOL
+	 or the GCC2_COMPILED_SYMBOL.  */
 #if !defined (VARIABLES_INSIDE_BLOCK)
 #define VARIABLES_INSIDE_BLOCK(desc, gcc_p) 0
 #endif
diff --git a/gdb/tm-mips.h b/gdb/tm-mips.h
index af451ef..dc5af0d 100644
--- a/gdb/tm-mips.h
+++ b/gdb/tm-mips.h
@@ -31,10 +31,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*#define NAMES_HAVE_UNDERSCORE*/
 
-/* Address of blocks in N_LBRAC and N_RBRAC symbols are absolute addresses,
-   not relative to start of source address.  */
-#define BLOCK_ADDRESS_ABSOLUTE
-
 /* Debugger information will be in mips' format */
 
 #define READ_MIPS_FORMAT