* MAINTAINERS: Add myself under Write After Approval.

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

diff --git a/gdb/machoread.c b/gdb/machoread.c
index d8d3bd2285c20b36df6ab9faddfde13cf0cae8ca..5f9a0fe3fb5e4092d11298a5f6508dbeba8fcb76 100644 (file)
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -103,7 +103,6 @@ macho_symtab_read (struct objfile *objfile,
 {
   struct gdbarch *gdbarch = get_objfile_arch (objfile);
   long storage_needed;
-  asymbol *sym;
   long i, j;
   CORE_ADDR offset;
   enum minimal_symbol_type ms_type;
@@ -114,15 +113,16 @@ macho_symtab_read (struct objfile *objfile,
 
   for (i = 0; i < number_of_symbols; i++)
     {
-      sym = symbol_table[i];
+      asymbol *sym = symbol_table[i];
+      bfd_mach_o_asymbol *mach_o_sym = (bfd_mach_o_asymbol *)sym;
+
       offset = ANOFFSET (objfile->section_offsets, sym->section->index);
 
       if (sym->flags & BSF_DEBUGGING)
        {
-         unsigned char type = BFD_MACH_O_SYM_NTYPE(sym);
          bfd_vma addr;
 
-         switch (type)
+         switch (mach_o_sym->n_type)
            {
            case N_SO:
              if ((sym->name == NULL || sym->name[0] == 0)
@@ -406,7 +406,7 @@ macho_oso_symfile (struct objfile *main_objfile)
              bfd_close (member_bfd);
            }
            else
-             symbol_file_add_from_bfd (member_bfd, 0, addrs, 0, 0);
+             symbol_file_add_from_bfd (member_bfd, 0, addrs, 0);
        }
       else
        {
@@ -429,7 +429,7 @@ macho_oso_symfile (struct objfile *main_objfile)
              continue;
            }
   
-         symbol_file_add_from_bfd (abfd, 0, addrs, 0, 0);
+         symbol_file_add_from_bfd (abfd, 0, addrs, 0);
        }
       xfree (oso->symbols);
       xfree (oso->offsets);
@@ -592,7 +592,7 @@ macho_symfile_read (struct objfile *objfile, int mainline)
          oso_vector = NULL;
 
          /* Now recurse: read dwarf from dsym.  */
-         symbol_file_add_from_bfd (dsym_bfd, 0, NULL, 0, 0);
+         symbol_file_add_from_bfd (dsym_bfd, 0, NULL, 0);
       
          /* Don't try to read dwarf2 from main file or shared libraries.  */
          return;