Merge GDB 7.5.1

gdb/machoread.c

 /* Darwin support for GDB, the GNU debugger.
    Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    Contributed by AdaCore.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 108 matching lines @@
       offset = ANOFFSET (objfile->section_offsets, sym->section->index);
 
       /* Bfd symbols are section relative.  */
       symaddr = sym->value + sym->section->vma;
 
       /* Select global/local/weak symbols.  Note that bfd puts abs
          symbols in their own section, so all symbols we are
          interested in will have a section.  */
       /* Relocate all non-absolute and non-TLS symbols by the
          section offset.  */
-      if (sym->section != &bfd_abs_section
+      if (sym->section != bfd_abs_section_ptr
           && !(sym->section->flags & SEC_THREAD_LOCAL))
         symaddr += offset;
 
-      if (sym->section == &bfd_abs_section)
+      if (sym->section == bfd_abs_section_ptr)
         ms_type = mst_abs;
       else if (sym->section->flags & SEC_CODE)
         {
           if (sym->flags & (BSF_GLOBAL | BSF_WEAK))
             ms_type = mst_text;
           else
             ms_type = mst_file_text;
         }
       else if (sym->section->flags & SEC_ALLOC)
         {
@@ skipping 29 matching lines @@
    NUMBER_OF_SYMBOLS for OBJFILE.  Registers OSO filenames found.  */
 
 static void
 macho_symtab_read (struct objfile *objfile,
                    long number_of_symbols, asymbol **symbol_table)
 {
   long i;
   const asymbol *dir_so = NULL;
   const asymbol *file_so = NULL;
   asymbol **oso_file = NULL;
-  unsigned int nbr_syms;
+  unsigned int nbr_syms = 0;
 
   /* Current state while reading stabs.  */
   enum
   {
     /* Not within an SO part.  Only non-debugging symbols should be present,
        and will be added to the minimal symbols table.  */
     S_NO_SO,
 
     /* First SO read.  Introduce an SO section, and may be followed by a second
        SO.  The SO section should contain onl debugging symbols.  */
@@ skipping 362 matching lines @@
       if ((mach_o_sym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_UNDF
            && sym->value != 0)
         {
           /* For common symbol use the min symtab and modify the OSO
              symbol table.  */
           CORE_ADDR res;
 
           res = macho_resolve_oso_sym_with_minsym (main_objfile, sym);
           if (res != 0)
             {
-              sym->section = &bfd_com_section;
+              sym->section = bfd_com_section_ptr;
               sym->value = res;
             }
         }
       else if ((mach_o_sym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_SECT)
         {
           /* Normal symbol.  */
           asection *sec = sym->section;
           bfd_mach_o_section *msec;
           unsigned int sec_type;
 
@@ skipping 448 matching lines @@
 
   macho_new_init,               /* init anything gbl to entire symtab */
   macho_symfile_init,           /* read initial info, setup for sym_read() */
   macho_symfile_read,           /* read a symbol file into symtab */
   NULL,                         /* sym_read_psymbols */
   macho_symfile_finish,         /* finished with file, cleanup */
   macho_symfile_offsets,        /* xlate external to internal form */
   default_symfile_segments,     /* Get segment information from a file.  */
   NULL,
   macho_symfile_relocate,       /* Relocate a debug section.  */
+  NULL,                         /* sym_get_probes */
   &psym_functions
 };
 
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_machoread;
+
 void
 _initialize_machoread ()
 {
   add_symtab_fns (&macho_sym_fns);
 
   add_setshow_zinteger_cmd ("mach-o", class_obscure,
                             &mach_o_debug_level,
                             _("Set if printing Mach-O symbols processing."),
                             _("Show if printing Mach-O symbols processing."),
                             NULL, NULL, NULL,
                             &setdebuglist, &showdebuglist);
 }