2003-11-23 Andrew Cagney <cagney@redhat.com>

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

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 7d7df8ee33f865c222e905d28062371b33100cc6..215be80ef96032760256a66ae283a131b1caae8a 100644 (file)
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -202,7 +202,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void *csip)
 
   csi = (struct coff_symfile_info *) csip;
   name = bfd_get_section_name (abfd, sectp);
-  if (STREQ (name, ".text"))
+  if (DEPRECATED_STREQ (name, ".text"))
     {
       csi->textaddr = bfd_section_vma (abfd, sectp);
       csi->textsize += bfd_section_size (abfd, sectp);
@@ -211,7 +211,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void *csip)
     {
       csi->textsize += bfd_section_size (abfd, sectp);
     }
-  else if (STREQ (name, ".stabstr"))
+  else if (DEPRECATED_STREQ (name, ".stabstr"))
     {
       csi->stabstrsect = sectp;
     }
@@ -470,7 +470,7 @@ coff_symfile_init (struct objfile *objfile)
    mainline code can read the whole thing for efficiency.  */
 
 static void
-find_linenos (bfd *abfd, sec_ptr asect, void *vpinfo)
+find_linenos (bfd *abfd, struct bfd_section *asect, void *vpinfo)
 {
   struct coff_symfile_info *info;
   int size, count;
@@ -819,7 +819,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
        case C_THUMBSTATFUNC:
          if (cs->c_name[0] == '.')
            {
-             if (STREQ (cs->c_name, ".text"))
+             if (DEPRECATED_STREQ (cs->c_name, ".text"))
                {
                  /* FIXME:  don't wire in ".text" as section name
                     or symbol name! */
@@ -926,15 +926,8 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
            if (cs->c_name[0] != '@' /* Skip tdesc symbols */ )
              {
                struct minimal_symbol *msym;
-
-               /* FIXME: cagney/2001-02-01: The nasty (int) -> (long)
-                   -> (void*) cast is to ensure that that the value of
-                   cs->c_sclass can be correctly stored in a void
-                   pointer in MSYMBOL_INFO.  Better solutions
-                   welcome. */
-               gdb_assert (sizeof (void *) >= sizeof (cs->c_sclass));
                msym = prim_record_minimal_symbol_and_info
-                 (cs->c_name, tmpaddr, ms_type, (void *) (long) cs->c_sclass,
+                 (cs->c_name, tmpaddr, ms_type, NULL,
                   sec, NULL, objfile);
                if (msym)
                  COFF_MAKE_MSYMBOL_SPECIAL (cs->c_sclass, msym);
@@ -951,7 +944,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
          break;
 
        case C_FCN:
-         if (STREQ (cs->c_name, ".bf"))
+         if (DEPRECATED_STREQ (cs->c_name, ".bf"))
            {
              within_function = 1;
 
@@ -973,7 +966,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
              new->name =
                process_coff_symbol (&fcn_cs_saved, &fcn_aux_saved, objfile);
            }
-         else if (STREQ (cs->c_name, ".ef"))
+         else if (DEPRECATED_STREQ (cs->c_name, ".ef"))
            {
              if (!within_function)
                error ("Bad coff function information\n");
@@ -1049,13 +1042,13 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
          break;
 
        case C_BLOCK:
-         if (STREQ (cs->c_name, ".bb"))
+         if (DEPRECATED_STREQ (cs->c_name, ".bb"))
            {
              tmpaddr = cs->c_value;
              tmpaddr += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
              push_context (++depth, tmpaddr);
            }
-         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 */
@@ -1437,7 +1430,7 @@ patch_opaque_types (struct symtab *s)
          for (sym = opaque_type_chain[hash]; sym;)
            {
              if (name[0] == DEPRECATED_SYMBOL_NAME (sym)[0] &&
-                 STREQ (name + 1, DEPRECATED_SYMBOL_NAME (sym) + 1))
+                 strcmp (name + 1, DEPRECATED_SYMBOL_NAME (sym) + 1) == 0)
                {
                  if (prev)
                    {
@@ -1641,11 +1634,6 @@ process_coff_symbol (struct coff_symbol *cs,
                TYPE_NAME (SYMBOL_TYPE (sym)) =
                  concat (DEPRECATED_SYMBOL_NAME (sym), NULL);
            }
-#ifdef CXUX_TARGET
-         /* Ignore vendor section for Harris CX/UX targets. */
-         else if (cs->c_name[0] == '$')
-           break;
-#endif /* CXUX_TARGET */
 
          /* Keep track of any type which points to empty structured type,
             so it can be filled from a definition from another file.  A
@@ -1798,15 +1786,6 @@ decode_base_type (struct coff_symbol *cs, unsigned int c_type,
       /* shows up with "void (*foo)();" structure members */
       return lookup_fundamental_type (current_objfile, FT_VOID);
 
-#if 0
-/* DGUX actually defines both T_ARG and T_VOID to the same value.  */
-#ifdef T_ARG
-    case T_ARG:
-      /* Shows up in DGUX, I think.  Not sure where.  */
-      return lookup_fundamental_type (current_objfile, FT_VOID);       /* shouldn't show up here */
-#endif
-#endif /* 0 */
-
 #ifdef T_VOID
     case T_VOID:
       /* Intel 960 COFF has this symbol and meaning.  */