Accept 16-bit addresses.

[deliverable/binutils-gdb.git] / gdb / dbxread.c

diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index d9ad0405275d18d2e507f0a774ca79b0bd434ec0..74667e4c1293ba469f53e8b44c2a6f7499fd4f14 100644 (file)
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -604,6 +604,7 @@ dbx_symfile_read (objfile, mainline)
      || (0 == strncmp (bfd_get_target (sym_bfd), "som", 3))
      || (0 == strncmp (bfd_get_target (sym_bfd), "coff", 4))
      || (0 == strncmp (bfd_get_target (sym_bfd), "pe", 2))
+     || (0 == strncmp (bfd_get_target (sym_bfd), "epoc-pe", 7))
      || (0 == strncmp (bfd_get_target (sym_bfd), "nlm", 3)));
 
   val = bfd_seek (sym_bfd, DBX_SYMTAB_OFFSET (objfile), SEEK_SET);
@@ -2314,34 +2315,8 @@ process_one_symbol (type, desc, valu, name, section_offsets, objfile)
                 from N_FUN symbols.  */
              if (type == N_FUN
                  && valu == ANOFFSET (section_offsets, SECT_OFF_TEXT))
-               {
-                 struct minimal_symbol *msym;
-                 char *p;
-                 int n;
-
-                 p = strchr (name, ':');
-                 if (p == NULL)
-                   p = name;
-                 n = p - name;
-                 p = alloca (n + 2);
-                 strncpy (p, name, n);
-                 p[n] = 0;
-
-                 msym = lookup_minimal_symbol (p, last_source_file,
-                                               objfile);
-                 if (msym == NULL)
-                   {
-                     /* Sun Fortran appends an underscore to the minimal
-                        symbol name, try again with an appended underscore
-                        if the minimal symbol was not found.  */
-                     p[n] = '_';
-                     p[n + 1] = 0;
-                     msym = lookup_minimal_symbol (p, last_source_file,
-                                                   objfile);
-                   }
-                 if (msym)
-                   valu = SYMBOL_VALUE_ADDRESS (msym);
-               }
+               valu = 
+                 find_stab_function_addr (name, last_source_file, objfile);
 #endif
 
 #ifdef SUN_FIXED_LBRAC_BUG
@@ -2404,6 +2379,13 @@ process_one_symbol (type, desc, valu, name, section_offsets, objfile)
                function_start_offset = valu;
 
              within_function = 1;
+
+             if (context_stack_depth > 1)
+               {
+                 complain (&lbrac_unmatched_complaint, symnum);
+                 break;
+               }
+
              if (context_stack_depth > 0)
                {
                  new = pop_context ();
@@ -2411,9 +2393,6 @@ process_one_symbol (type, desc, valu, name, section_offsets, objfile)
                  finish_block (new->name, &local_symbols, new->old_blocks,
                                new->start_addr, valu, objfile);
                }
-             /* Stack must be empty now.  */
-             if (context_stack_depth != 0)
-               complain (&lbrac_unmatched_complaint, symnum);
 
              new = push_context (0, valu);
              new->name = define_symbol (valu, name, desc, type, objfile);