Reviewed and approved by drow@mvista.com.

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

diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 7008192242430b0f5d5a7f111fe4d46585f4f015..4375d18afdfca559e7349c46e85d723bb288a111 100644 (file)
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -193,8 +193,6 @@ static void xcoff_symfile_finish (struct objfile *);
 static void xcoff_symfile_offsets (struct objfile *,
                                   struct section_addr_info *addrs);
 
-static void find_linenos (bfd *, sec_ptr, void *);
-
 static char *coff_getfilename (union internal_auxent *, struct objfile *);
 
 static void read_symbol (struct internal_syment *, int);
@@ -1253,7 +1251,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
          break;
 
        case C_FCN:
-         if (STREQ (cs->c_name, ".bf"))
+         if (DEPRECATED_STREQ (cs->c_name, ".bf"))
            {
              CORE_ADDR off = ANOFFSET (objfile->section_offsets,
                                        SECT_OFF_TEXT (objfile));
@@ -1270,7 +1268,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
              if (new->name != NULL)
                SYMBOL_SECTION (new->name) = SECT_OFF_TEXT (objfile);
            }
-         else if (STREQ (cs->c_name, ".ef"))
+         else if (DEPRECATED_STREQ (cs->c_name, ".ef"))
            {
 
              bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
@@ -1364,7 +1362,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
          break;
 
        case C_BLOCK:
-         if (STREQ (cs->c_name, ".bb"))
+         if (DEPRECATED_STREQ (cs->c_name, ".bb"))
            {
              depth++;
              new = push_context (depth,
@@ -1372,7 +1370,7 @@ read_xcoff_symtab (struct partial_symtab *pst)
                                   + ANOFFSET (objfile->section_offsets,
                                               SECT_OFF_TEXT (objfile))));
            }
-         else if (STREQ (cs->c_name, ".eb"))
+         else if (DEPRECATED_STREQ (cs->c_name, ".eb"))
            {
              if (context_stack_depth <= 0)
                {               /* We attempted to pop an empty context stack */
@@ -1438,10 +1436,10 @@ static struct type *var_symbol_type;
 /* process one xcoff symbol. */
 
 static struct symbol *
-process_xcoff_symbol (register struct coff_symbol *cs, struct objfile *objfile)
+process_xcoff_symbol (struct coff_symbol *cs, struct objfile *objfile)
 {
   struct symbol onesymbol;
-  register struct symbol *sym = &onesymbol;
+  struct symbol *sym = &onesymbol;
   struct symbol *sym2 = NULL;
   char *name, *pp;
 
@@ -1673,7 +1671,7 @@ read_symbol_lineno (int symno)
       if (symbol->n_sclass == C_FCN)
        {
          char *name = xcoff64 ? strtbl + symbol->n_offset : symbol->n_name;
-         if (STREQ (name, ".bf"))
+         if (DEPRECATED_STREQ (name, ".bf"))
            goto gotit;
        }
       symno += symbol->n_numaux + 1;
@@ -1699,7 +1697,7 @@ gotit:
  * mainline code can read the whole thing for efficiency.
  */
 static void
-find_linenos (bfd *abfd, sec_ptr asect, void *vpinfo)
+find_linenos (struct bfd *abfd, struct bfd_section *asect, void *vpinfo)
 {
   struct coff_symfile_info *info;
   int size, count;
@@ -1707,7 +1705,7 @@ find_linenos (bfd *abfd, sec_ptr asect, void *vpinfo)
 
   count = asect->lineno_count;
 
-  if (!STREQ (asect->name, ".text") || count == 0)
+  if (!DEPRECATED_STREQ (asect->name, ".text") || count == 0)
     return;
 
   size = count * coff_data (abfd)->local_linesz;
@@ -2532,12 +2530,12 @@ scan_xcoff_symtab (struct objfile *objfile)
               things like "break c-exp.y:435" need to work (I
               suppose the psymtab_include_list could be hashed or put
               in a binary tree, if profiling shows this is a major hog).  */
-           if (pst && STREQ (namestring, pst->filename))
+           if (pst && DEPRECATED_STREQ (namestring, pst->filename))
              continue;
            {
-             register int i;
+             int i;
              for (i = 0; i < includes_used; i++)
-               if (STREQ (namestring, psymtab_include_list[i]))
+               if (DEPRECATED_STREQ (namestring, psymtab_include_list[i]))
                  {
                    i = -1;
                    break;
@@ -2635,22 +2633,6 @@ scan_xcoff_symtab (struct objfile *objfile)
                                             psymtab_language, objfile);
                        p += 1;
                      }
-#if 0 /* OBSOLETE CFront */
-// OBSOLETE                /* The semantics of C++ state that "struct foo { ... }"
-// OBSOLETE                   also defines a typedef for "foo".  Unfortuantely, cfront
-// OBSOLETE                   never makes the typedef when translating from C++ to C.
-// OBSOLETE                   We make the typedef here so that "ptype foo" works as
-// OBSOLETE                   expected for cfront translated code.  */
-// OBSOLETE                else if (psymtab_language == language_cplus)
-// OBSOLETE                  {
-// OBSOLETE                    /* Also a typedef with the same name.  */
-// OBSOLETE                    add_psymbol_to_list (namestring, p - namestring,
-// OBSOLETE                                         VAR_DOMAIN, LOC_TYPEDEF,
-// OBSOLETE                                         &objfile->static_psymbols,
-// OBSOLETE                                         symbol.n_value, 0,
-// OBSOLETE                                         psymtab_language, objfile);
-// OBSOLETE                  }
-#endif /* OBSOLETE CFront */
                  }
                goto check_enum;
 
@@ -2799,11 +2781,6 @@ scan_xcoff_symtab (struct objfile *objfile)
              case '9':
              case '-':
              case '#':         /* for symbol identification (used in live ranges) */
-#if 0 /* OBSOLETE CFront */
-// OBSOLETE            /* added to support cfront stabs strings */
-// OBSOLETE          case 'Z':         /* for definition continuations */
-// OBSOLETE          case 'P':         /* for prototypes */
-#endif /* OBSOLETE CFront */
                continue;
 
              case ':':
@@ -2902,7 +2879,7 @@ xcoff_initial_scan (struct objfile *objfile, int mainline)
 
       /* Read the .debug section, if present.  */
       {
-       sec_ptr secp;
+       struct bfd_section *secp;
        bfd_size_type length;
        char *debugsec = NULL;