* os9kread.c (os9k_process_one_symbol): Rename

	VARIABLES_INSIDE_BLOCK to OS9K_VARIABLES_INSIDE_BLOCK.
	* symfile.c (symbol_file_command): Check for (CORE_ADDR)-1, not
	(CORE_ADDR)0, from target_link, since that is what it uses.
	Process name at end, not during parsing (like we did before Kung's
	change), so that -readnow and -mapped can appear anywhere.
	Make text_relocation a local variable.
	* config/i386/i386os9k.mt: Fix comment.
	* Makefile.in (ALLDEPFILES): Add remote-os9k.c.
	* os9kread.c: Put "comments" after #endif inside /* */.
	* stabsread.h: Add os9k_stabs variable.
	* stabsread.c (start_stabs), os9kread.c (os9k_process_one_symbol):
	Set it.
	* stabsread.c (define_symbol): If os9k_stabs, put a 'V' symbol
	descriptor in global_symbols not local_symbols.
	(read_type): If os9k_stabs, accept 'c', 'i', and 'b' type
	descriptors.
	(read_type): If os9k_stabs, accept function parameters after 'f'
	type descriptor.
	(read_array_type): If os9k_stabs, don't expect index type and
	expect lower and upper to be separated by ',' not ';'.
	(read_enum_type): If os9k_stabs, read a number before the first
	enumeration constant.
	(os9k_init_type_vector): New function.
	(dbx_lookup_type): Call it when starting new type vector.
	* config/i386/tm-i386os9k.h: Define BELIEVE_PCC_PROMOTION.
	* (os9k_process_one_symbol): Call define_symbol not os9k_define_symbol.
	* os9kstab.c: Removed.
	* Makefile.in: Update accordingly.
	* objfiles.c (objfile_relocate_data): Removed.
	* remote-os9k.c (rombug_wait): Call objfile_relocate
	not objfile_relocate_data.
	* objfiles.h, objfiles.c: Remove find_pc_objfile.
	* remote-os9k.c (rombug_wait): Call find_pc_section not
	find_pc_objfile.
	* main.c (quit_command): Check inferior_pid; revert Kung change.
	* remote-os9k.c (rombug_create_inferior): Set inferior_pid.

1 files changed, 12 insertions, 13 deletions

diff --git a/gdb/os9kread.c b/gdb/os9kread.c
index 5857c25..7a39292 100644
--- a/gdb/os9kread.c
+++ b/gdb/os9kread.c
@@ -63,6 +63,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "language.h"		/* Needed inside partial-stab.h */
 #include "complaints.h"
 #include "os9k.h"
+#include "stabsread.h"
 
 #if !defined (SEEK_SET)
 #define SEEK_SET 0
@@ -130,9 +131,6 @@ static struct complaint lbrac_unmatched_complaint =
 static struct complaint lbrac_mismatch_complaint =
   {"IBE/IDE symbol mismatch at symtab pos %d", 0, 0};
 
-extern struct symbol *
-os9k_define_symbol PARAMS ((CORE_ADDR, char *, int, int, struct objfile *));
-
 
 /* Local function prototypes */
 static void
@@ -1347,7 +1345,7 @@ os9k_read_ofile_symtab (pst)
       bfd_seek (symfile_bfd, sym_offset, SEEK_CUR);
       processing_gcc_compilation = 0;
     }
-#endif 0
+#endif /* 0 */
 
   fseek(dbg_file, (long)sym_offset, 0);
 /*
@@ -1400,7 +1398,7 @@ os9k_read_ofile_symtab (pst)
 	     section. */
 	  ;
         }
-#endif 0
+#endif /* 0 */
     }
 
   current_objfile = NULL;
@@ -1454,7 +1452,7 @@ os9k_process_one_symbol (type, desc, valu, name, section_offsets, objfile)
 	 but this should not be an error ().  */
       return;
     }
-#endif 0
+#endif /* 0 */
 
   switch (type)
     {
@@ -1469,11 +1467,11 @@ os9k_process_one_symbol (type, desc, valu, name, section_offsets, objfile)
       valu += last_source_start_addr;
       new = pop_context();
 
-#if !defined (VARIABLES_INSIDE_BLOCK)
-#define VARIABLES_INSIDE_BLOCK(desc, gcc_p) 1
+#if !defined (OS9K_VARIABLES_INSIDE_BLOCK)
+#define OS9K_VARIABLES_INSIDE_BLOCK(desc, gcc_p) 1
 #endif
 
-      if (!VARIABLES_INSIDE_BLOCK(desc, processing_gcc_compilation))
+      if (!OS9K_VARIABLES_INSIDE_BLOCK(desc, processing_gcc_compilation))
 	local_symbols = new->locals;
 
       if (context_stack_depth > 1)
@@ -1521,7 +1519,7 @@ os9k_process_one_symbol (type, desc, valu, name, section_offsets, objfile)
 	    }
 	}
 
-      if (VARIABLES_INSIDE_BLOCK(desc, processing_gcc_compilation))
+      if (OS9K_VARIABLES_INSIDE_BLOCK(desc, processing_gcc_compilation))
 	/* Now pop locals of block just finished.  */
 	local_symbols = new->locals;
       break;
@@ -1571,6 +1569,7 @@ os9k_process_one_symbol (type, desc, valu, name, section_offsets, objfile)
 		  end_stabs ();
 		}
 		start_stabs ();
+		os9k_stabs = 1;
 		start_symtab (n, dirn, valu);
 	      } else {
 		push_subfile();
@@ -1585,17 +1584,17 @@ os9k_process_one_symbol (type, desc, valu, name, section_offsets, objfile)
 
 	      within_function = 1;
 	      new = push_context (0, valu);
-	      new->name = os9k_define_symbol (valu, name, desc, type, objfile);
+	      new->name = define_symbol (valu, name, desc, type, objfile);
 	      break;
 
 	    case 'V':
 	    case 'v':
               valu += ANOFFSET (section_offsets, SECT_OFF_DATA);
-	      os9k_define_symbol (valu, name, desc, type, objfile);
+	      define_symbol (valu, name, desc, type, objfile);
 	      break;
 
 	    default:
-	      os9k_define_symbol (valu, name, desc, type, objfile);
+	      define_symbol (valu, name, desc, type, objfile);
 	      break;
 	    }
 	}